From ff10f4ee2fdcc43b06f3f2a24cf52660f2310dcd Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Sun, 2 Jun 2024 23:19:28 +0200
Subject: [PATCH] confd: drop augeas from build requirements and clean up

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 src/confd/configure.ac    | 1 -
 src/confd/src/Makefile.am | 2 --
 src/confd/src/core.c      | 3 ---
 src/confd/src/core.h      | 2 --
 4 files changed, 8 deletions(-)

diff --git a/src/confd/configure.ac b/src/confd/configure.ac
index 6fc59380..1aa8de1d 100644
--- a/src/confd/configure.ac
+++ b/src/confd/configure.ac
@@ -43,7 +43,6 @@ AS_IF([test "x$with_login_shell" != "xno"], [
 # Check for pkg-config first, warn if it's not installed
 PKG_PROG_PKG_CONFIG
 
-PKG_CHECK_MODULES([augeas],  [augeas  >= 1.12.0])
 PKG_CHECK_MODULES([glib],    [glib-2.0 >= 2.50 gio-2.0 gio-unix-2.0])
 PKG_CHECK_MODULES([jansson], [jansson >= 2.0.0])
 PKG_CHECK_MODULES([libite],  [libite >= 2.5.0])
diff --git a/src/confd/src/Makefile.am b/src/confd/src/Makefile.am
index d6055466..0fdb7b28 100644
--- a/src/confd/src/Makefile.am
+++ b/src/confd/src/Makefile.am
@@ -6,7 +6,6 @@ plugin_LTLIBRARIES      = confd-plugin.la
 confd_plugin_la_LDFLAGS = -module -avoid-version -shared
 
 confd_plugin_la_CFLAGS  =			\
-	$(augeas_CFLAGS)			\
 	$(glib_CFLAGS)				\
 	$(jansson_CFLAGS)			\
 	$(libite_CFLAGS)			\
@@ -15,7 +14,6 @@ confd_plugin_la_CFLAGS  =			\
 	$(CFLAGS)
 
 confd_plugin_la_LIBADD  =			\
-	$(augeas_LIBS)				\
 	$(glib_LIBS)				\
 	$(jansson_LIBS)				\
 	$(libite_LIBS)				\
diff --git a/src/confd/src/core.c b/src/confd/src/core.c
index fa478b33..2444b29a 100644
--- a/src/confd/src/core.c
+++ b/src/confd/src/core.c
@@ -117,9 +117,6 @@ int sr_plugin_init_cb(sr_session_ctx_t *session, void **priv)
 	rc = sr_session_start(confd.conn, SR_DS_CANDIDATE, &confd.cand);
 	if (rc)
 		goto err;
-	confd.aug = aug_init(NULL, "", 0);
-	if (!confd.aug)
-		goto err;
 
 	confd.root = json_load_file("/run/system.json", 0, NULL);
 	if (!confd.root)
diff --git a/src/confd/src/core.h b/src/confd/src/core.h
index 888f8090..e5997d94 100644
--- a/src/confd/src/core.h
+++ b/src/confd/src/core.h
@@ -13,7 +13,6 @@
 #include <sys/param.h>
 #include <unistd.h>
 
-#include <augeas.h>
 #include <libite/lite.h>
 #include <libite/queue.h>
 #include <libyang/libyang.h>
@@ -87,7 +86,6 @@ struct confd {
 	sr_subscription_ctx_t  *sub;
 	sr_subscription_ctx_t  *fsub;    /* factory-default sub */
 	json_t                 *root;
-	augeas                 *aug;
 	struct dagger		netdag;
 };