Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/files/, net-misc/cfengine/
Date: Fri, 20 Oct 2017 22:23:09
Message-Id: 1508538172.d83856cd755550eaa3c6cec3902b0e301dda1f39.robbat2@gentoo
1 commit: d83856cd755550eaa3c6cec3902b0e301dda1f39
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 20 22:18:29 2017 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 20 22:22:52 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83856cd
7
8 net-misc/cfengine: compile-fix for glibc-2.25
9
10 Closes: https://bugs.gentoo.org/612658
11 Package-Manager: Portage-2.3.8, Repoman-2.3.3
12 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
13
14 net-misc/cfengine/cfengine-3.6.2.ebuild | 1 +
15 .../cfengine/files/cfengine-3.6.2-sysmacros.patch | 19 +++++++++++++++++++
16 2 files changed, 20 insertions(+)
17
18 diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild b/net-misc/cfengine/cfengine-3.6.2.ebuild
19 index a4e5ae6c7db..025728ee43e 100644
20 --- a/net-misc/cfengine/cfengine-3.6.2.ebuild
21 +++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
22 @@ -40,6 +40,7 @@ S="${WORKDIR}/${MY_P}"
23 src_prepare() {
24 default
25 epatch "${FILESDIR}/${P}-ifconfig.patch"
26 + epatch "${FILESDIR}/${P}-sysmacros.patch"
27 eautoreconf
28 }
29
30
31 diff --git a/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch b/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch
32 new file mode 100644
33 index 00000000000..7aa8e277925
34 --- /dev/null
35 +++ b/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch
36 @@ -0,0 +1,19 @@
37 +Fixes compile on glibc-2.25
38 +
39 +Fixes: https://bugs.gentoo.org/612658
40 +--- cfengine-3.6.2.orig/libutils/platform.h 2014-09-25 04:53:31.000000000 -0700
41 ++++ cfengine-3.6.2/libutils/platform.h 2017-10-20 15:11:15.676360363 -0700
42 +@@ -360,12 +360,13 @@ void globfree(glob_t *pglob);
43 +
44 + #ifdef __linux__
45 + # if defined(__GLIBC__) || defined(__BIONIC__)
46 + # include <net/route.h>
47 + # include <netinet/in.h>
48 + # include <netinet/ip.h>
49 ++# include <sys/sysmacros.h>
50 + # else
51 + # include <linux/route.h>
52 + # include <linux/in.h>
53 + # include <linux/ip.h>
54 + # endif
55 + #endif