commit:     a1c0851a496509240d8292e3d080b4eb97cd4851
Author:     Chris Rorvick <chris <AT> rorvick <DOT> com>
AuthorDate: Sat Jan 20 12:13:26 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 07:45:31 2018 +0000
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;

Reply via email to