1 |
commit: c247772a84d4383018d034068170ee19fb39fdda |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 29 21:31:07 2017 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 29 21:31:18 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c247772a |
7 |
|
8 |
dev-libs/libnl: Replace in6.h patch with complete upstream patch. |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-libs/libnl/Manifest | 1 + |
13 |
dev-libs/libnl/files/libnl-3.2.28-in6.patch | 295 ---------------------------- |
14 |
dev-libs/libnl/libnl-3.2.28.ebuild | 3 +- |
15 |
dev-libs/libnl/libnl-3.2.29.ebuild | 3 +- |
16 |
4 files changed, 5 insertions(+), 297 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest |
19 |
index 033957a..bb8cfd1 100644 |
20 |
--- a/dev-libs/libnl/Manifest |
21 |
+++ b/dev-libs/libnl/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
DIST libnl-1.1.4.tar.gz 1174974 SHA256 4f80c21fe5bbcdde6e72b59b4f98306063a41421f909887c34e58d93e746d063 SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4 WHIRLPOOL eab5547dce7b11c86123fbcc9cd8e00100c7e78f48a4a9fef40f80f89407ea705b701f8f0eb7df63997866f17b0cf0924b43c69b29fa1f1b016fe997371b950e |
24 |
+DIST libnl-3.2.28-in6.patch.xz 6368 SHA256 0cbb8dc4e3cdc90a4a0608a26af1971d7c1c397bb5f089de8c8d640e57b7b631 SHA512 de14f7540e514871db2058236a339192443423e56f2f5bd52e02ff06873c9e411029b12f3119e57eb01201ce3643ce78ca3e8d9ada4f6ba318df96288304bead WHIRLPOOL 1f1ebfc06a0cf516202cee3aaee92d7ed584ec9633d48c23e666d40bf48d658cc27a00c9f8881a7e976e21fc66fb867e10cadd8a6c0c8826ff4fab712cb20f3d |
25 |
DIST libnl-3.2.28.tar.gz 941954 SHA256 cd608992c656e8f6e3ab6c1391b162a5a51c49336b9219f7f390e61fc5437c41 SHA512 b5f145ecafb2625ed1c42594afd6063f112a601077de5c35884b3c3bc8c562b29b52a006ccebd795c127fe69692a82def425c8605afed7e6d441582943e803d9 WHIRLPOOL ff49346ddc31105a300ebffc0e4d4956ac85ade5e92e884c62e696d7d4234d40e63cf4839e6b6fd2d98d2122662d36d3f41666391686a83c8bf966e53e22ed25 |
26 |
DIST libnl-3.2.29.tar.gz 963681 SHA256 0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922 SHA512 45e22b02368c479e01db7160345a0d3c73abf345e7b49bf350811243a17f307f5c6c3df639ec1e0c456707578aca8d69aad8afa697ac21449f521a3e39712670 WHIRLPOOL 1273dcaee79ecfdca947110c5e7ff70947703b1b0fda43fdb7c74edd78c6938f675e9a586aaff8feefce56a1f3137cbc50d3626ac336e6afa2ca8cbd8627e6eb |
27 |
|
28 |
diff --git a/dev-libs/libnl/files/libnl-3.2.28-in6.patch b/dev-libs/libnl/files/libnl-3.2.28-in6.patch |
29 |
deleted file mode 100644 |
30 |
index e8c7291..00000000 |
31 |
--- a/dev-libs/libnl/files/libnl-3.2.28-in6.patch |
32 |
+++ /dev/null |
33 |
@@ -1,295 +0,0 @@ |
34 |
---- a/dev/null |
35 |
-+++ b/include/linux-private/linux/in6.h |
36 |
-@@ -0,0 +1,292 @@ |
37 |
-+/* |
38 |
-+ * Types and definitions for AF_INET6 |
39 |
-+ * Linux INET6 implementation |
40 |
-+ * |
41 |
-+ * Authors: |
42 |
-+ * Pedro Roque <roque@××××××××.pt> |
43 |
-+ * |
44 |
-+ * Sources: |
45 |
-+ * IPv6 Program Interfaces for BSD Systems |
46 |
-+ * <draft-ietf-ipngwg-bsd-api-05.txt> |
47 |
-+ * |
48 |
-+ * Advanced Sockets API for IPv6 |
49 |
-+ * <draft-stevens-advanced-api-00.txt> |
50 |
-+ * |
51 |
-+ * This program is free software; you can redistribute it and/or |
52 |
-+ * modify it under the terms of the GNU General Public License |
53 |
-+ * as published by the Free Software Foundation; either version |
54 |
-+ * 2 of the License, or (at your option) any later version. |
55 |
-+ */ |
56 |
-+ |
57 |
-+#ifndef _LINUX_IN6_H |
58 |
-+#define _LINUX_IN6_H |
59 |
-+ |
60 |
-+#include <linux/types.h> |
61 |
-+ |
62 |
-+/* |
63 |
-+ * IPv6 address structure |
64 |
-+ */ |
65 |
-+ |
66 |
-+#if __UAPI_DEF_IN6_ADDR |
67 |
-+struct in6_addr { |
68 |
-+ union { |
69 |
-+ __u8 u6_addr8[16]; |
70 |
-+#if __UAPI_DEF_IN6_ADDR_ALT |
71 |
-+ __be16 u6_addr16[8]; |
72 |
-+ __be32 u6_addr32[4]; |
73 |
-+#endif |
74 |
-+ } in6_u; |
75 |
-+#define s6_addr in6_u.u6_addr8 |
76 |
-+#if __UAPI_DEF_IN6_ADDR_ALT |
77 |
-+#define s6_addr16 in6_u.u6_addr16 |
78 |
-+#define s6_addr32 in6_u.u6_addr32 |
79 |
-+#endif |
80 |
-+}; |
81 |
-+#endif /* __UAPI_DEF_IN6_ADDR */ |
82 |
-+ |
83 |
-+#if __UAPI_DEF_SOCKADDR_IN6 |
84 |
-+struct sockaddr_in6 { |
85 |
-+ unsigned short int sin6_family; /* AF_INET6 */ |
86 |
-+ __be16 sin6_port; /* Transport layer port # */ |
87 |
-+ __be32 sin6_flowinfo; /* IPv6 flow information */ |
88 |
-+ struct in6_addr sin6_addr; /* IPv6 address */ |
89 |
-+ __u32 sin6_scope_id; /* scope id (new in RFC2553) */ |
90 |
-+}; |
91 |
-+#endif /* __UAPI_DEF_SOCKADDR_IN6 */ |
92 |
-+ |
93 |
-+#if __UAPI_DEF_IPV6_MREQ |
94 |
-+struct ipv6_mreq { |
95 |
-+ /* IPv6 multicast address of group */ |
96 |
-+ struct in6_addr ipv6mr_multiaddr; |
97 |
-+ |
98 |
-+ /* local IPv6 address of interface */ |
99 |
-+ int ipv6mr_ifindex; |
100 |
-+}; |
101 |
-+#endif /* __UAPI_DEF_IVP6_MREQ */ |
102 |
-+ |
103 |
-+#define ipv6mr_acaddr ipv6mr_multiaddr |
104 |
-+ |
105 |
-+struct in6_flowlabel_req { |
106 |
-+ struct in6_addr flr_dst; |
107 |
-+ __be32 flr_label; |
108 |
-+ __u8 flr_action; |
109 |
-+ __u8 flr_share; |
110 |
-+ __u16 flr_flags; |
111 |
-+ __u16 flr_expires; |
112 |
-+ __u16 flr_linger; |
113 |
-+ __u32 __flr_pad; |
114 |
-+ /* Options in format of IPV6_PKTOPTIONS */ |
115 |
-+}; |
116 |
-+ |
117 |
-+#define IPV6_FL_A_GET 0 |
118 |
-+#define IPV6_FL_A_PUT 1 |
119 |
-+#define IPV6_FL_A_RENEW 2 |
120 |
-+ |
121 |
-+#define IPV6_FL_F_CREATE 1 |
122 |
-+#define IPV6_FL_F_EXCL 2 |
123 |
-+#define IPV6_FL_F_REFLECT 4 |
124 |
-+#define IPV6_FL_F_REMOTE 8 |
125 |
-+ |
126 |
-+#define IPV6_FL_S_NONE 0 |
127 |
-+#define IPV6_FL_S_EXCL 1 |
128 |
-+#define IPV6_FL_S_PROCESS 2 |
129 |
-+#define IPV6_FL_S_USER 3 |
130 |
-+#define IPV6_FL_S_ANY 255 |
131 |
-+ |
132 |
-+ |
133 |
-+/* |
134 |
-+ * Bitmask constant declarations to help applications select out the |
135 |
-+ * flow label and priority fields. |
136 |
-+ * |
137 |
-+ * Note that this are in host byte order while the flowinfo field of |
138 |
-+ * sockaddr_in6 is in network byte order. |
139 |
-+ */ |
140 |
-+ |
141 |
-+#define IPV6_FLOWINFO_FLOWLABEL 0x000fffff |
142 |
-+#define IPV6_FLOWINFO_PRIORITY 0x0ff00000 |
143 |
-+ |
144 |
-+/* These definitions are obsolete */ |
145 |
-+#define IPV6_PRIORITY_UNCHARACTERIZED 0x0000 |
146 |
-+#define IPV6_PRIORITY_FILLER 0x0100 |
147 |
-+#define IPV6_PRIORITY_UNATTENDED 0x0200 |
148 |
-+#define IPV6_PRIORITY_RESERVED1 0x0300 |
149 |
-+#define IPV6_PRIORITY_BULK 0x0400 |
150 |
-+#define IPV6_PRIORITY_RESERVED2 0x0500 |
151 |
-+#define IPV6_PRIORITY_INTERACTIVE 0x0600 |
152 |
-+#define IPV6_PRIORITY_CONTROL 0x0700 |
153 |
-+#define IPV6_PRIORITY_8 0x0800 |
154 |
-+#define IPV6_PRIORITY_9 0x0900 |
155 |
-+#define IPV6_PRIORITY_10 0x0a00 |
156 |
-+#define IPV6_PRIORITY_11 0x0b00 |
157 |
-+#define IPV6_PRIORITY_12 0x0c00 |
158 |
-+#define IPV6_PRIORITY_13 0x0d00 |
159 |
-+#define IPV6_PRIORITY_14 0x0e00 |
160 |
-+#define IPV6_PRIORITY_15 0x0f00 |
161 |
-+ |
162 |
-+/* |
163 |
-+ * IPV6 extension headers |
164 |
-+ */ |
165 |
-+#if __UAPI_DEF_IPPROTO_V6 |
166 |
-+#define IPPROTO_HOPOPTS 0 /* IPv6 hop-by-hop options */ |
167 |
-+#define IPPROTO_ROUTING 43 /* IPv6 routing header */ |
168 |
-+#define IPPROTO_FRAGMENT 44 /* IPv6 fragmentation header */ |
169 |
-+#define IPPROTO_ICMPV6 58 /* ICMPv6 */ |
170 |
-+#define IPPROTO_NONE 59 /* IPv6 no next header */ |
171 |
-+#define IPPROTO_DSTOPTS 60 /* IPv6 destination options */ |
172 |
-+#define IPPROTO_MH 135 /* IPv6 mobility header */ |
173 |
-+#endif /* __UAPI_DEF_IPPROTO_V6 */ |
174 |
-+ |
175 |
-+/* |
176 |
-+ * IPv6 TLV options. |
177 |
-+ */ |
178 |
-+#define IPV6_TLV_PAD1 0 |
179 |
-+#define IPV6_TLV_PADN 1 |
180 |
-+#define IPV6_TLV_ROUTERALERT 5 |
181 |
-+#define IPV6_TLV_JUMBO 194 |
182 |
-+#define IPV6_TLV_HAO 201 /* home address option */ |
183 |
-+ |
184 |
-+/* |
185 |
-+ * IPV6 socket options |
186 |
-+ */ |
187 |
-+#if __UAPI_DEF_IPV6_OPTIONS |
188 |
-+#define IPV6_ADDRFORM 1 |
189 |
-+#define IPV6_2292PKTINFO 2 |
190 |
-+#define IPV6_2292HOPOPTS 3 |
191 |
-+#define IPV6_2292DSTOPTS 4 |
192 |
-+#define IPV6_2292RTHDR 5 |
193 |
-+#define IPV6_2292PKTOPTIONS 6 |
194 |
-+#define IPV6_CHECKSUM 7 |
195 |
-+#define IPV6_2292HOPLIMIT 8 |
196 |
-+#define IPV6_NEXTHOP 9 |
197 |
-+#define IPV6_AUTHHDR 10 /* obsolete */ |
198 |
-+#define IPV6_FLOWINFO 11 |
199 |
-+ |
200 |
-+#define IPV6_UNICAST_HOPS 16 |
201 |
-+#define IPV6_MULTICAST_IF 17 |
202 |
-+#define IPV6_MULTICAST_HOPS 18 |
203 |
-+#define IPV6_MULTICAST_LOOP 19 |
204 |
-+#define IPV6_ADD_MEMBERSHIP 20 |
205 |
-+#define IPV6_DROP_MEMBERSHIP 21 |
206 |
-+#define IPV6_ROUTER_ALERT 22 |
207 |
-+#define IPV6_MTU_DISCOVER 23 |
208 |
-+#define IPV6_MTU 24 |
209 |
-+#define IPV6_RECVERR 25 |
210 |
-+#define IPV6_V6ONLY 26 |
211 |
-+#define IPV6_JOIN_ANYCAST 27 |
212 |
-+#define IPV6_LEAVE_ANYCAST 28 |
213 |
-+ |
214 |
-+/* IPV6_MTU_DISCOVER values */ |
215 |
-+#define IPV6_PMTUDISC_DONT 0 |
216 |
-+#define IPV6_PMTUDISC_WANT 1 |
217 |
-+#define IPV6_PMTUDISC_DO 2 |
218 |
-+#define IPV6_PMTUDISC_PROBE 3 |
219 |
-+/* same as IPV6_PMTUDISC_PROBE, provided for symetry with IPv4 |
220 |
-+ * also see comments on IP_PMTUDISC_INTERFACE |
221 |
-+ */ |
222 |
-+#define IPV6_PMTUDISC_INTERFACE 4 |
223 |
-+/* weaker version of IPV6_PMTUDISC_INTERFACE, which allows packets to |
224 |
-+ * get fragmented if they exceed the interface mtu |
225 |
-+ */ |
226 |
-+#define IPV6_PMTUDISC_OMIT 5 |
227 |
-+ |
228 |
-+/* Flowlabel */ |
229 |
-+#define IPV6_FLOWLABEL_MGR 32 |
230 |
-+#define IPV6_FLOWINFO_SEND 33 |
231 |
-+ |
232 |
-+#define IPV6_IPSEC_POLICY 34 |
233 |
-+#define IPV6_XFRM_POLICY 35 |
234 |
-+#endif |
235 |
-+ |
236 |
-+/* |
237 |
-+ * Multicast: |
238 |
-+ * Following socket options are shared between IPv4 and IPv6. |
239 |
-+ * |
240 |
-+ * MCAST_JOIN_GROUP 42 |
241 |
-+ * MCAST_BLOCK_SOURCE 43 |
242 |
-+ * MCAST_UNBLOCK_SOURCE 44 |
243 |
-+ * MCAST_LEAVE_GROUP 45 |
244 |
-+ * MCAST_JOIN_SOURCE_GROUP 46 |
245 |
-+ * MCAST_LEAVE_SOURCE_GROUP 47 |
246 |
-+ * MCAST_MSFILTER 48 |
247 |
-+ */ |
248 |
-+ |
249 |
-+/* |
250 |
-+ * Advanced API (RFC3542) (1) |
251 |
-+ * |
252 |
-+ * Note: IPV6_RECVRTHDRDSTOPTS does not exist. see net/ipv6/datagram.c. |
253 |
-+ */ |
254 |
-+ |
255 |
-+#define IPV6_RECVPKTINFO 49 |
256 |
-+#define IPV6_PKTINFO 50 |
257 |
-+#define IPV6_RECVHOPLIMIT 51 |
258 |
-+#define IPV6_HOPLIMIT 52 |
259 |
-+#define IPV6_RECVHOPOPTS 53 |
260 |
-+#define IPV6_HOPOPTS 54 |
261 |
-+#define IPV6_RTHDRDSTOPTS 55 |
262 |
-+#define IPV6_RECVRTHDR 56 |
263 |
-+#define IPV6_RTHDR 57 |
264 |
-+#define IPV6_RECVDSTOPTS 58 |
265 |
-+#define IPV6_DSTOPTS 59 |
266 |
-+#define IPV6_RECVPATHMTU 60 |
267 |
-+#define IPV6_PATHMTU 61 |
268 |
-+#define IPV6_DONTFRAG 62 |
269 |
-+#if 0 /* not yet */ |
270 |
-+#define IPV6_USE_MIN_MTU 63 |
271 |
-+#endif |
272 |
-+ |
273 |
-+/* |
274 |
-+ * Netfilter (1) |
275 |
-+ * |
276 |
-+ * Following socket options are used in ip6_tables; |
277 |
-+ * see include/linux/netfilter_ipv6/ip6_tables.h. |
278 |
-+ * |
279 |
-+ * IP6T_SO_SET_REPLACE / IP6T_SO_GET_INFO 64 |
280 |
-+ * IP6T_SO_SET_ADD_COUNTERS / IP6T_SO_GET_ENTRIES 65 |
281 |
-+ */ |
282 |
-+ |
283 |
-+/* |
284 |
-+ * Advanced API (RFC3542) (2) |
285 |
-+ */ |
286 |
-+#define IPV6_RECVTCLASS 66 |
287 |
-+#define IPV6_TCLASS 67 |
288 |
-+ |
289 |
-+/* |
290 |
-+ * Netfilter (2) |
291 |
-+ * |
292 |
-+ * Following socket options are used in ip6_tables; |
293 |
-+ * see include/linux/netfilter_ipv6/ip6_tables.h. |
294 |
-+ * |
295 |
-+ * IP6T_SO_GET_REVISION_MATCH 68 |
296 |
-+ * IP6T_SO_GET_REVISION_TARGET 69 |
297 |
-+ * IP6T_SO_ORIGINAL_DST 80 |
298 |
-+ */ |
299 |
-+ |
300 |
-+#define IPV6_AUTOFLOWLABEL 70 |
301 |
-+/* RFC5014: Source address selection */ |
302 |
-+#define IPV6_ADDR_PREFERENCES 72 |
303 |
-+ |
304 |
-+#define IPV6_PREFER_SRC_TMP 0x0001 |
305 |
-+#define IPV6_PREFER_SRC_PUBLIC 0x0002 |
306 |
-+#define IPV6_PREFER_SRC_PUBTMP_DEFAULT 0x0100 |
307 |
-+#define IPV6_PREFER_SRC_COA 0x0004 |
308 |
-+#define IPV6_PREFER_SRC_HOME 0x0400 |
309 |
-+#define IPV6_PREFER_SRC_CGA 0x0008 |
310 |
-+#define IPV6_PREFER_SRC_NONCGA 0x0800 |
311 |
-+ |
312 |
-+/* RFC5082: Generalized Ttl Security Mechanism */ |
313 |
-+#define IPV6_MINHOPCOUNT 73 |
314 |
-+ |
315 |
-+#define IPV6_ORIGDSTADDR 74 |
316 |
-+#define IPV6_RECVORIGDSTADDR IPV6_ORIGDSTADDR |
317 |
-+#define IPV6_TRANSPARENT 75 |
318 |
-+#define IPV6_UNICAST_IF 76 |
319 |
-+ |
320 |
-+/* |
321 |
-+ * Multicast Routing: |
322 |
-+ * see include/uapi/linux/mroute6.h. |
323 |
-+ * |
324 |
-+ * MRT6_BASE 200 |
325 |
-+ * ... |
326 |
-+ * MRT6_MAX |
327 |
-+ */ |
328 |
-+#endif /* _LINUX_IN6_H */ |
329 |
|
330 |
diff --git a/dev-libs/libnl/libnl-3.2.28.ebuild b/dev-libs/libnl/libnl-3.2.28.ebuild |
331 |
index 3e1294c..ed75b9f 100644 |
332 |
--- a/dev-libs/libnl/libnl-3.2.28.ebuild |
333 |
+++ b/dev-libs/libnl/libnl-3.2.28.ebuild |
334 |
@@ -15,6 +15,7 @@ DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel int |
335 |
HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl" |
336 |
SRC_URI=" |
337 |
https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz |
338 |
+ https://dev.gentoo.org/~jer/libnl-3.2.28-in6.patch.xz |
339 |
" |
340 |
LICENSE="LGPL-2.1 utils? ( GPL-2 )" |
341 |
SLOT="3" |
342 |
@@ -63,7 +64,7 @@ MULTILIB_WRAPPED_HEADERS=( |
343 |
|
344 |
PATCHES=( |
345 |
"${FILESDIR}"/${PN}-1.1-vlan-header.patch |
346 |
- "${FILESDIR}"/${PN}-3.2.28-in6.patch |
347 |
+ "${WORKDIR}"/${PN}-3.2.28-in6.patch |
348 |
) |
349 |
|
350 |
src_prepare() { |
351 |
|
352 |
diff --git a/dev-libs/libnl/libnl-3.2.29.ebuild b/dev-libs/libnl/libnl-3.2.29.ebuild |
353 |
index a9afe56..1a19651 100644 |
354 |
--- a/dev-libs/libnl/libnl-3.2.29.ebuild |
355 |
+++ b/dev-libs/libnl/libnl-3.2.29.ebuild |
356 |
@@ -15,6 +15,7 @@ DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel int |
357 |
HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl" |
358 |
SRC_URI=" |
359 |
https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz |
360 |
+ https://dev.gentoo.org/~jer/libnl-3.2.28-in6.patch.xz |
361 |
" |
362 |
LICENSE="LGPL-2.1 utils? ( GPL-2 )" |
363 |
SLOT="3" |
364 |
@@ -63,7 +64,7 @@ MULTILIB_WRAPPED_HEADERS=( |
365 |
|
366 |
PATCHES=( |
367 |
"${FILESDIR}"/${PN}-1.1-vlan-header.patch |
368 |
- "${FILESDIR}"/${PN}-3.2.28-in6.patch |
369 |
+ "${WORKDIR}"/${PN}-3.2.28-in6.patch |
370 |
) |
371 |
|
372 |
src_prepare() { |