| 1 |
idl0r 13/03/28 23:35:20 |
| 2 |
|
| 3 |
Added: cfengine-3.4.4-acl.patch |
| 4 |
cfengine-3.4.4-ifconfig.patch |
| 5 |
Log: |
| 6 |
Version bump, bug 462664 also fixes the ifconfig path, bug 444532 |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key B427ABC8) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-misc/cfengine/files/cfengine-3.4.4-acl.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/files/cfengine-3.4.4-acl.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/files/cfengine-3.4.4-acl.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: cfengine-3.4.4-acl.patch |
| 17 |
=================================================================== |
| 18 |
From a12b5b3b8cd4397545104923d1de3297fd971f9e Mon Sep 17 00:00:00 2001 |
| 19 |
From: Christian Ruppert <idl0r@g.o> |
| 20 |
Date: Fri, 29 Mar 2013 00:23:21 +0100 |
| 21 |
Subject: [PATCH] Fix acl header detection |
| 22 |
|
| 23 |
|
| 24 |
Signed-off-by: Christian Ruppert <idl0r@g.o> |
| 25 |
--- |
| 26 |
configure.ac | 5 ++++- |
| 27 |
1 file changed, 4 insertions(+), 1 deletion(-) |
| 28 |
|
| 29 |
diff --git a/configure.ac b/configure.ac |
| 30 |
index 542d115..f3f0c04 100755 |
| 31 |
--- a/configure.ac |
| 32 |
+++ b/configure.ac |
| 33 |
@@ -335,7 +335,10 @@ AC_ARG_WITH([libacl], |
| 34 |
if test "x$with_libacl" != xno; then |
| 35 |
CF3_WITH_LIBRARY(libacl, [ |
| 36 |
AC_CHECK_LIB(acl, acl_init, [], [if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl library); fi]) |
| 37 |
- AC_CHECK_HEADERS([acl.h sys/acl.h acl/libacl.h], [], [if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl library headers); fi]) |
| 38 |
+ AC_CHECK_HEADERS([acl.h sys/acl.h acl/libacl.h], [found_acl_h=yes], []) |
| 39 |
+ if test "x$found_acl_h" != xyes; then |
| 40 |
+ AC_MSG_ERROR(Cannot find libacl library headers) |
| 41 |
+ fi |
| 42 |
]) |
| 43 |
fi |
| 44 |
|
| 45 |
-- |
| 46 |
1.8.1.5 |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
1.1 net-misc/cfengine/files/cfengine-3.4.4-ifconfig.patch |
| 52 |
|
| 53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/files/cfengine-3.4.4-ifconfig.patch?rev=1.1&view=markup |
| 54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/files/cfengine-3.4.4-ifconfig.patch?rev=1.1&content-type=text/plain |
| 55 |
|
| 56 |
Index: cfengine-3.4.4-ifconfig.patch |
| 57 |
=================================================================== |
| 58 |
Patch by clabbe.montjoie@×××××.com |
| 59 |
https://bugs.gentoo.org/444532 |
| 60 |
|
| 61 |
--- src/conf.h.in.old 2012-12-28 16:18:23.000000000 +0100 |
| 62 |
+++ src/conf.h.in 2012-12-28 16:19:08.000000000 +0100 |
| 63 |
@@ -773,3 +773,6 @@ |
| 64 |
|
| 65 |
/* Define to rpl_vsnprintf if the replacement function should be used. */ |
| 66 |
#undef vsnprintf |
| 67 |
+ |
| 68 |
+/* Define to the path for running ifconfig -a */ |
| 69 |
+#undef IFCONFIG_RUN |
| 70 |
--- src/unix.c.old 2012-12-28 16:05:28.000000000 +0100 |
| 71 |
+++ src/unix.c 2012-12-28 16:13:15.000000000 +0100 |
| 72 |
@@ -900,7 +900,7 @@ |
| 73 |
|
| 74 |
default: |
| 75 |
|
| 76 |
- if ((pp = cf_popen("/sbin/ifconfig -a", "r")) == NULL) |
| 77 |
+ if ((pp = cf_popen(IFCONFIG_RUN, "r")) == NULL) |
| 78 |
{ |
| 79 |
CfOut(cf_verbose, "", "Could not find interface info\n"); |
| 80 |
return; |
| 81 |
--- configure.ac.old 2012-12-29 11:38:20.000000000 +0100 |
| 82 |
+++ configure.ac 2012-12-29 11:49:11.000000000 +0100 |
| 83 |
@@ -882,6 +882,16 @@ |
| 84 |
|
| 85 |
|
| 86 |
dnl ###################################################################### |
| 87 |
+dnl Find the path to ifconfig |
| 88 |
+dnl ###################################################################### |
| 89 |
+ |
| 90 |
+AC_PATH_PROG(IFCONFIG_PATH,ifconfig) |
| 91 |
+if test x"$IFCONFIG_PATH" = x"" ; then |
| 92 |
+ AC_MSG_ERROR([Cannot found the ifconfig binary.]) |
| 93 |
+fi |
| 94 |
+AC_DEFINE_UNQUOTED(IFCONFIG_RUN, "$IFCONFIG_PATH -a", [the path to run ifconfig -a]) |
| 95 |
+ |
| 96 |
+dnl ###################################################################### |
| 97 |
dnl Summarize |
| 98 |
dnl ###################################################################### |
Archives