patches/clixon: drop, unused since migration to sysrepo

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
2026-07-30 20:43:02 +02:00 · 2024-04-11 06:19:07 +02:00
parent 5ac7899f37
commit 985a76c567
4 changed files with 0 additions and 187 deletions
@@ -1,28 +0,0 @@
-From b66f95bc9d45c306c7e5f93df457c1ff326a5f1f Mon Sep 17 00:00:00 2001
-From: Joachim Wiberg <troglobit@gmail.com>
-Date: Tue, 7 Feb 2023 18:29:44 +0100
-Subject: [PATCH 1/4] util: clixon_util_regexp requires libxml2
-Organization: Addiva Elektronik
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
- util/Makefile.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/util/Makefile.in b/util/Makefile.in
-index 552cedda..fbb435af 100644
--- a/util/Makefile.in
-+++ b/util/Makefile.in
-@@ -95,7 +95,9 @@ APPSRC   += clixon_util_yang.c
- APPSRC   += clixon_util_xpath.c
- APPSRC   += clixon_util_path.c
- APPSRC   += clixon_util_datastore.c
-+ifdef with_libxml2
- APPSRC   += clixon_util_regexp.c
-+endif
- APPSRC   += clixon_util_socket.c
- APPSRC   += clixon_util_validate.c
- APPSRC   += clixon_util_dispatcher.c 
-- 
-2.34.1
-
@@ -1,75 +0,0 @@
-From 327f9ee93a67fd908d70ec4956bed3d067a1c278 Mon Sep 17 00:00:00 2001
-From: Joachim Wiberg <troglobit@gmail.com>
-Date: Tue, 7 Feb 2023 18:30:33 +0100
-Subject: [PATCH 2/4] util: clixon_util_stream requires libcurl
-Organization: Addiva Elektronik
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
- configure        | 4 ++++
- configure.ac     | 4 ++++
- util/Makefile.in | 4 +++-
- 3 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 33aa03e1..2275c84f 100755
--- a/configure
-+++ b/configure
-@@ -643,6 +643,7 @@ HAVE_HTTP1
- HAVE_LIBNGHTTP2
- enable_netsnmp
- with_restconf
-+with_curl
- LINKAGE
- LIBSTATIC_SUFFIX
- SH_SUFFIX
-@@ -5040,6 +5041,9 @@ fi
- 
- $as_echo "#define CLIXON_PUBLISH_STREAMS 1" >>confdefs.h
- 
-+   with_curl=yes
-+else
-+   with_curl=''
- fi
- 
- for ac_header in cligen/cligen.h
-diff --git a/configure.ac b/configure.ac
-index c941465a..1d3cee77 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -114,6 +114,7 @@ AC_SUBST(LIBS)
- AC_SUBST(SH_SUFFIX)
- AC_SUBST(LIBSTATIC_SUFFIX)
- AC_SUBST(LINKAGE)
-+AC_SUBST(with_curl)
- AC_SUBST(with_restconf)  # Set to native or fcgi -> compile apps/restconf
- AC_SUBST(enable_netsnmp) # Enable build of apps/snmp
- AC_SUBST(HAVE_LIBNGHTTP2,false) # consider using neutral constant such as with-http2
-@@ -228,6 +229,9 @@ if test "$ac_enable_publish" = "yes"; then
-    AC_CHECK_HEADERS(curl.h,[], AC_MSG_ERROR([curl missing]))	
-    AC_CHECK_LIB(curl, curl_global_init,, AC_MSG_ERROR([libcurl missing]))
-    AC_DEFINE(CLIXON_PUBLISH_STREAMS, 1, [Enable publish of notification streams using SSE and curl])
-+   with_curl=yes
-+else
-+   with_curl=''
- fi
- 
- AC_CHECK_HEADERS(cligen/cligen.h,, AC_MSG_ERROR([CLIgen missing. Try: git clone https://github.com/clicon/cligen.git]))
-diff --git a/util/Makefile.in b/util/Makefile.in
-index fbb435af..dcf8f12e 100644
--- a/util/Makefile.in
-+++ b/util/Makefile.in
-@@ -104,7 +104,9 @@ APPSRC   += clixon_util_dispatcher.c
- APPSRC   += clixon_netconf_ssh_callhome.c
- APPSRC   += clixon_netconf_ssh_callhome_client.c
- ifdef with_restconf
-APPSRC   += clixon_util_stream.c # Needs curl
-+ifdef with_libcurl
-+APPSRC   += clixon_util_stream.c
-+endif
- ifeq ($(with_restconf), native)
- APPSRC   += clixon_restconf_callhome_client.c
- endif
-- 
-2.34.1
-
@@ -1,31 +0,0 @@
-From 56c94a9bde13650e413e2009e50b67f7ead059e9 Mon Sep 17 00:00:00 2001
-From: Joachim Wiberg <troglobit@gmail.com>
-Date: Tue, 7 Feb 2023 18:31:00 +0100
-Subject: [PATCH 3/4] example/main: add missing $(DESTDIR) to standard include
- path
-Organization: Addiva Elektronik
-
-This is used everywhere else so looks loke a simple omission.  Needed
-when cross-compiling (or packaging) Clixon.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
- example/main/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/example/main/Makefile.in b/example/main/Makefile.in
-index 78243822..aa94895d 100644
--- a/example/main/Makefile.in
-+++ b/example/main/Makefile.in
-@@ -69,7 +69,7 @@ endif
- 
- with_restconf	= @with_restconf@
- 
-INCLUDES 	= -I$(includedir) @INCLUDES@ 
-+INCLUDES 	= -I$(DESTDIR)$(includedir) @INCLUDES@
- LINKAGE         = @LINKAGE@
- LDFLAGS 	= @LDFLAGS@
- CPPFLAGS  	= @CPPFLAGS@
-- 
-2.34.1
-
@@ -1,53 +0,0 @@
-From 7bbc0e1e82dcfc9ba1334475386866bb885e7ec6 Mon Sep 17 00:00:00 2001
-From: Joachim Wiberg <troglobit@gmail.com>
-Date: Tue, 7 Feb 2023 18:32:32 +0100
-Subject: [PATCH 4/4] example/main: replace hard-coded path with variables from
- configure
-Organization: Addiva Elektronik
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
- example/main/example.xml.in | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/example/main/example.xml.in b/example/main/example.xml.in
-index 4cb2a3e4..36f225d2 100644
--- a/example/main/example.xml.in
-+++ b/example/main/example.xml.in
-@@ -1,23 +1,23 @@
- <clixon-config xmlns="http://clicon.org/config">
-  <CLICON_CONFIGFILE>/usr/local/etc/example.xml</CLICON_CONFIGFILE>
-+  <CLICON_CONFIGFILE>@sysconfdir@/example.xml</CLICON_CONFIGFILE>
-   <CLICON_FEATURE>ietf-netconf:startup</CLICON_FEATURE>
-   <CLICON_FEATURE>ietf-netconf:confirmed-commit</CLICON_FEATURE>
-   <CLICON_FEATURE>clixon-restconf:allow-auth-none</CLICON_FEATURE>
-   <CLICON_FEATURE>clixon-restconf:fcgi</CLICON_FEATURE>
-  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-+  <CLICON_YANG_DIR>@YANG_INSTALLDIR@</CLICON_YANG_DIR>
-   <CLICON_YANG_DIR>@YANG_STANDARD_DIR@</CLICON_YANG_DIR>
-   <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
-   <CLICON_CLI_MODE>example</CLICON_CLI_MODE>
-  <CLICON_BACKEND_DIR>/usr/local/lib/example/backend</CLICON_BACKEND_DIR>
-  <CLICON_NETCONF_DIR>/usr/local/lib/example/netconf</CLICON_NETCONF_DIR>
-  <CLICON_RESTCONF_DIR>/usr/local/lib/example/restconf</CLICON_RESTCONF_DIR>
-  <CLICON_CLI_DIR>/usr/local/lib/example/cli</CLICON_CLI_DIR>
-  <CLICON_CLISPEC_DIR>/usr/local/lib/example/clispec</CLICON_CLISPEC_DIR>
-  <CLICON_SOCK>/usr/local/var/example/example.sock</CLICON_SOCK>
-  <CLICON_BACKEND_PIDFILE>/usr/local/var/example/example.pidfile</CLICON_BACKEND_PIDFILE>
-+  <CLICON_BACKEND_DIR>@exec_prefix@/lib/example/backend</CLICON_BACKEND_DIR>
-+  <CLICON_NETCONF_DIR>@exec_prefix@/lib/example/netconf</CLICON_NETCONF_DIR>
-+  <CLICON_RESTCONF_DIR>@exec_prefix@/lib/example/restconf</CLICON_RESTCONF_DIR>
-+  <CLICON_CLI_DIR>@exec_prefix@/lib/example/cli</CLICON_CLI_DIR>
-+  <CLICON_CLISPEC_DIR>@exec_prefix@/lib/example/clispec</CLICON_CLISPEC_DIR>
-+  <CLICON_SOCK>@localstatedir@/run/example.sock</CLICON_SOCK>
-+  <CLICON_BACKEND_PIDFILE>@localstatedir@/run/example.pid</CLICON_BACKEND_PIDFILE>
-   <CLICON_CLI_LINESCROLLING>0</CLICON_CLI_LINESCROLLING>
-   <CLICON_CLI_TAB_MODE>0</CLICON_CLI_TAB_MODE>
-  <CLICON_XMLDB_DIR>/usr/local/var/example</CLICON_XMLDB_DIR>
-+  <CLICON_XMLDB_DIR>@localstatedir@/lib/misc</CLICON_XMLDB_DIR>
-   <CLICON_STARTUP_MODE>init</CLICON_STARTUP_MODE>
-   <CLICON_NACM_MODE>disabled</CLICON_NACM_MODE>
-   <CLICON_STREAM_DISCOVERY_RFC5277>true</CLICON_STREAM_DISCOVERY_RFC5277>
-- 
-2.34.1
-