Fixed compilation problem repoted by Andrew Cowie <andrew AT operationaldynamics.com>, bug 210208. Also backported fix from upstream to fix memory leak.

Package-Manager: portage-2.1.4.4

5 files changed, 159 insertions, 2 deletions

diff --git a/dev-libs/libnl/ChangeLog b/dev-libs/libnl/ChangeLog
index ce101af118a3..06c88c5020e8 100644
--- a/dev-libs/libnl/ChangeLog
+++ b/dev-libs/libnl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libnl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.22 2008/01/30 08:16:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.23 2008/02/20 08:59:15 pva Exp $
+
+*libnl-1.1-r1 (20 Feb 2008)
+
+  20 Feb 2008; <pva@gentoo.org> +files/libnl-1.1-minor-leaks.patch,
+  +files/libnl-1.1-vlan-header.patch, +libnl-1.1-r1.ebuild:
+  Fixed compilation problem repoted by Andrew Cowie <andrew AT
+  operationaldynamics.com>, bug 210208. Also backported fix from upstream to
+  fix memory leak.
 
 *libnl-1.1 (30 Jan 2008)
 
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index dc696e74f8f6..a05c6db8c707 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -3,6 +3,8 @@ AUX libnl-0.5.0-libdir.patch 1050 RMD160 eca94b7395d287114e81d7b61020be0c580b521
 AUX libnl-1.0_pre5-__u64_x86_64.patch 436 RMD160 60af2c6b04be8f604117f711f9dc3b760bde1243 SHA1 45460780670321206e2443ab3d620bf5f1534950 SHA256 e53f0726b99dc269f8f77fb507df18baa95beaf552bf3fe67705c182195db2b5
 AUX libnl-1.0_pre5-include.diff 364 RMD160 96898c168b8732daf8372fbda89060a24942783c SHA1 7e4a8caf005f2c15e2ea174c3f533bca67c1bd06 SHA256 ea943a86d2f7753cf0f36ee90b6ce9eb7f3b9d229fc2ca8964a62dc55d6e44db
 AUX libnl-1.0_pre6-__u64_x86_64.patch 438 RMD160 bc39c1525d38c0a54029282ab141c7a058f2fb9f SHA1 a958b077b6a092537d76b128b807121f4293f831 SHA256 984970a9409af7690c36ef663c3bd9a2c56b5ac3d4ccf3a86b4fe17a56abafc4
+AUX libnl-1.1-minor-leaks.patch 1179 RMD160 cde1b9a84e4e4446de6c65e4c13a633a3d1cd280 SHA1 152af4e17647881eed453eb2aa58239d43e88dfe SHA256 b423657e30be6b2589b9da7fc98507b658028786c4950295138769b0ff0cb171
+AUX libnl-1.1-vlan-header.patch 2380 RMD160 0486b1dc668a051a110cf2d208d24c3c61f3ac29 SHA1 9169d0c842d05eaba102de11e29a95ab2273a537 SHA256 e97cd3d64d9c8cbed85ceaf7b50b5f116e823fe7d009a7d38c3b11cbdfcfcd9c
 AUX libnl-1.pc 184 RMD160 ca83279dd0fea90c0f03f3d28f6808e82ccb3a1f SHA1 e87c07eaea0cc0305a01e41bc6d0d1e87403d091 SHA256 36632c6a5fbfbfab28e56a3fbdbc5cf3d867c4b401481a3adc48214a78f00a70
 DIST libnl-0.5.0.tar.gz 163375 RMD160 e026591700b360ae440f4c894ad093416d7cb220 SHA1 325dcd016e0c0516b46dc165d60144d24c11424a SHA256 89a6b5086987460ddd9b24723f35a3a951ccf2886cabe26bef89b8c53528fec5
 DIST libnl-1.0-pre6-fix1.tar.gz 209345 RMD160 de3007803c9e3b6e40bb15e3725d280cac0a7d75 SHA1 41387f2921fc4a5cd3a82193ce6acd5c75e46b80 SHA256 c8e7c18c17e8ddf7c9322ea8b5022770f79d5dd2fed7ac239d622f9dbe477a03
@@ -11,6 +13,7 @@ DIST libnl-1.1.tar.gz 288932 RMD160 ebfc660302f31e5a94f03683f1ba85a3e057cf30 SHA
 EBUILD libnl-0.5.0.ebuild 692 RMD160 877c795dad235159c1336f57ba048fc6640db6a2 SHA1 eb9491b3d29bce630115191a965c1c8339bcf8bb SHA256 0e07675966b1e58a8e5d0ab37634b7b1b5e1395350dc0aa84c7d88837453149b
 EBUILD libnl-1.0_pre6-r1.ebuild 955 RMD160 1c150401b127bee7d24e7ac5aa78f9849a898b22 SHA1 87c39afd4dad95256b3bcebdf7e7f6d00e4f1aae SHA256 67fd434bb98c578c97656d3518a09ac520626a4930d1b2a9042c9455e039190a
 EBUILD libnl-1.0_pre6.ebuild 940 RMD160 971a47acb29349304b096bf65e89de8e97fe3760 SHA1 45efa28aee82ac65aa0216e077530edd13df0cf8 SHA256 fede386d82b8dc44a9ed6a4b8ef378ad66b5be7eb90aded3fb14ef9e69ee45f7
+EBUILD libnl-1.1-r1.ebuild 714 RMD160 84977a0e3d32e4555e67c614d6152395a7cadc41 SHA1 11ee89e37be5ad18dfeae71d9ddc679d6b9b31a7 SHA256 c1c6b728fa9eed3b60df075181ffb03e33da861bbc0d0c5ac6ecc27005b46fc8
 EBUILD libnl-1.1.ebuild 578 RMD160 cdf7cc6d30d7764ec29bf4bc7533ca8f3b7f949e SHA1 99a4c80a09d251abf189c5fdec340a17dd394231 SHA256 3787f23edb65d160ee2ddcaf5c15809735e0a092fb100472276fb1359cee6608
-MISC ChangeLog 3364 RMD160 9e222a9359f67d02bf315ddfc7fcd1df6f2df7cd SHA1 50dddd518512b6026f4d3c602d9faf2ecf8d001c SHA256 ee378d7f00cd70b38bfdd9c9821f6973a9b980e55cf231b9c3d999f4ea7fb2eb
+MISC ChangeLog 3681 RMD160 72539719927bbce6087d3122f6b1cff9f8ac4c3d SHA1 897d17b496d8b0fa565c66504f955b1a1a7cebcb SHA256 9a9bd48db254a7dff09faccc1f8746f8f81b9b100fd77bdd39f238daf19d17a7
 MISC metadata.xml 257 RMD160 31a33f71ad088fc55f06494ce46f4278383bb012 SHA1 909146c787ae6f940d598fa431d6d3c2dbcbf594 SHA256 1cfcb15424f420e1604498f361a397b5f45a29da83a51808a6a0c14a9cabe219
diff --git a/dev-libs/libnl/files/libnl-1.1-minor-leaks.patch b/dev-libs/libnl/files/libnl-1.1-minor-leaks.patch
new file mode 100644
index 000000000000..855a6ab3912e
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-1.1-minor-leaks.patch
@@ -0,0 +1,40 @@
+From: Patrick McHardy <kaber@trash.net>
+Date: Fri, 18 Jan 2008 16:55:49 +0000 (+0100)
+Subject: [LIBNL]: Fix minor memleaks on exit
+X-Git-Url: http://git.kernel.org/?p=libs%2Fnetlink%2Flibnl.git;a=commitdiff_plain;h=b64f15d6f947839236fa276d473d238f8c9b9d57;hp=e91bb2ffb090955d443e643a25b250bf3d33534a
+
+[LIBNL]: Fix minor memleaks on exit
+
+Make valgrind happy ...
+
+Signed-off-by: Patrick McHardy <kaber@trash.net>
+---
+
+diff --git a/lib/route/route_utils.c b/lib/route/route_utils.c
+index a12d169..1386cda 100644
+--- a/lib/route/route_utils.c
++++ b/lib/route/route_utils.c
+@@ -63,6 +63,11 @@ static void __init init_routing_table_names(void)
+ 	add_routing_table_name(RT_TABLE_LOCAL, "local");
+ };
+ 
++static void __exit release_routing_table_names(void)
++{
++	__trans_list_clear(&table_names);
++}
++
+ int rtnl_route_read_table_names(const char *path)
+ {
+ 	__trans_list_clear(&table_names);
+@@ -104,6 +109,11 @@ static void __init init_proto_names(void)
+ 	add_proto_name(RTPROT_STATIC, "static");
+ };
+ 
++static void __exit release_proto_names(void)
++{
++	__trans_list_clear(&proto_names);
++}
++
+ int rtnl_route_read_protocol_names(const char *path)
+ {
+ 	__trans_list_clear(&proto_names);
diff --git a/dev-libs/libnl/files/libnl-1.1-vlan-header.patch b/dev-libs/libnl/files/libnl-1.1-vlan-header.patch
new file mode 100644
index 000000000000..09124d607596
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-1.1-vlan-header.patch
@@ -0,0 +1,80 @@
+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
++++ b/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/libnl-1.1-r1.ebuild b/dev-libs/libnl/libnl-1.1-r1.ebuild
new file mode 100644
index 000000000000..e09b28f4a693
--- /dev/null
+++ b/dev-libs/libnl/libnl-1.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-1.1-r1.ebuild,v 1.1 2008/02/20 08:59:15 pva Exp $
+
+inherit eutils multilib linux-info
+
+DESCRIPTION="A library for applications dealing with netlink socket"
+HOMEPAGE="http://people.suug.ch/~tgr/libnl/"
+SRC_URI="http://people.suug.ch/~tgr/libnl/files/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-vlan-header.patch
+	epatch "${FILESDIR}"/${P}-minor-leaks.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog
+}