1 |
mschiff 14/02/27 17:45:03 |
2 |
|
3 |
Added: cfengine-3.5.3-ifconfig.patch |
4 |
Log: |
5 |
Version bump to 3.5.3. |
6 |
|
7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 net-misc/cfengine/files/cfengine-3.5.3-ifconfig.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/files/cfengine-3.5.3-ifconfig.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/files/cfengine-3.5.3-ifconfig.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: cfengine-3.5.3-ifconfig.patch |
16 |
=================================================================== |
17 |
diff -ur cfengine-3.5.3.orig/configure.ac cfengine-3.5.3/configure.ac |
18 |
--- cfengine-3.5.3.orig/configure.ac 2013-12-09 13:13:14.000000000 +0100 |
19 |
+++ cfengine-3.5.3/configure.ac 2014-02-27 12:36:55.179893570 +0100 |
20 |
@@ -1047,6 +1047,16 @@ |
21 |
AM_SUBST_NOTMAKE(post_macros) |
22 |
|
23 |
dnl ###################################################################### |
24 |
+dnl Find the path to ifconfig |
25 |
+dnl ###################################################################### |
26 |
+ |
27 |
+AC_PATH_PROG(IFCONFIG_PATH,ifconfig) |
28 |
+if test x"$IFCONFIG_PATH" = x"" ; then |
29 |
+ AC_MSG_ERROR([Cannot found the ifconfig binary.]) |
30 |
+fi |
31 |
+AC_DEFINE_UNQUOTED(IFCONFIG_RUN, "$IFCONFIG_PATH -a", [the path to run ifconfig -a]) |
32 |
+ |
33 |
+dnl ###################################################################### |
34 |
dnl Summarize |
35 |
dnl ###################################################################### |
36 |
|
37 |
diff -ur cfengine-3.5.3.orig/libpromises/unix.c cfengine-3.5.3/libpromises/unix.c |
38 |
--- cfengine-3.5.3.orig/libpromises/unix.c 2013-12-09 13:13:14.000000000 +0100 |
39 |
+++ cfengine-3.5.3/libpromises/unix.c 2014-02-27 12:38:35.036608105 +0100 |
40 |
@@ -767,7 +767,7 @@ |
41 |
return; |
42 |
} |
43 |
#else |
44 |
- if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL) |
45 |
+ if ((pp = cf_popen(IFCONFIG_RUN, "r", true)) == NULL) |
46 |
{ |
47 |
Log(LOG_LEVEL_VERBOSE, "Could not find interface info"); |
48 |
return; |
49 |
diff -ur cfengine-3.5.3.orig/libutils/config.h.in cfengine-3.5.3/libutils/config.h.in |
50 |
--- cfengine-3.5.3.orig/libutils/config.h.in 2013-12-09 13:55:25.000000000 +0100 |
51 |
+++ cfengine-3.5.3/libutils/config.h.in 2014-02-27 12:39:41.537416111 +0100 |
52 |
@@ -914,3 +914,6 @@ |
53 |
|
54 |
/* Define to rpl_vsnprintf if the replacement function should be used. */ |
55 |
#undef vsnprintf |
56 |
+ |
57 |
+/* Define to the path for running ifconfig -a */ |
58 |
+#undef IFCONFIG_RUN |