Add upstream patch (bug #494890 by Alex Barker).

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 58 insertions, 18 deletions

diff --git a/dev-libs/libnl/ChangeLog b/dev-libs/libnl/ChangeLog
index a53dd5136e34..4c1dd1cd00a0 100644
--- a/dev-libs/libnl/ChangeLog
+++ b/dev-libs/libnl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libnl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.199 2014/01/03 04:26:29 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.200 2014/01/03 06:36:00 jer Exp $
+
+*libnl-3.2.24_rc1-r1 (03 Jan 2014)
+
+  03 Jan 2014; Jeroen Roovers <jer@gentoo.org> -libnl-3.2.24_rc1.ebuild,
+  +libnl-3.2.24_rc1-r1.ebuild, +files/libnl-3.2.24_rc1-link_policy.patch:
+  Add upstream patch (bug #494890 by Alex Barker).
 
   03 Jan 2014; Matt Turner <mattst88@gentoo.org> libnl-3.2.23.ebuild:
   alpha stable, bug 494836.
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index fa7e89a4d66b..0888f8675df6 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -9,6 +9,7 @@ AUX libnl-3.2.20-rtnl_tc_get_ops.patch 735 SHA256 d2b489afc95ff090d791acaf0c97c1
 AUX libnl-3.2.22-python.patch 486 SHA256 2a1950926e0c319f9e602b08981129c806e29f2416b5e7b613c98f0df532ac1a SHA512 bf4240313578d91285062d2367faa637fdd3176f4741c8d786db840d47640561abb367c2acc77797c869b9257425979e591bbed587a428ec0a753b50733f46bc WHIRLPOOL 172275595f82b6d327d5e7751ecdba3ac3b8141a088afce4f1bed975e636bcd00ca467cbda5cac7382044579094eeb6c889af6ccc1974a82116879f950c5e7ff
 AUX libnl-3.2.23-python.patch 692 SHA256 bdeb075fcf1c8971759e8b68778dd37e4595e10c43ec18538aef380699bb683d SHA512 9baf0516f26d01bf5844c83b4ffd52b185e362b7582f7f19e17e7d1dcd48125e933e91843c899513adbc2e208a9a0e80bc8dec4de83517ab5160884b20f3e7da WHIRLPOOL 0695b113fdf75abc5c8d1705c7661a35dd58d363f606ac1e1ce2bae8fea6b42e91ab23b8a8d60ad9fff17f602db6a1a445dc15f7786a6956a24151736d392b31
 AUX libnl-3.2.23-utils.h 961 SHA256 2b98c8aa5005a17e0b6c960d23d7b516608a388ad136e46c7fc0bb6fd1257e37 SHA512 bd4ae5fa93aca0638273f2afcc8c3cb68e2fbdf706160257e6f0b38fd453a95bfff57d628f59e578ef89268b62c8a97f944799bb4c10602f327a74c032a63443 WHIRLPOOL ce36054eab6a2e55240bf155a1a002affb5735dd618000d2355626b7785b39a32aa6895da7369497f0afda8a2df67352ad29a58ffbc71ddd391f54abc403a1ca
+AUX libnl-3.2.24_rc1-link_policy.patch 1428 SHA256 975a19531f8e596d06792b79e04e1ab40ea1412e0918feb88c435381c9ca038c SHA512 b46abac22e62ac7217bc7c867679fa4023d30e58ff5616b0aa0dc752c4b51afc6f917459aa194bd1c200f4c9eea0829e00d2e615a02dee5a76b42a15049345ce WHIRLPOOL 0a6b8acf57e52f2a5a3884d64fcc25a5737d6cb90706d34f30c151642d3dc77d5680517afd17ef98e638819eba6613f66f581c1b2d037ab58afb15ca9c7866d7
 DIST libnl-1.1.4.tar.gz 1174974 SHA256 4f80c21fe5bbcdde6e72b59b4f98306063a41421f909887c34e58d93e746d063 SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4 WHIRLPOOL eab5547dce7b11c86123fbcc9cd8e00100c7e78f48a4a9fef40f80f89407ea705b701f8f0eb7df63997866f17b0cf0924b43c69b29fa1f1b016fe997371b950e
 DIST libnl-3.2.22.tar.gz 730249 SHA256 c7c5f267dfeae0c1a530bf96b71fb7c8dbbb07d54beef49b6712d8d6166f629b SHA512 b4918857c73d8da41b3cc9d61e579340538c77846aed4291ed38ae549d8c85fa1dd632d8fafc493dd27034440d9890db0d789cb1666ca916d8f82d97ad471461 WHIRLPOOL 0d13b26d087b361fd7af84ca034da123493d39ec5282ca8d0d5434a81b9c85a374850d0dd304328812f71c4e68027e27db32e9c3c4ce7dd499374b48c5d9ca4d
 DIST libnl-3.2.23.tar.gz 766271 SHA256 8cc2cda9aa8cbbad384b9bb1ba0f6777ed9bf65e1cc3170d8c2ba5b3ee12f2b3 SHA512 b56dde135bf8e2a48bb7bb885351cf557b6a88c67dbc012c3c3f4008b8c6066f18442de772e7f8a41d6da8c80d4a38664393f131732870deae9da090b53045d8 WHIRLPOOL ef3f35edc77b7de1657e5ddd0f26e2e316d31ffb46353ab6c7345df5ff9b6d757b2d62fbaa5c58f4a7f5ed13859b00759971b22a069e381af519a82ffa8eb7a4
@@ -18,24 +19,14 @@ EBUILD libnl-1.1.4.ebuild 1250 SHA256 b650241367e12a65ce0e7a529bdeff5c578f92f8bb
 EBUILD libnl-3.2.22-r2.ebuild 1831 SHA256 8b869f370a3f71e29682f5294bed193b365d6e22e10057533ed0793089cd29de SHA512 05fcca31c72fab869e2d7e2048b72359cd4b3e27e454f70e57347885dc464a716b99588d94d5a995a42cae5e1627b09286b6f397bcf821519d8b88994c07a6f1 WHIRLPOOL 9a323d45c00ac1cec8dd2cbfed9a9a5ff3ea00391240c74c6627ea816d04e81210172c40316b26821777cd755ff2be98ad1f5793c87d383581fdadcae39dad60
 EBUILD libnl-3.2.22.ebuild 1304 SHA256 90fc3efa2dc216fecba89343497e1e83fa76428046812d9016c07bb0ca4ace6c SHA512 9685d37182d0b57ccd65b34a35553127c5b78881122b0eadfeffadc12f38b4185a111c5f91f2774ab888610c116b35ea91489a493230bcd12e000d2efde20827 WHIRLPOOL ceac86be9999be197216c8e0539f701fc8519c0122ef68905bd12ce07cd5ecf14cd5eaeb780c707b875e798267a7c7c8687f3ec61455af203d457b4bb42e44d5
 EBUILD libnl-3.2.23.ebuild 1893 SHA256 057875524b0b59fa0e1e9b5c02aaa50dbd6c2170009dc31db8838b73adf85d92 SHA512 38a17c2df8c90d50154970c414563dfa6ad1606bc52a5fd8fa52a87b4448d13615705e7147a3cfbb51567d93b4113d574920cbf3697e6bbf257206d91bc6f1aa WHIRLPOOL 07a89a3bd706cfab45af94d9acf75c3829e86b38dde18f5815538787a49fb69116c58ff4927b4f4b00fb8b3c887ca29f49e2e4988b3b5f88b8e2890a6994ce87
-EBUILD libnl-3.2.24_rc1.ebuild 1837 SHA256 212cb1f086edec27f552b00966c062527a955bb22446153c82789d9f85cd2aa3 SHA512 5f227ad868677700dec8c8cc465ebf46f2263ddcc1c2cd54157a601aac39ff1b3074cc7a62a01190a9e962d707e1e0f92bf68c7567c2b722e0de8d8042eed81d WHIRLPOOL 739804a79601896d2984eb761523b44a4186e1dde1c746575f973c6b13b3b57168c0ef4cd9e9b4922a973bb2eb12326ceb4b1e53e7499e6880a8d7663c528b4a
+EBUILD libnl-3.2.24_rc1-r1.ebuild 1897 SHA256 605577e757304c8331ac0c5d7c57a1c72d4d935f4d8e1fbb731663561745bba7 SHA512 7133077b5193684877f214cb555c8779355caf7b3ccab841940fde28758a6a4186eff23ce68518f1255d35d55d5afdf633f97031cf019654c93b688d1a742638 WHIRLPOOL 73175d4a0c47d45ab82e71f47d89a4e381704e75a732a696947b43be9c233a19685b1243fc1d529656065b7896c77f1dd65e1a8f4ae117f3911ab04504998570
 EBUILD libnl-3.2.9999.ebuild 1533 SHA256 359a8515ae0cfec2723989516bbd947f9aa0f35197f7b2aabec8192a082ceaea SHA512 04ff375474698d84a3af46f4cb6f03e5071a4b1ac986579b5808c2ac1a43c2e08e4598542fada2dae097d3ed94be9f211f3c2f0bafd14fd3964aa32cb02c9790 WHIRLPOOL beeaab57bef7703329d787ba60f11008b273251648dbc2dbec755d7c7c95cac7c990a6575365d36b17dafe368fdefdadb8f4298ec73847a03306d6a74be497d5
-MISC ChangeLog 25929 SHA256 bb74e7efc5ead1a7ec8cf844557f46d4d9a89ec2714e87f39cfd705a86bcebe3 SHA512 616bb4a49c33db0962388e7a58630f911a5bd6b980dad05bcbae0033d96be7a2693965248b8241adf847d355cc9e75d4de4709d8c3ba60c20eba1b8ecb9de45b WHIRLPOOL a261f197fc1c61695a5352e4ec67dd49c5fef242e850e737d5a6d9bd20dbe146717920f2e8ae226800f0cae033eb0052d9f3db560f01aa8111a85eabe07e9f8c
+MISC ChangeLog 26159 SHA256 9c37f2a10afe1fa74e345f42a25809433e5d5d08db7449faeddee10463d5918f SHA512 3fbc89afb9dfa9bc4399726e66a01a2db36fe5011f297050a6cda53cab3578d65ead2baff848a9b41a1833c29462d0c33bc633fe39e199cd82eae47f0b4fcccf WHIRLPOOL 3a1df17d823a16802dabe87ff4e9c4c22e3e090493885a9c916f10d69784100447228b39c0e08b8ea5d469738b9102fb9e2cfb3168233460b2205af4af7df63e
 MISC metadata.xml 377 SHA256 91abe881d89b10123397f09a1b220a3178ff060111f48813cbe6b898316d3952 SHA512 3965f0516fa6e69b2031b43b89106b0124e8c36546ca2eb7c721f21e172c7691482daa5d6bd7d6a509217a37a2394006f6c625174e269103aa0f7deac1872916 WHIRLPOOL 305c84bde3150c0e9f20b304ebd0bf73186bb960c3d2e4b7b87870d68bd258d6b02be66c10f5e285d5f9b6e53742b14b9dbff00b4e8aae5bc617ee0a51c85b88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSxjwMAAoJEA/daC2XTKcqQAwP/0XwB6DW9U7snWBABAvklvZS
-29izs7dsx4ybPAf04v/bDYqtD0qkeMyYj6xiYU6QefQwkPKSN0R/5ZxM93gkjHxh
-NpmXq2rkJEBIgEPjrnty8EprDNwlXlcUwQJ8WY8kf+DlE1QGQWwTmya2FmOHx6Ec
-azrG6F6wMtifwBn1oMTu5Jc6H/W4mIaV6e8bKlTFs/SneuRX8mrIkfEC3KrJTPXF
-rz36N1NrBGa+wGWA0c/SnkOW2kxsJWbVLNzUDr83/iT9ZVBkLBYh+am4BVYlHFxn
-gRnqKGaj91P2RiZJfBFKypaxtwaJNvheknXBSLEz81eBDWl5B7dbrKc9LHoO+jny
-xmIEXF6BMp8URTsf+XWE06BSqkVe+kMaX+KsqKgxQooa4UNF1fnT8PFrjolsluKY
-YAmX2cnHGMp22yELyq5oLhk7Cyp/hBE0BZbGK+rJV1dlDM6nNIO02N1hjNUixrQN
-d5l76k8f4Z90wpRrtOTp8szSARSUjkgIk25fLvtseaIC86IIrJg2reEp7zxCT8Bl
-y+OYrWX39frA/PzX6n4sDd++gp5Eb+wO8ytU2nxPGg4f5omV30k/cHevSXXAA+MF
-+p8pBxqiD5sHaUenlz4zLl84V8akBF/diYtF6aCBjc0ealUqhvBns/FEw5cXM6jJ
-bGBqWg4jFYux6M9HwsEO
-=fiQ9
+iEYEAREIAAYFAlLGWlEACgkQVWmRsqeSphOO2ACfbJ/rHGAYbm7yBhJsnZXekIqJ
+zD8AnjH0QNNzMnzVpzeWjb/B/V+xxeFk
+=6TaR
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libnl/files/libnl-3.2.24_rc1-link_policy.patch b/dev-libs/libnl/files/libnl-3.2.24_rc1-link_policy.patch
new file mode 100644
index 000000000000..08bcbfce3269
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-3.2.24_rc1-link_policy.patch
@@ -0,0 +1,42 @@
+--- a/include/netlink/route/link.h
++++ b/include/netlink/route/link.h
+@@ -98,7 +98,7 @@ typedef enum {
+ 
+ #define RTNL_LINK_STATS_MAX (__RTNL_LINK_STATS_MAX - 1)
+ 
+-extern struct nla_policy link_policy[];
++extern struct nla_policy rtln_link_policy[];
+ 
+ extern struct rtnl_link *rtnl_link_alloc(void);
+ extern void	rtnl_link_put(struct rtnl_link *);
+--- a/lib/route/link.c
++++ b/lib/route/link.c
+@@ -262,7 +262,7 @@ static int link_clone(struct nl_object *_dst, struct nl_object *_src)
+ 	return 0;
+ }
+ 
+-struct nla_policy link_policy[IFLA_MAX+1] = {
++struct nla_policy rtln_link_policy[IFLA_MAX+1] = {
+ 	[IFLA_IFNAME]		= { .type = NLA_STRING,
+ 				    .maxlen = IFNAMSIZ },
+ 	[IFLA_MTU]		= { .type = NLA_U32 },
+@@ -481,7 +481,7 @@ static int link_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
+ 	int err, family;
+ 	struct nla_policy real_link_policy[IFLA_MAX+1];
+ 
+-	memcpy(&real_link_policy, link_policy, sizeof(link_policy));
++	memcpy(&real_link_policy, rtln_link_policy, sizeof(rtln_link_policy));
+ 
+ 	link = rtnl_link_alloc();
+ 	if (link == NULL) {
+--- a/lib/route/link/veth.c
++++ b/lib/route/link/veth.c
+@@ -65,7 +65,7 @@ static int veth_parse(struct rtnl_link *link, struct nlattr *data,
+ 		err = nla_parse(peer_tb, IFLA_MAX,
+ 				nla_data(nla_peer) + sizeof(struct ifinfomsg),
+ 				nla_len(nla_peer) - sizeof(struct ifinfomsg),
+-				link_policy);
++				rtln_link_policy);
+ 		if (err < 0)
+ 			goto errout;
+ 
diff --git a/dev-libs/libnl/libnl-3.2.24_rc1.ebuild b/dev-libs/libnl/libnl-3.2.24_rc1-r1.ebuild
index a2618330d585..0f55e911376f 100644
--- a/dev-libs/libnl/libnl-3.2.24_rc1.ebuild
+++ b/dev-libs/libnl/libnl-3.2.24_rc1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.24_rc1.ebuild,v 1.1 2013/12/20 15:05:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.24_rc1-r1.ebuild,v 1.1 2014/01/03 06:36:00 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} python3_{2,3} )
@@ -37,6 +37,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch
 	epatch "${FILESDIR}"/${PN}-3.2.20-cache-api.patch
 	epatch "${FILESDIR}"/${PN}-3.2.23-python.patch
+	epatch "${FILESDIR}"/${PN}-3.2.24_rc1-link_policy.patch
 
 	elibtoolize