From: Chris Rorvick <chris@rorvick.com>
Date: Sat, 20 Jan 2018 12:13:26 +0000 (-0600)
Subject: net-misc/cfengine: find ifconfig(8) in /bin/.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a1c0851a496509240d8292e3d080b4eb97cd4851;p=gentoo.git

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
---

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 ae0f491347f9..a31b3513ded4 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;