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 ae0f491347f9dde258f23f2f734c52d5b082b7f6..a31b3513ded4ba96e284c011c49b1316aeb414f9 100644 (file)
--- 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;