commit: c381454b18492eddd76c4810b425948ed75f6b9a Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Sep 18 16:02:00 2020 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Sep 20 14:38:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c381454b
net-misc/cfengine: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/17589 Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> net-misc/cfengine/files/511666-segfault.patch | 20 ----------- net-misc/cfengine/files/admit-noclass-520696.patch | 15 -------- .../files/cfengine-2.2.10-lsbrelease.patch | 24 ------------- .../cfengine-2.2.10-snprintf_buffer_overflow.patch | 11 ------ net-misc/cfengine/files/cfengine-3.4.5-acl.patch | 30 ---------------- .../cfengine/files/cfengine-3.4.5-ifconfig.patch | 42 ---------------------- .../cfengine/files/cfengine-3.5.3-ifconfig.patch | 42 ---------------------- net-misc/cfengine/files/cfenvd.rc6 | 17 --------- net-misc/cfengine/files/cfexecd.rc6 | 17 --------- net-misc/cfengine/files/cfservd.rc6 | 17 --------- 10 files changed, 235 deletions(-) diff --git a/net-misc/cfengine/files/511666-segfault.patch b/net-misc/cfengine/files/511666-segfault.patch deleted file mode 100644 index ea3ae968625..00000000000 --- a/net-misc/cfengine/files/511666-segfault.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix a bug involving CheckFriendReliability (see bug #482439) - -Index: cfengine2-2.2.9/src/instrument.c -=================================================================== ---- cfengine2-2.2.9.orig/src/instrument.c 2009-03-06 21:25:59.000000000 +0000 -+++ cfengine2-2.2.9/src/instrument.c 2009-03-06 21:26:31.000000000 +0000 -@@ -716,11 +716,11 @@ - key.data = timekey; - key.size = strlen(timekey)+1; - -- if ((errno = dbp->get(dbp,NULL,&key,&value,0)) != 0) -+ if ((errno = dbpent->get(dbpent,NULL,&key,&value,0)) != 0) - { - if (errno != DB_NOTFOUND) - { -- dbp->err(dbp,errno,NULL); -+ dbpent->err(dbpent,errno,NULL); - exit(1); - } - } diff --git a/net-misc/cfengine/files/admit-noclass-520696.patch b/net-misc/cfengine/files/admit-noclass-520696.patch deleted file mode 100644 index 1e5d8594aae..00000000000 --- a/net-misc/cfengine/files/admit-noclass-520696.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix a bug with admit/grant that let cfengine2 fails when the class -of a cfengine fragment does not exist and more than a host or IP -ranges are specified for a path (see #520696) - ---- a/src/install.c -+++ b/src/install.c -@@ -6561,7 +6561,7 @@ - if (!IsDefinedClass(classes)) - { - Debug1("Not installing Auth path, no match\n"); -- InitializeAction(); -+// InitializeAction(); - return; - } - diff --git a/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch b/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch deleted file mode 100644 index 6f8dfa04d8f..00000000000 --- a/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch +++ /dev/null @@ -1,24 +0,0 @@ -Newer GCC mis-compiles the lsb_release reader function. - -Signed-off-by: Robin H. Johnson <[email protected]> - ---- cfengine-2.2.10/src/misc.c 2009-02-10 21:55:36.000000000 -0800 -+++ cfengine-2.2.10/src/misc.c 2020-01-06 17:58:07.049226386 -0800 -@@ -1187,6 +1187,7 @@ if ((fp = cfpopen(VBUFF, "r")) == NULL) - - if (ReadLine(VBUFF, CF_BUFSIZE, fp)) - { -+ Debug4("(%s)",VBUFF); - char * buffer = VBUFF; - strsep(&buffer, ":"); - -@@ -1198,7 +1199,8 @@ if (ReadLine(VBUFF, CF_BUFSIZE, fp)) - info = buffer; - while((*buffer != '\0') && !isspace(*buffer)) - { -- *buffer = tolower(*buffer++); -+ *buffer = tolower(*buffer); -+ buffer++; - } - - *buffer = '\0'; diff --git a/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch b/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch deleted file mode 100644 index 80a3a542974..00000000000 --- a/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/instrument.c.old 2010-10-15 22:20:58.014091858 +0200 -+++ b/src/instrument.c 2010-10-15 22:21:34.132271440 +0200 -@@ -542,7 +542,7 @@ while (dbcp->c_get(dbcp, &key, &value, D - - tthen = (time_t)then; - -- snprintf(datebuf,CF_BUFSIZE-1,"%s",ctime(&tthen)); -+ snprintf(datebuf,CF_MAXVARSIZE-1,"%s",ctime(&tthen)); - datebuf[strlen(datebuf)-9] = '\0'; /* Chop off second and year */ - - snprintf(addr,15,"%s",hostname+1); diff --git a/net-misc/cfengine/files/cfengine-3.4.5-acl.patch b/net-misc/cfengine/files/cfengine-3.4.5-acl.patch deleted file mode 100644 index 815f257c36f..00000000000 --- a/net-misc/cfengine/files/cfengine-3.4.5-acl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a12b5b3b8cd4397545104923d1de3297fd971f9e Mon Sep 17 00:00:00 2001 -From: Christian Ruppert <[email protected]> -Date: Fri, 29 Mar 2013 00:23:21 +0100 -Subject: [PATCH] Fix acl header detection - - -Signed-off-by: Christian Ruppert <[email protected]> ---- - configure.ac | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 542d115..f3f0c04 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -335,7 +335,10 @@ AC_ARG_WITH([libacl], - if test "x$with_libacl" != xno; then - CF3_WITH_LIBRARY(libacl, [ - AC_CHECK_LIB(acl, acl_init, [], [if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl library); fi]) -- AC_CHECK_HEADERS([acl.h sys/acl.h acl/libacl.h], [], [if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl library headers); fi]) -+ AC_CHECK_HEADERS([acl.h sys/acl.h acl/libacl.h], [found_acl_h=yes], []) -+ if test "x$found_acl_h" != xyes; then -+ AC_MSG_ERROR(Cannot find libacl library headers) -+ fi - ]) - fi - --- -1.8.1.5 - diff --git a/net-misc/cfengine/files/cfengine-3.4.5-ifconfig.patch b/net-misc/cfengine/files/cfengine-3.4.5-ifconfig.patch deleted file mode 100644 index 47107784ce0..00000000000 --- a/net-misc/cfengine/files/cfengine-3.4.5-ifconfig.patch +++ /dev/null @@ -1,42 +0,0 @@ -Patch by [email protected] -https://bugs.gentoo.org/444532 - ---- src/conf.h.in.old 2012-12-28 16:18:23.000000000 +0100 -+++ src/conf.h.in 2012-12-28 16:19:08.000000000 +0100 -@@ -773,3 +773,6 @@ - - /* Define to rpl_vsnprintf if the replacement function should be used. */ - #undef vsnprintf -+ -+/* Define to the path for running ifconfig -a */ -+#undef IFCONFIG_RUN ---- src/unix.c.old 2012-12-28 16:05:28.000000000 +0100 -+++ src/unix.c 2012-12-28 16:13:15.000000000 +0100 -@@ -900,7 +900,7 @@ - - default: - -- if ((pp = cf_popen("/sbin/ifconfig -a", "r")) == NULL) -+ if ((pp = cf_popen(IFCONFIG_RUN, "r")) == NULL) - { - CfOut(cf_verbose, "", "Could not find interface info\n"); - return; ---- configure.ac.old 2012-12-29 11:38:20.000000000 +0100 -+++ configure.ac 2012-12-29 11:49:11.000000000 +0100 -@@ -882,6 +882,16 @@ - - - dnl ###################################################################### -+dnl Find the path to ifconfig -+dnl ###################################################################### -+ -+AC_PATH_PROG(IFCONFIG_PATH,ifconfig) -+if test x"$IFCONFIG_PATH" = x"" ; then -+ AC_MSG_ERROR([Cannot found the ifconfig binary.]) -+fi -+AC_DEFINE_UNQUOTED(IFCONFIG_RUN, "$IFCONFIG_PATH -a", [the path to run ifconfig -a]) -+ -+dnl ###################################################################### - dnl Summarize - dnl ###################################################################### - diff --git a/net-misc/cfengine/files/cfengine-3.5.3-ifconfig.patch b/net-misc/cfengine/files/cfengine-3.5.3-ifconfig.patch deleted file mode 100644 index dc982c6801f..00000000000 --- a/net-misc/cfengine/files/cfengine-3.5.3-ifconfig.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur cfengine-3.5.3.orig/configure.ac cfengine-3.5.3/configure.ac ---- cfengine-3.5.3.orig/configure.ac 2013-12-09 13:13:14.000000000 +0100 -+++ cfengine-3.5.3/configure.ac 2014-02-27 12:36:55.179893570 +0100 -@@ -1047,6 +1047,16 @@ - AM_SUBST_NOTMAKE(post_macros) - - dnl ###################################################################### -+dnl Find the path to ifconfig -+dnl ###################################################################### -+ -+AC_PATH_PROG(IFCONFIG_PATH,ifconfig) -+if test x"$IFCONFIG_PATH" = x"" ; then -+ AC_MSG_ERROR([Cannot found the ifconfig binary.]) -+fi -+AC_DEFINE_UNQUOTED(IFCONFIG_RUN, "$IFCONFIG_PATH -a", [the path to run ifconfig -a]) -+ -+dnl ###################################################################### - dnl Summarize - dnl ###################################################################### - -diff -ur cfengine-3.5.3.orig/libpromises/unix.c cfengine-3.5.3/libpromises/unix.c ---- cfengine-3.5.3.orig/libpromises/unix.c 2013-12-09 13:13:14.000000000 +0100 -+++ cfengine-3.5.3/libpromises/unix.c 2014-02-27 12:38:35.036608105 +0100 -@@ -767,7 +767,7 @@ - return; - } - #else -- if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL) -+ if ((pp = cf_popen(IFCONFIG_RUN, "r", true)) == NULL) - { - Log(LOG_LEVEL_VERBOSE, "Could not find interface info"); - return; -diff -ur cfengine-3.5.3.orig/libutils/config.h.in cfengine-3.5.3/libutils/config.h.in ---- cfengine-3.5.3.orig/libutils/config.h.in 2013-12-09 13:55:25.000000000 +0100 -+++ cfengine-3.5.3/libutils/config.h.in 2014-02-27 12:39:41.537416111 +0100 -@@ -914,3 +914,6 @@ - - /* Define to rpl_vsnprintf if the replacement function should be used. */ - #undef vsnprintf -+ -+/* Define to the path for running ifconfig -a */ -+#undef IFCONFIG_RUN diff --git a/net-misc/cfengine/files/cfenvd.rc6 b/net-misc/cfengine/files/cfenvd.rc6 deleted file mode 100644 index 638ae993dcf..00000000000 --- a/net-misc/cfengine/files/cfenvd.rc6 +++ /dev/null @@ -1,17 +0,0 @@ -#!/sbin/openrc-run - -depend() { - need net -} - -start() { - ebegin "Starting cfenvd" - start-stop-daemon --start --quiet --exec /usr/sbin/cfenvd - eend $? -} - -stop() { - ebegin "Stopping cfenvd" - start-stop-daemon --stop --quiet --exec /usr/sbin/cfenvd - eend $? -} diff --git a/net-misc/cfengine/files/cfexecd.rc6 b/net-misc/cfengine/files/cfexecd.rc6 deleted file mode 100644 index 032a9c469b5..00000000000 --- a/net-misc/cfengine/files/cfexecd.rc6 +++ /dev/null @@ -1,17 +0,0 @@ -#!/sbin/openrc-run - -depend() { - need net -} - -start() { - ebegin "Starting cfexecd" - start-stop-daemon --start --quiet --exec /usr/sbin/cfexecd - eend $? -} - -stop() { - ebegin "Stopping cfexecd" - start-stop-daemon --stop --quiet --exec /usr/sbin/cfexecd - eend $? -} diff --git a/net-misc/cfengine/files/cfservd.rc6 b/net-misc/cfengine/files/cfservd.rc6 deleted file mode 100644 index 034b25c7200..00000000000 --- a/net-misc/cfengine/files/cfservd.rc6 +++ /dev/null @@ -1,17 +0,0 @@ -#!/sbin/openrc-run - -depend() { - need net -} - -start() { - ebegin "Starting cfservd" - start-stop-daemon --start --quiet --exec /usr/sbin/cfservd - eend $? -} - -stop() { - ebegin "Stopping cfservd" - start-stop-daemon --stop --quiet --exec /usr/sbin/cfservd - eend $? -}
