[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/files/

2020-09-20 Thread Conrad Kostecki 
commit: c381454b18492eddd76c4810b425948ed75f6b9a
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Sep 18 16:02:00 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Sep 20 14:38:23 2020 +
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  gmail.com>
Signed-off-by: Conrad Kostecki  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..000
--- 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.0 
+
-+++ cfengine2-2.2.9/src/instrument.c   2009-03-06 21:26:31.0 +
-@@ -716,11 +716,11 @@
-   key.data = timekey;
-   key.size = strlen(timekey)+1;
- 
--  if ((errno = dbp->get(dbp,NULL,,,0)) != 0)
-+  if ((errno = dbpent->get(dbpent,NULL,,,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..000
--- 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..000
--- 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 
-
 cfengine-2.2.10/src/misc.c 2009-02-10 21:55:36.0 -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(, ":");
-
-@@ -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..000
--- 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, , , D
-
-tthen = (time_t)then;
- 
--   snprintf(datebuf,CF_BUFSIZE-1,"%s",ctime());
-+   snprintf(datebuf,CF_MAXVARSIZE-1,"%s",ctime());
-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..000
--- a/net-misc/cfengine/files/cfengine-3.4.5-acl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From

[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/files/

2018-04-12 Thread Patrice Clement 
commit: a1c0851a496509240d8292e3d080b4eb97cd4851
Author: Chris Rorvick  rorvick  com>
AuthorDate: Sat Jan 20 12:13:26 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Apr 12 07:45:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1c0851a

net-misc/cfengine: find ifconfig(8) in /bin/.

The ebuild applies a patch intending to look for ifconfig(8) in
/bin/ after not finding it in /sbin/. The patch is obviously wrong,
though, and is instead requiring ifconfig to be found in *both*
locations.

Closes: http://bugs.gentoo.org/645106
Closes: https://github.com/gentoo/gentoo/pull/6913

 net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch 
b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
index ae0f491347f..a31b3513ded 100644
--- a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
+++ b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
@@ -5,7 +5,7 @@
  }
  #else
 -if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL)
-+if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL || (pp = 
cf_popen("/bin/ifconfig -a", "r", true)) == NULL)
++if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL && (pp = 
cf_popen("/bin/ifconfig -a", "r", true)) == NULL)
  {
  Log(LOG_LEVEL_VERBOSE, "Could not find interface info");
  return;

[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/files/, net-misc/cfengine/

2017-10-20 Thread Robin H. Johnson 
commit: d83856cd70eaa3c6cec3902b0e301dda1f39
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Oct 20 22:18:29 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Oct 20 22:22:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83856cd

net-misc/cfengine: compile-fix for glibc-2.25

Closes: https://bugs.gentoo.org/612658
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Signed-off-by: Robin H. Johnson  gentoo.org>

 net-misc/cfengine/cfengine-3.6.2.ebuild   |  1 +
 .../cfengine/files/cfengine-3.6.2-sysmacros.patch | 19 +++
 2 files changed, 20 insertions(+)

diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild 
b/net-misc/cfengine/cfengine-3.6.2.ebuild
index a4e5ae6c7db..025728ee43e 100644
--- a/net-misc/cfengine/cfengine-3.6.2.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
@@ -40,6 +40,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
default
epatch "${FILESDIR}/${P}-ifconfig.patch"
+   epatch "${FILESDIR}/${P}-sysmacros.patch"
eautoreconf
 }
 

diff --git a/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch 
b/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch
new file mode 100644
index 000..7aa8e277925
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch
@@ -0,0 +1,19 @@
+Fixes compile on glibc-2.25
+
+Fixes: https://bugs.gentoo.org/612658
+--- cfengine-3.6.2.orig/libutils/platform.h2014-09-25 04:53:31.0 
-0700
 cfengine-3.6.2/libutils/platform.h 2017-10-20 15:11:15.676360363 -0700
+@@ -360,12 +360,13 @@ void globfree(glob_t *pglob);
+ 
+ #ifdef __linux__
+ # if defined(__GLIBC__) || defined(__BIONIC__)
+ #  include 
+ #  include 
+ #  include 
++#  include 
+ # else
+ #  include 
+ #  include 
+ #  include 
+ # endif
+ #endif