1 |
commit: 47bc9ccf7abfb3054d762f2d9f7b3a1cbeebe612 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 1 19:19:21 2017 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 1 19:23:50 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47bc9ccf |
7 |
|
8 |
dev-libs/libnl: Fix building against older kernel headers (bug #604190 by pavel sanda). |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-libs/libnl/files/libnl-3.2.20-cache-api.patch | 9 ------- |
13 |
.../libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch | 30 ---------------------- |
14 |
dev-libs/libnl/files/libnl-3.2.28-in6.patch | 12 +++++++++ |
15 |
dev-libs/libnl/libnl-3.2.28.ebuild | 5 ++-- |
16 |
dev-libs/libnl/libnl-3.2.29.ebuild | 5 ++-- |
17 |
dev-libs/libnl/libnl-3.2.9999.ebuild | 11 +++----- |
18 |
6 files changed, 20 insertions(+), 52 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/libnl/files/libnl-3.2.20-cache-api.patch b/dev-libs/libnl/files/libnl-3.2.20-cache-api.patch |
21 |
deleted file mode 100644 |
22 |
index ce6e47b..00000000 |
23 |
--- a/dev-libs/libnl/files/libnl-3.2.20-cache-api.patch |
24 |
+++ /dev/null |
25 |
@@ -1,9 +0,0 @@ |
26 |
---- a/tests/test-cache-mngr.c |
27 |
-+++ b/tests/test-cache-mngr.c |
28 |
-@@ -1,5 +1,5 @@ |
29 |
- #include <netlink/netlink.h> |
30 |
--#include <netlink/cache.h> |
31 |
-+#include <netlink/cache-api.h> |
32 |
- #include <netlink/cli/utils.h> |
33 |
- #include <signal.h> |
34 |
- |
35 |
|
36 |
diff --git a/dev-libs/libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch b/dev-libs/libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch |
37 |
deleted file mode 100644 |
38 |
index 09b2f0b..00000000 |
39 |
--- a/dev-libs/libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch |
40 |
+++ /dev/null |
41 |
@@ -1,30 +0,0 @@ |
42 |
---- a/src/nl-class-add.c |
43 |
-+++ b/src/nl-class-add.c |
44 |
-@@ -14,6 +14,7 @@ |
45 |
- #include <netlink/cli/qdisc.h> |
46 |
- #include <netlink/cli/class.h> |
47 |
- #include <netlink/cli/link.h> |
48 |
-+#include <netlink/route/tc-api.h> /* rtnl_tc_get_ops() */ |
49 |
- |
50 |
- static int quiet = 0; |
51 |
- |
52 |
---- a/src/nl-cls-add.c |
53 |
-+++ b/src/nl-cls-add.c |
54 |
-@@ -12,6 +12,7 @@ |
55 |
- #include <netlink/cli/tc.h> |
56 |
- #include <netlink/cli/cls.h> |
57 |
- #include <netlink/cli/link.h> |
58 |
-+#include <netlink/route/tc-api.h> /* rtnl_tc_get_ops() */ |
59 |
- |
60 |
- static int quiet = 0; |
61 |
- |
62 |
---- a/src/nl-qdisc-add.c |
63 |
-+++ b/src/nl-qdisc-add.c |
64 |
-@@ -13,6 +13,7 @@ |
65 |
- #include <netlink/cli/tc.h> |
66 |
- #include <netlink/cli/qdisc.h> |
67 |
- #include <netlink/cli/link.h> |
68 |
-+#include <netlink/route/tc-api.h> /* rtnl_tc_get_ops() */ |
69 |
- |
70 |
- static int quiet = 0; |
71 |
- |
72 |
|
73 |
diff --git a/dev-libs/libnl/files/libnl-3.2.28-in6.patch b/dev-libs/libnl/files/libnl-3.2.28-in6.patch |
74 |
new file mode 100644 |
75 |
index 00000000..5dcf6ae |
76 |
--- /dev/null |
77 |
+++ b/dev-libs/libnl/files/libnl-3.2.28-in6.patch |
78 |
@@ -0,0 +1,12 @@ |
79 |
+https://github.com/thom311/libnl/pull/121 |
80 |
+ |
81 |
+--- a/include/linux-private/linux/if_bridge.h |
82 |
++++ b/include/linux-private/linux/if_bridge.h |
83 |
+@@ -15,7 +15,6 @@ |
84 |
+ |
85 |
+ #include <linux/types.h> |
86 |
+ #include <linux/if_ether.h> |
87 |
+-#include <linux/in6.h> |
88 |
+ |
89 |
+ #define SYSFS_BRIDGE_ATTR "bridge" |
90 |
+ #define SYSFS_BRIDGE_FDB "brforward" |
91 |
|
92 |
diff --git a/dev-libs/libnl/libnl-3.2.28.ebuild b/dev-libs/libnl/libnl-3.2.28.ebuild |
93 |
index ef5f05a..9c03787 100644 |
94 |
--- a/dev-libs/libnl/libnl-3.2.28.ebuild |
95 |
+++ b/dev-libs/libnl/libnl-3.2.28.ebuild |
96 |
@@ -1,4 +1,4 @@ |
97 |
-# Copyright 1999-2016 Gentoo Foundation |
98 |
+# Copyright 1999-2017 Gentoo Foundation |
99 |
# Distributed under the terms of the GNU General Public License v2 |
100 |
# $Id$ |
101 |
|
102 |
@@ -63,8 +63,7 @@ MULTILIB_WRAPPED_HEADERS=( |
103 |
|
104 |
PATCHES=( |
105 |
"${FILESDIR}"/${PN}-1.1-vlan-header.patch |
106 |
- "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch |
107 |
- "${FILESDIR}"/${PN}-3.2.20-cache-api.patch |
108 |
+ "${FILESDIR}"/${PN}-3.2.28-in6.patch |
109 |
) |
110 |
|
111 |
src_prepare() { |
112 |
|
113 |
diff --git a/dev-libs/libnl/libnl-3.2.29.ebuild b/dev-libs/libnl/libnl-3.2.29.ebuild |
114 |
index 5c5c565..56f3021 100644 |
115 |
--- a/dev-libs/libnl/libnl-3.2.29.ebuild |
116 |
+++ b/dev-libs/libnl/libnl-3.2.29.ebuild |
117 |
@@ -1,4 +1,4 @@ |
118 |
-# Copyright 1999-2016 Gentoo Foundation |
119 |
+# Copyright 1999-2017 Gentoo Foundation |
120 |
# Distributed under the terms of the GNU General Public License v2 |
121 |
# $Id$ |
122 |
|
123 |
@@ -63,8 +63,7 @@ MULTILIB_WRAPPED_HEADERS=( |
124 |
|
125 |
PATCHES=( |
126 |
"${FILESDIR}"/${PN}-1.1-vlan-header.patch |
127 |
- "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch |
128 |
- "${FILESDIR}"/${PN}-3.2.20-cache-api.patch |
129 |
+ "${FILESDIR}"/${PN}-3.2.28-in6.patch |
130 |
) |
131 |
|
132 |
src_prepare() { |
133 |
|
134 |
diff --git a/dev-libs/libnl/libnl-3.2.9999.ebuild b/dev-libs/libnl/libnl-3.2.9999.ebuild |
135 |
index 29a9d87..1c1ea6d 100644 |
136 |
--- a/dev-libs/libnl/libnl-3.2.9999.ebuild |
137 |
+++ b/dev-libs/libnl/libnl-3.2.9999.ebuild |
138 |
@@ -1,4 +1,4 @@ |
139 |
-# Copyright 1999-2016 Gentoo Foundation |
140 |
+# Copyright 1999-2017 Gentoo Foundation |
141 |
# Distributed under the terms of the GNU General Public License v2 |
142 |
# $Id$ |
143 |
|
144 |
@@ -31,16 +31,13 @@ DEPEND=" |
145 |
sys-devel/flex |
146 |
" |
147 |
|
148 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
149 |
+REQUIRED_USE=" |
150 |
+ python? ( ${PYTHON_REQUIRED_USE} ) |
151 |
+" |
152 |
|
153 |
DOCS=( |
154 |
ChangeLog |
155 |
) |
156 |
-PATCHES=( |
157 |
- "${FILESDIR}"/${PN}-1.1-vlan-header.patch |
158 |
- "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch |
159 |
- "${FILESDIR}"/${PN}-3.2.20-cache-api.patch |
160 |
-) |
161 |
|
162 |
MULTILIB_WRAPPED_HEADERS=( |
163 |
# we do not install CLI stuff for non-native |