public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libnl/files/, dev-libs/libnl/
@ 2017-01-01 19:23 Jeroen Roovers
  0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2017-01-01 19:23 UTC (permalink / raw
  To: gentoo-commits

commit:     47bc9ccf7abfb3054d762f2d9f7b3a1cbeebe612
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  1 19:19:21 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan  1 19:23:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47bc9ccf

dev-libs/libnl: Fix building against older kernel headers (bug #604190 by pavel sanda).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/libnl/files/libnl-3.2.20-cache-api.patch  |  9 -------
 .../libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch | 30 ----------------------
 dev-libs/libnl/files/libnl-3.2.28-in6.patch        | 12 +++++++++
 dev-libs/libnl/libnl-3.2.28.ebuild                 |  5 ++--
 dev-libs/libnl/libnl-3.2.29.ebuild                 |  5 ++--
 dev-libs/libnl/libnl-3.2.9999.ebuild               | 11 +++-----
 6 files changed, 20 insertions(+), 52 deletions(-)

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
deleted file mode 100644
index ce6e47b..00000000
--- a/dev-libs/libnl/files/libnl-3.2.20-cache-api.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/tests/test-cache-mngr.c
-+++ b/tests/test-cache-mngr.c
-@@ -1,5 +1,5 @@
- #include <netlink/netlink.h>
--#include <netlink/cache.h>
-+#include <netlink/cache-api.h>
- #include <netlink/cli/utils.h>
- #include <signal.h>
- 

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
deleted file mode 100644
index 09b2f0b..00000000
--- a/dev-libs/libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/src/nl-class-add.c
-+++ b/src/nl-class-add.c
-@@ -14,6 +14,7 @@
- #include <netlink/cli/qdisc.h>
- #include <netlink/cli/class.h>
- #include <netlink/cli/link.h>
-+#include <netlink/route/tc-api.h> /* rtnl_tc_get_ops() */
- 
- static int quiet = 0;
- 
---- a/src/nl-cls-add.c
-+++ b/src/nl-cls-add.c
-@@ -12,6 +12,7 @@
- #include <netlink/cli/tc.h>
- #include <netlink/cli/cls.h>
- #include <netlink/cli/link.h>
-+#include <netlink/route/tc-api.h> /* rtnl_tc_get_ops() */
- 
- static int quiet = 0;
- 
---- a/src/nl-qdisc-add.c
-+++ b/src/nl-qdisc-add.c
-@@ -13,6 +13,7 @@
- #include <netlink/cli/tc.h>
- #include <netlink/cli/qdisc.h>
- #include <netlink/cli/link.h>
-+#include <netlink/route/tc-api.h> /* rtnl_tc_get_ops() */
- 
- static int quiet = 0;
- 

diff --git a/dev-libs/libnl/files/libnl-3.2.28-in6.patch b/dev-libs/libnl/files/libnl-3.2.28-in6.patch
new file mode 100644
index 00000000..5dcf6ae
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-3.2.28-in6.patch
@@ -0,0 +1,12 @@
+https://github.com/thom311/libnl/pull/121
+
+--- a/include/linux-private/linux/if_bridge.h
++++ b/include/linux-private/linux/if_bridge.h
+@@ -15,7 +15,6 @@
+ 
+ #include <linux/types.h>
+ #include <linux/if_ether.h>
+-#include <linux/in6.h>
+ 
+ #define SYSFS_BRIDGE_ATTR	"bridge"
+ #define SYSFS_BRIDGE_FDB	"brforward"

diff --git a/dev-libs/libnl/libnl-3.2.28.ebuild b/dev-libs/libnl/libnl-3.2.28.ebuild
index ef5f05a..9c03787 100644
--- a/dev-libs/libnl/libnl-3.2.28.ebuild
+++ b/dev-libs/libnl/libnl-3.2.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -63,8 +63,7 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch
-	"${FILESDIR}"/${PN}-3.2.20-cache-api.patch
+	"${FILESDIR}"/${PN}-3.2.28-in6.patch
 )
 
 src_prepare() {

diff --git a/dev-libs/libnl/libnl-3.2.29.ebuild b/dev-libs/libnl/libnl-3.2.29.ebuild
index 5c5c565..56f3021 100644
--- a/dev-libs/libnl/libnl-3.2.29.ebuild
+++ b/dev-libs/libnl/libnl-3.2.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -63,8 +63,7 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch
-	"${FILESDIR}"/${PN}-3.2.20-cache-api.patch
+	"${FILESDIR}"/${PN}-3.2.28-in6.patch
 )
 
 src_prepare() {

diff --git a/dev-libs/libnl/libnl-3.2.9999.ebuild b/dev-libs/libnl/libnl-3.2.9999.ebuild
index 29a9d87..1c1ea6d 100644
--- a/dev-libs/libnl/libnl-3.2.9999.ebuild
+++ b/dev-libs/libnl/libnl-3.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -31,16 +31,13 @@ DEPEND="
 	sys-devel/flex
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
 
 DOCS=(
 	ChangeLog
 )
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch
-	"${FILESDIR}"/${PN}-3.2.20-cache-api.patch
-)
 
 MULTILIB_WRAPPED_HEADERS=(
 	# we do not install CLI stuff for non-native


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libnl/files/, dev-libs/libnl/
@ 2017-01-29 21:31 Jeroen Roovers
  0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2017-01-29 21:31 UTC (permalink / raw
  To: gentoo-commits

commit:     c247772a84d4383018d034068170ee19fb39fdda
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 21:31:07 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 21:31:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c247772a

dev-libs/libnl: Replace in6.h patch with complete upstream patch.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/libnl/Manifest                     |   1 +
 dev-libs/libnl/files/libnl-3.2.28-in6.patch | 295 ----------------------------
 dev-libs/libnl/libnl-3.2.28.ebuild          |   3 +-
 dev-libs/libnl/libnl-3.2.29.ebuild          |   3 +-
 4 files changed, 5 insertions(+), 297 deletions(-)

diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 033957a..bb8cfd1 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1,3 +1,4 @@
 DIST libnl-1.1.4.tar.gz 1174974 SHA256 4f80c21fe5bbcdde6e72b59b4f98306063a41421f909887c34e58d93e746d063 SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4 WHIRLPOOL eab5547dce7b11c86123fbcc9cd8e00100c7e78f48a4a9fef40f80f89407ea705b701f8f0eb7df63997866f17b0cf0924b43c69b29fa1f1b016fe997371b950e
+DIST libnl-3.2.28-in6.patch.xz 6368 SHA256 0cbb8dc4e3cdc90a4a0608a26af1971d7c1c397bb5f089de8c8d640e57b7b631 SHA512 de14f7540e514871db2058236a339192443423e56f2f5bd52e02ff06873c9e411029b12f3119e57eb01201ce3643ce78ca3e8d9ada4f6ba318df96288304bead WHIRLPOOL 1f1ebfc06a0cf516202cee3aaee92d7ed584ec9633d48c23e666d40bf48d658cc27a00c9f8881a7e976e21fc66fb867e10cadd8a6c0c8826ff4fab712cb20f3d
 DIST libnl-3.2.28.tar.gz 941954 SHA256 cd608992c656e8f6e3ab6c1391b162a5a51c49336b9219f7f390e61fc5437c41 SHA512 b5f145ecafb2625ed1c42594afd6063f112a601077de5c35884b3c3bc8c562b29b52a006ccebd795c127fe69692a82def425c8605afed7e6d441582943e803d9 WHIRLPOOL ff49346ddc31105a300ebffc0e4d4956ac85ade5e92e884c62e696d7d4234d40e63cf4839e6b6fd2d98d2122662d36d3f41666391686a83c8bf966e53e22ed25
 DIST libnl-3.2.29.tar.gz 963681 SHA256 0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922 SHA512 45e22b02368c479e01db7160345a0d3c73abf345e7b49bf350811243a17f307f5c6c3df639ec1e0c456707578aca8d69aad8afa697ac21449f521a3e39712670 WHIRLPOOL 1273dcaee79ecfdca947110c5e7ff70947703b1b0fda43fdb7c74edd78c6938f675e9a586aaff8feefce56a1f3137cbc50d3626ac336e6afa2ca8cbd8627e6eb

diff --git a/dev-libs/libnl/files/libnl-3.2.28-in6.patch b/dev-libs/libnl/files/libnl-3.2.28-in6.patch
deleted file mode 100644
index e8c7291..00000000
--- a/dev-libs/libnl/files/libnl-3.2.28-in6.patch
+++ /dev/null
@@ -1,295 +0,0 @@
---- a/dev/null
-+++ b/include/linux-private/linux/in6.h
-@@ -0,0 +1,292 @@
-+/*
-+ *	Types and definitions for AF_INET6 
-+ *	Linux INET6 implementation 
-+ *
-+ *	Authors:
-+ *	Pedro Roque		<roque@di.fc.ul.pt>	
-+ *
-+ *	Sources:
-+ *	IPv6 Program Interfaces for BSD Systems
-+ *      <draft-ietf-ipngwg-bsd-api-05.txt>
-+ *
-+ *	Advanced Sockets API for IPv6
-+ *	<draft-stevens-advanced-api-00.txt>
-+ *
-+ *	This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifndef _LINUX_IN6_H
-+#define _LINUX_IN6_H
-+
-+#include <linux/types.h>
-+
-+/*
-+ *	IPv6 address structure
-+ */
-+
-+#if __UAPI_DEF_IN6_ADDR
-+struct in6_addr {
-+	union {
-+		__u8		u6_addr8[16];
-+#if __UAPI_DEF_IN6_ADDR_ALT
-+		__be16		u6_addr16[8];
-+		__be32		u6_addr32[4];
-+#endif
-+	} in6_u;
-+#define s6_addr			in6_u.u6_addr8
-+#if __UAPI_DEF_IN6_ADDR_ALT
-+#define s6_addr16		in6_u.u6_addr16
-+#define s6_addr32		in6_u.u6_addr32
-+#endif
-+};
-+#endif /* __UAPI_DEF_IN6_ADDR */
-+
-+#if __UAPI_DEF_SOCKADDR_IN6
-+struct sockaddr_in6 {
-+	unsigned short int	sin6_family;    /* AF_INET6 */
-+	__be16			sin6_port;      /* Transport layer port # */
-+	__be32			sin6_flowinfo;  /* IPv6 flow information */
-+	struct in6_addr		sin6_addr;      /* IPv6 address */
-+	__u32			sin6_scope_id;  /* scope id (new in RFC2553) */
-+};
-+#endif /* __UAPI_DEF_SOCKADDR_IN6 */
-+
-+#if __UAPI_DEF_IPV6_MREQ
-+struct ipv6_mreq {
-+	/* IPv6 multicast address of group */
-+	struct in6_addr ipv6mr_multiaddr;
-+
-+	/* local IPv6 address of interface */
-+	int		ipv6mr_ifindex;
-+};
-+#endif /* __UAPI_DEF_IVP6_MREQ */
-+
-+#define ipv6mr_acaddr	ipv6mr_multiaddr
-+
-+struct in6_flowlabel_req {
-+	struct in6_addr	flr_dst;
-+	__be32	flr_label;
-+	__u8	flr_action;
-+	__u8	flr_share;
-+	__u16	flr_flags;
-+	__u16 	flr_expires;
-+	__u16	flr_linger;
-+	__u32	__flr_pad;
-+	/* Options in format of IPV6_PKTOPTIONS */
-+};
-+
-+#define IPV6_FL_A_GET	0
-+#define IPV6_FL_A_PUT	1
-+#define IPV6_FL_A_RENEW	2
-+
-+#define IPV6_FL_F_CREATE	1
-+#define IPV6_FL_F_EXCL		2
-+#define IPV6_FL_F_REFLECT	4
-+#define IPV6_FL_F_REMOTE	8
-+
-+#define IPV6_FL_S_NONE		0
-+#define IPV6_FL_S_EXCL		1
-+#define IPV6_FL_S_PROCESS	2
-+#define IPV6_FL_S_USER		3
-+#define IPV6_FL_S_ANY		255
-+
-+
-+/*
-+ *	Bitmask constant declarations to help applications select out the 
-+ *	flow label and priority fields.
-+ *
-+ *	Note that this are in host byte order while the flowinfo field of
-+ *	sockaddr_in6 is in network byte order.
-+ */
-+
-+#define IPV6_FLOWINFO_FLOWLABEL		0x000fffff
-+#define IPV6_FLOWINFO_PRIORITY		0x0ff00000
-+
-+/* These definitions are obsolete */
-+#define IPV6_PRIORITY_UNCHARACTERIZED	0x0000
-+#define IPV6_PRIORITY_FILLER		0x0100
-+#define IPV6_PRIORITY_UNATTENDED	0x0200
-+#define IPV6_PRIORITY_RESERVED1		0x0300
-+#define IPV6_PRIORITY_BULK		0x0400
-+#define IPV6_PRIORITY_RESERVED2		0x0500
-+#define IPV6_PRIORITY_INTERACTIVE	0x0600
-+#define IPV6_PRIORITY_CONTROL		0x0700
-+#define IPV6_PRIORITY_8			0x0800
-+#define IPV6_PRIORITY_9			0x0900
-+#define IPV6_PRIORITY_10		0x0a00
-+#define IPV6_PRIORITY_11		0x0b00
-+#define IPV6_PRIORITY_12		0x0c00
-+#define IPV6_PRIORITY_13		0x0d00
-+#define IPV6_PRIORITY_14		0x0e00
-+#define IPV6_PRIORITY_15		0x0f00
-+
-+/*
-+ *	IPV6 extension headers
-+ */
-+#if __UAPI_DEF_IPPROTO_V6
-+#define IPPROTO_HOPOPTS		0	/* IPv6 hop-by-hop options	*/
-+#define IPPROTO_ROUTING		43	/* IPv6 routing header		*/
-+#define IPPROTO_FRAGMENT	44	/* IPv6 fragmentation header	*/
-+#define IPPROTO_ICMPV6		58	/* ICMPv6			*/
-+#define IPPROTO_NONE		59	/* IPv6 no next header		*/
-+#define IPPROTO_DSTOPTS		60	/* IPv6 destination options	*/
-+#define IPPROTO_MH		135	/* IPv6 mobility header		*/
-+#endif /* __UAPI_DEF_IPPROTO_V6 */
-+
-+/*
-+ *	IPv6 TLV options.
-+ */
-+#define IPV6_TLV_PAD1		0
-+#define IPV6_TLV_PADN		1
-+#define IPV6_TLV_ROUTERALERT	5
-+#define IPV6_TLV_JUMBO		194
-+#define IPV6_TLV_HAO		201	/* home address option */
-+
-+/*
-+ *	IPV6 socket options
-+ */
-+#if __UAPI_DEF_IPV6_OPTIONS
-+#define IPV6_ADDRFORM		1
-+#define IPV6_2292PKTINFO	2
-+#define IPV6_2292HOPOPTS	3
-+#define IPV6_2292DSTOPTS	4
-+#define IPV6_2292RTHDR		5
-+#define IPV6_2292PKTOPTIONS	6
-+#define IPV6_CHECKSUM		7
-+#define IPV6_2292HOPLIMIT	8
-+#define IPV6_NEXTHOP		9
-+#define IPV6_AUTHHDR		10	/* obsolete */
-+#define IPV6_FLOWINFO		11
-+
-+#define IPV6_UNICAST_HOPS	16
-+#define IPV6_MULTICAST_IF	17
-+#define IPV6_MULTICAST_HOPS	18
-+#define IPV6_MULTICAST_LOOP	19
-+#define IPV6_ADD_MEMBERSHIP	20
-+#define IPV6_DROP_MEMBERSHIP	21
-+#define IPV6_ROUTER_ALERT	22
-+#define IPV6_MTU_DISCOVER	23
-+#define IPV6_MTU		24
-+#define IPV6_RECVERR		25
-+#define IPV6_V6ONLY		26
-+#define IPV6_JOIN_ANYCAST	27
-+#define IPV6_LEAVE_ANYCAST	28
-+
-+/* IPV6_MTU_DISCOVER values */
-+#define IPV6_PMTUDISC_DONT		0
-+#define IPV6_PMTUDISC_WANT		1
-+#define IPV6_PMTUDISC_DO		2
-+#define IPV6_PMTUDISC_PROBE		3
-+/* same as IPV6_PMTUDISC_PROBE, provided for symetry with IPv4
-+ * also see comments on IP_PMTUDISC_INTERFACE
-+ */
-+#define IPV6_PMTUDISC_INTERFACE		4
-+/* weaker version of IPV6_PMTUDISC_INTERFACE, which allows packets to
-+ * get fragmented if they exceed the interface mtu
-+ */
-+#define IPV6_PMTUDISC_OMIT		5
-+
-+/* Flowlabel */
-+#define IPV6_FLOWLABEL_MGR	32
-+#define IPV6_FLOWINFO_SEND	33
-+
-+#define IPV6_IPSEC_POLICY	34
-+#define IPV6_XFRM_POLICY	35
-+#endif
-+
-+/*
-+ * Multicast:
-+ * Following socket options are shared between IPv4 and IPv6.
-+ *
-+ * MCAST_JOIN_GROUP		42
-+ * MCAST_BLOCK_SOURCE		43
-+ * MCAST_UNBLOCK_SOURCE		44
-+ * MCAST_LEAVE_GROUP		45
-+ * MCAST_JOIN_SOURCE_GROUP	46
-+ * MCAST_LEAVE_SOURCE_GROUP	47
-+ * MCAST_MSFILTER		48
-+ */
-+
-+/*
-+ * Advanced API (RFC3542) (1)
-+ *
-+ * Note: IPV6_RECVRTHDRDSTOPTS does not exist. see net/ipv6/datagram.c.
-+ */
-+
-+#define IPV6_RECVPKTINFO	49
-+#define IPV6_PKTINFO		50
-+#define IPV6_RECVHOPLIMIT	51
-+#define IPV6_HOPLIMIT		52
-+#define IPV6_RECVHOPOPTS	53
-+#define IPV6_HOPOPTS		54
-+#define IPV6_RTHDRDSTOPTS	55
-+#define IPV6_RECVRTHDR		56
-+#define IPV6_RTHDR		57
-+#define IPV6_RECVDSTOPTS	58
-+#define IPV6_DSTOPTS		59
-+#define IPV6_RECVPATHMTU	60
-+#define IPV6_PATHMTU		61
-+#define IPV6_DONTFRAG		62
-+#if 0	/* not yet */
-+#define IPV6_USE_MIN_MTU	63
-+#endif
-+
-+/*
-+ * Netfilter (1)
-+ *
-+ * Following socket options are used in ip6_tables;
-+ * see include/linux/netfilter_ipv6/ip6_tables.h.
-+ *
-+ * IP6T_SO_SET_REPLACE / IP6T_SO_GET_INFO		64
-+ * IP6T_SO_SET_ADD_COUNTERS / IP6T_SO_GET_ENTRIES	65
-+ */
-+
-+/*
-+ * Advanced API (RFC3542) (2)
-+ */
-+#define IPV6_RECVTCLASS		66
-+#define IPV6_TCLASS		67
-+
-+/*
-+ * Netfilter (2)
-+ *
-+ * Following socket options are used in ip6_tables;
-+ * see include/linux/netfilter_ipv6/ip6_tables.h.
-+ *
-+ * IP6T_SO_GET_REVISION_MATCH	68
-+ * IP6T_SO_GET_REVISION_TARGET	69
-+ * IP6T_SO_ORIGINAL_DST		80
-+ */
-+
-+#define IPV6_AUTOFLOWLABEL	70
-+/* RFC5014: Source address selection */
-+#define IPV6_ADDR_PREFERENCES	72
-+
-+#define IPV6_PREFER_SRC_TMP		0x0001
-+#define IPV6_PREFER_SRC_PUBLIC		0x0002
-+#define IPV6_PREFER_SRC_PUBTMP_DEFAULT	0x0100
-+#define IPV6_PREFER_SRC_COA		0x0004
-+#define IPV6_PREFER_SRC_HOME		0x0400
-+#define IPV6_PREFER_SRC_CGA		0x0008
-+#define IPV6_PREFER_SRC_NONCGA		0x0800
-+
-+/* RFC5082: Generalized Ttl Security Mechanism */
-+#define IPV6_MINHOPCOUNT		73
-+
-+#define IPV6_ORIGDSTADDR        74
-+#define IPV6_RECVORIGDSTADDR    IPV6_ORIGDSTADDR
-+#define IPV6_TRANSPARENT        75
-+#define IPV6_UNICAST_IF         76
-+
-+/*
-+ * Multicast Routing:
-+ * see include/uapi/linux/mroute6.h.
-+ *
-+ * MRT6_BASE			200
-+ * ...
-+ * MRT6_MAX
-+ */
-+#endif /* _LINUX_IN6_H */

diff --git a/dev-libs/libnl/libnl-3.2.28.ebuild b/dev-libs/libnl/libnl-3.2.28.ebuild
index 3e1294c..ed75b9f 100644
--- a/dev-libs/libnl/libnl-3.2.28.ebuild
+++ b/dev-libs/libnl/libnl-3.2.28.ebuild
@@ -15,6 +15,7 @@ DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel int
 HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
 SRC_URI="
 	https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz
+	https://dev.gentoo.org/~jer/libnl-3.2.28-in6.patch.xz
 "
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
@@ -63,7 +64,7 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${FILESDIR}"/${PN}-3.2.28-in6.patch
+	"${WORKDIR}"/${PN}-3.2.28-in6.patch
 )
 
 src_prepare() {

diff --git a/dev-libs/libnl/libnl-3.2.29.ebuild b/dev-libs/libnl/libnl-3.2.29.ebuild
index a9afe56..1a19651 100644
--- a/dev-libs/libnl/libnl-3.2.29.ebuild
+++ b/dev-libs/libnl/libnl-3.2.29.ebuild
@@ -15,6 +15,7 @@ DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel int
 HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
 SRC_URI="
 	https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz
+	https://dev.gentoo.org/~jer/libnl-3.2.28-in6.patch.xz
 "
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
@@ -63,7 +64,7 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${FILESDIR}"/${PN}-3.2.28-in6.patch
+	"${WORKDIR}"/${PN}-3.2.28-in6.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libnl/files/, dev-libs/libnl/
@ 2021-12-08 16:02 David Seifert
  0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2021-12-08 16:02 UTC (permalink / raw
  To: gentoo-commits

commit:     6e3560b3cc7e133438fa01c9858c0726f2bdc519
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  8 16:02:15 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Dec  8 16:02:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e3560b3

dev-libs/libnl: drop 1.1.4-r1, 1.1.9999

Closes: https://bugs.gentoo.org/828572
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-libs/libnl/Manifest                          |  1 -
 dev-libs/libnl/files/libnl-1.1-flags.patch       | 11 ----
 dev-libs/libnl/files/libnl-1.1-vlan-header.patch | 80 ------------------------
 dev-libs/libnl/files/libnl-1.1.3-offsetof.patch  | 12 ----
 dev-libs/libnl/libnl-1.1.4-r1.ebuild             | 61 ------------------
 dev-libs/libnl/libnl-1.1.9999.ebuild             | 60 ------------------
 dev-libs/libnl/metadata.xml                      |  1 -
 7 files changed, 226 deletions(-)

diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 610575bfa242..a9a95c9c88d1 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1,2 +1 @@
-DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c

diff --git a/dev-libs/libnl/files/libnl-1.1-flags.patch b/dev-libs/libnl/files/libnl-1.1-flags.patch
deleted file mode 100644
index dc512c587b9e..000000000000
--- a/dev-libs/libnl/files/libnl-1.1-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -48,7 +48,7 @@
- 
- $(OUT_SLIB): ../Makefile.opts $(OBJ)
- 	@echo "  LD $(OUT_SLIB)"; \
--	$(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
- 	@echo "  LN $(OUT_SLIB) $(LN1_SLIB)"; \
- 	rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB)
- 	@echo "  LN $(LN1_SLIB) $(LN_SLIB)"; \

diff --git a/dev-libs/libnl/files/libnl-1.1-vlan-header.patch b/dev-libs/libnl/files/libnl-1.1-vlan-header.patch
deleted file mode 100644
index c4c2fc6382de..000000000000
--- a/dev-libs/libnl/files/libnl-1.1-vlan-header.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Patrick McHardy <kaber@trash.net>
-Date: Fri, 18 Jan 2008 16:55:48 +0000 (+0100)
-Subject: [LIBNL]: Add if_vlan.h
-X-Git-Url: http://git.kernel.org/?p=libs%2Fnetlink%2Flibnl.git;a=commitdiff_plain;h=e91bb2ffb090955d443e643a25b250bf3d33534a;hp=7f6b7a8eea0334b34d58dec72c66121a76f08958
-
-[LIBNL]: Add if_vlan.h
-
-vlan support needs VLAN_FLAG_REORDER_HDR, which is not available in
-older if_vlan.h versions. Add the current version from the kernel.
-
-Signed-off-by: Patrick McHardy <kaber@trash.net>
----
-
-diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
-new file mode 100644
-index 0000000..068cd7b
---- /dev/null
-+++ include/linux/if_vlan.h
-@@ -0,0 +1,61 @@
-+/*
-+ * VLAN		An implementation of 802.1Q VLAN tagging.
-+ *
-+ * Authors:	Ben Greear <greearb@candelatech.com>
-+ *
-+ *		This program is free software; you can redistribute it and/or
-+ *		modify it under the terms of the GNU General Public License
-+ *		as published by the Free Software Foundation; either version
-+ *		2 of the License, or (at your option) any later version.
-+ *
-+ */
-+
-+#ifndef _LINUX_IF_VLAN_H_
-+#define _LINUX_IF_VLAN_H_
-+
-+
-+/* VLAN IOCTLs are found in sockios.h */
-+
-+/* Passed in vlan_ioctl_args structure to determine behaviour. */
-+enum vlan_ioctl_cmds {
-+	ADD_VLAN_CMD,
-+	DEL_VLAN_CMD,
-+	SET_VLAN_INGRESS_PRIORITY_CMD,
-+	SET_VLAN_EGRESS_PRIORITY_CMD,
-+	GET_VLAN_INGRESS_PRIORITY_CMD,
-+	GET_VLAN_EGRESS_PRIORITY_CMD,
-+	SET_VLAN_NAME_TYPE_CMD,
-+	SET_VLAN_FLAG_CMD,
-+	GET_VLAN_REALDEV_NAME_CMD, /* If this works, you know it's a VLAN device, btw */
-+	GET_VLAN_VID_CMD /* Get the VID of this VLAN (specified by name) */
-+};
-+
-+enum vlan_flags {
-+	VLAN_FLAG_REORDER_HDR	= 0x1,
-+};
-+
-+enum vlan_name_types {
-+	VLAN_NAME_TYPE_PLUS_VID, /* Name will look like:  vlan0005 */
-+	VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like:  eth1.0005 */
-+	VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like:  vlan5 */
-+	VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like:  eth0.5 */
-+	VLAN_NAME_TYPE_HIGHEST
-+};
-+
-+struct vlan_ioctl_args {
-+	int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */
-+	char device1[24];
-+
-+        union {
-+		char device2[24];
-+		int VID;
-+		unsigned int skb_priority;
-+		unsigned int name_type;
-+		unsigned int bind_type;
-+		unsigned int flag; /* Matches vlan_dev_info flags */
-+        } u;
-+
-+	short vlan_qos;
-+};
-+
-+#endif /* !(_LINUX_IF_VLAN_H_) */

diff --git a/dev-libs/libnl/files/libnl-1.1.3-offsetof.patch b/dev-libs/libnl/files/libnl-1.1.3-offsetof.patch
deleted file mode 100644
index e370a5e62fc6..000000000000
--- a/dev-libs/libnl/files/libnl-1.1.3-offsetof.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/include/netlink-local.h
-+++ b/include/netlink-local.h
-@@ -343,7 +343,9 @@
- }
- 
- #define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0]))
-+#ifndef offsetof
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-+#endif
- 
- #define __init __attribute__ ((constructor))
- #define __exit __attribute__ ((destructor))

diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
deleted file mode 100644
index 8f3ad2437d6f..000000000000
--- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="https://www.infradead.org/~tgr/libnl/"
-SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-DOCS=( ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${FILESDIR}"/${PN}-1.1-flags.patch
-	"${FILESDIR}"/${PN}-1.1.3-offsetof.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/@echo/d' \
-		Makefile.rules {lib,src,tests}/Makefile || die
-	sed -i \
-		-e 's|-g ||g' \
-		Makefile.opts.in || die
-
-	if ! use static-libs; then
-		sed -i lib/Makefile -e '/OUT_AR/d' || die
-	fi
-
-	rm -f lib/libnl.a || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-
-	if use doc ; then
-		cd "${S}/doc" || die
-		emake gendoc
-	fi
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		cd "${S}/doc" || die
-
-		docinto html
-		dodoc -r html/*
-	fi
-}

diff --git a/dev-libs/libnl/libnl-1.1.9999.ebuild b/dev-libs/libnl/libnl-1.1.9999.ebuild
deleted file mode 100644
index 14a4835802c4..000000000000
--- a/dev-libs/libnl/libnl-1.1.9999.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 toolchain-funcs
-
-DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="https://www.infradead.org/~tgr/libnl/"
-EGIT_REPO_URI="https://github.com/tgraf/libnl-1.1-stable"
-
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-IUSE="doc static-libs"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${FILESDIR}"/${PN}-1.1-flags.patch
-	"${FILESDIR}"/${PN}-1.1.3-offsetof.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/@echo/d' \
-		Makefile.rules {lib,src,tests}/Makefile || die
-	sed -i \
-		-e 's|-g ||g' \
-		Makefile.opts.in || die
-
-	if ! use static-libs ; then
-		sed -i lib/Makefile -e '/OUT_AR/d' || die
-	fi
-
-	rm -f lib/libnl.a || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-
-	if use doc ; then
-		cd "${S}/doc" || die
-		emake gendoc
-	fi
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		cd "${S}/doc" || die
-		docinto html
-		dodoc -r html/*
-	fi
-}

diff --git a/dev-libs/libnl/metadata.xml b/dev-libs/libnl/metadata.xml
index 9a023d2e9d88..ff40a5ef75a9 100644
--- a/dev-libs/libnl/metadata.xml
+++ b/dev-libs/libnl/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
 	<use>
-		<flag name="doc">Install development documentation</flag>
 		<flag name="python">Install experimental <pkg>dev-lang/python</pkg> bindings</flag>
 		<flag name="utils">Install command line interface utils</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libnl/files/, dev-libs/libnl/
@ 2023-08-31  6:04 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-08-31  6:04 UTC (permalink / raw
  To: gentoo-commits

commit:     fa7525e13bb39e816ddd607891f875224327643c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 06:03:58 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 06:04:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa7525e1

dev-libs/libnl: add 3.8.0

Closes: https://bugs.gentoo.org/912777
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libnl/Manifest                            |  1 +
 .../libnl/files/libnl-3.8.0-printf-non-bash.patch  | 22 ++++++++++++++++++++++
 .../libnl-3.8.0-python-decorator-syntax.patch      | 21 +++++++++++++++++++++
 .../{libnl-9999.ebuild => libnl-3.8.0.ebuild}      | 18 ++++++++++++++----
 dev-libs/libnl/libnl-9999.ebuild                   | 17 +++++++++++++----
 5 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index da8654736030..18fd94dbe918 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1 +1,2 @@
 DIST libnl-3.7.0.tar.gz 1000913 BLAKE2B 22c418ea520416d79ee4552ab6bc5ba99239b29e074c840d31b0ec4171a0403ea9d2c1afcbf1b3428564dd371cadd99bc062ae7540e7496f970c4fb98f967e84 SHA512 80fbbc079299c90afd2a5eda62e4d4f98bf4ef23958c3ce5101f4ed4d81d783af733213bb3bab15f218555d8460bc2394898f909f4ac024fc27281faec86a041
+DIST libnl-3.8.0.tar.gz 1071113 BLAKE2B ff90d52e9b617ad8a53e4d42f43bee065b331ed919a3effc4a0f38c8e15b46f86c1eb153816499ed77dd99063500b1dc52951891034475a5bb81da1ad8004594 SHA512 a8da7e8464c5cab2807cd86f83fca53bc77f7c3bdefe43880db7be9caf5ba6bfca1b7e778b906c12fda1cf7e6f413f88cc7ad1dcc42fe8c050a8d28a6e656c02

diff --git a/dev-libs/libnl/files/libnl-3.8.0-printf-non-bash.patch b/dev-libs/libnl/files/libnl-3.8.0-printf-non-bash.patch
new file mode 100644
index 000000000000..885f8fd750f3
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-3.8.0-printf-non-bash.patch
@@ -0,0 +1,22 @@
+https://github.com/thom311/libnl/pull/360
+
+From 32f84a052a4383299b9f30ad09d2a70c3b2cf2b3 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 31 Aug 2023 06:59:59 +0100
+Subject: [PATCH] Makefile.am: avoid use of non-portable echo arguments
+
+This fixes tests with a non-bash shell as /bin/sh (in this case, dash) which
+does not support `echo -e`. echo itself is portable, but not echo with any arguments.
+
+Use `printf` instead.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1129,7 +1129,7 @@ EXTRA_DIST += \
+ 
+ %.build-headers-test.c: %
+ 	mkdir -p "$(dir $@)"
+-	echo -e "#include <$$(echo "$<" | sed 's|.*\<include/netlink/|netlink/|')>\nint main(int argc, char **argv) { return 0; }" > $@
++	printf "#include <$$(echo "$<" | sed 's|.*\<include/netlink/|netlink/|')>\nint main(int argc, char **argv) { return 0; }" > $@
+ 
+ %.build-headers-test.o: %.build-headers-test.c
+ 	$(COMPILE) -Wall -Werror -Wno-error=cpp -I$(srcdir)/include -I$(builddir)/include -c -o $@ $<

diff --git a/dev-libs/libnl/files/libnl-3.8.0-python-decorator-syntax.patch b/dev-libs/libnl/files/libnl-3.8.0-python-decorator-syntax.patch
new file mode 100644
index 000000000000..d7d14962dab4
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-3.8.0-python-decorator-syntax.patch
@@ -0,0 +1,21 @@
+https://github.com/thom311/libnl/commit/9aab12dff8e89b7da826c5c0826ef13c71963e28
+
+From 9aab12dff8e89b7da826c5c0826ef13c71963e28 Mon Sep 17 00:00:00 2001
+From: David Ward <david.ward@ll.mit.edu>
+Date: Tue, 29 Aug 2023 20:54:19 -0400
+Subject: [PATCH] python: Use correct decorator syntax in HTBQdisc
+
+Fixes: 87d370912ca8 ("netlink.nlattr re-implemented in more pythonic way")
+
+https://github.com/thom311/libnl/pull/359
+--- a/python/netlink/route/qdisc/htb.py
++++ b/python/netlink/route/qdisc/htb.py
+@@ -28,7 +28,7 @@ def default_class(self, value):
+         capi.rtnl_htb_set_defcls(self._qdisc._rtnl_qdisc, int(value))
+ 
+     @property
+-    @netlink.nlattr("r2q", type=int)
++    @netlink.nlattr(type=int)
+     def r2q(self):
+         return capi.rtnl_htb_get_rate2quantum(self._qdisc._rtnl_qdisc)
+ 

diff --git a/dev-libs/libnl/libnl-9999.ebuild b/dev-libs/libnl/libnl-3.8.0.ebuild
similarity index 89%
copy from dev-libs/libnl/libnl-9999.ebuild
copy to dev-libs/libnl/libnl-3.8.0.ebuild
index 67eba8f4740d..19cb734e478a 100644
--- a/dev-libs/libnl/libnl-9999.ebuild
+++ b/dev-libs/libnl/libnl-3.8.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools distutils-r1 multilib-minimal
 
 LIBNL_P=${P/_/-}
@@ -31,18 +31,20 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
+BDEPEND="
+	${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	python? (
 		${DISTUTILS_DEPS}
 		dev-lang/swig
 	)
-	test? ( dev-libs/check )"
+	test? ( dev-libs/check )
+"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 MULTILIB_WRAPPED_HEADERS=(
-	# we do not install CLI stuff for non-native
+	# We do not install CLI stuff for non-native
 	/usr/include/libnl3/netlink/cli/addr.h
 	/usr/include/libnl3/netlink/cli/class.h
 	/usr/include/libnl3/netlink/cli/cls.h
@@ -58,6 +60,11 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libnl3/netlink/cli/utils.h
 )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-python-decorator-syntax.patch
+	"${FILESDIR}"/${PN}-3.8.0-printf-non-bash.patch
+)
+
 src_prepare() {
 	default
 
@@ -71,6 +78,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# bug #884277
+	export YACC=yacc.bison
+
 	ECONF_SOURCE="${S}" econf \
 		$(multilib_native_use_enable utils cli) \
 		$(use_enable debug)

diff --git a/dev-libs/libnl/libnl-9999.ebuild b/dev-libs/libnl/libnl-9999.ebuild
index 67eba8f4740d..b7e772377e97 100644
--- a/dev-libs/libnl/libnl-9999.ebuild
+++ b/dev-libs/libnl/libnl-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools distutils-r1 multilib-minimal
 
 LIBNL_P=${P/_/-}
@@ -31,18 +31,20 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
+BDEPEND="
+	${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	python? (
 		${DISTUTILS_DEPS}
 		dev-lang/swig
 	)
-	test? ( dev-libs/check )"
+	test? ( dev-libs/check )
+"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 MULTILIB_WRAPPED_HEADERS=(
-	# we do not install CLI stuff for non-native
+	# We do not install CLI stuff for non-native
 	/usr/include/libnl3/netlink/cli/addr.h
 	/usr/include/libnl3/netlink/cli/class.h
 	/usr/include/libnl3/netlink/cli/cls.h
@@ -58,6 +60,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libnl3/netlink/cli/utils.h
 )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8.0-printf-non-bash.patch
+)
+
 src_prepare() {
 	default
 
@@ -71,6 +77,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# bug #884277
+	export YACC=yacc.bison
+
 	ECONF_SOURCE="${S}" econf \
 		$(multilib_native_use_enable utils cli) \
 		$(use_enable debug)


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-08-31  6:04 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-31  6:04 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libnl/files/, dev-libs/libnl/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2021-12-08 16:02 David Seifert
2017-01-29 21:31 Jeroen Roovers
2017-01-01 19:23 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox