Fix build with older C libs and missing defines in mount.h #468120 by Agostino Sarubbo.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 62 insertions, 11 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index e431cf853dc3..c3e63ec24094 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.223 2013/05/01 06:29:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.224 2013/05/04 05:09:02 vapier Exp $
+
+  04 May 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/iproute2-3.8.0-old-mount-libc.patch, iproute2-3.8.0.ebuild:
+  Fix build with older C libs and missing defines in mount.h #468120 by Agostino
+  Sarubbo.
 
 *iproute2-3.9.0 (01 May 2013)
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 43ff3fc8b2d2..0405cae2ff02 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -14,6 +14,7 @@ AUX iproute2-3.1.0-no-ipv6.patch 1352 SHA256 ee93d86903e6f0aff54cd3c861f91e3d376
 AUX iproute2-3.6.0-pkg-config.patch 2286 SHA256 46649856ad9e735e403bc0654d1c1afceb13a0566079ad52d62575efec4443d3 SHA512 ab90d85930357e5ab6fcf0b26d4661b485db99f9617c44c714b0035da8259f65f60f637be7f1e8d74e57f583251e1e28b11dc41a793d49b2abe87c0e458f2d28 WHIRLPOOL 14901196812106789df01f1459e8abe7a68db699f2e3416d3d0e30ac33fc9638eeb0c0d443eadbde312fbbdf49c15f9c30b3ce303bc3e42aff7a3292c1de8d39
 AUX iproute2-3.7.0-clang.patch 2636 SHA256 f56ba110293cf383e67e18df494cbbf2d934e79ed3b21ddd8644c78183d27e16 SHA512 f89dc88ddbd2ffab3d6735261c2117e6cd4a92111fe2b167d453112ff90ce8fc2dd8de83eae3a76b2eed5dedf4a5f631b9ed48f4427acbfaa75382fef1fa1783 WHIRLPOOL a4272f6d58672a4039df57a6585c935af50bbf8f6541d39fefc59acb80ec44b0da18ef5bb2c05f963e6376bc28d1cf9eab3b80c570019ee77bb651d70af94e3d
 AUX iproute2-3.7.0-man7.patch 1350 SHA256 71653ab06c937de2c01370b39c16e5a9d22c1b25d8b5ade3febff7be888ad29e SHA512 0fdfa23e7c51b09335ef32b8baa53a6fd60490b5a531252a5b192f4470e08b4acec2cd568d5644df203e72b62ff0fcf656a57c089ce4511db2a5fe8b10f01d0a WHIRLPOOL 6afd7653447a17b9ecd40d44490a01e610f9fc5f281081508b5421498460ae58bf37ef5fd7b36e4928a0ecb7ec404f50f3d984812d0e33ce08cd735da8e7e03c
+AUX iproute2-3.8.0-old-mount-libc.patch 871 SHA256 dc9fc407b09763f79663dbad627961f8a3446881737cc666f0cb67235f160d51 SHA512 cda73ce07c21d18c68fcff08e282e87a2d4b53cf7779e8a1ef669d7275974c8f3638ca530031aafcfc7eb4885264ceb7abb308b9da6f5568889a84cb4c7df1f9 WHIRLPOOL d2057e6bad82dce7844886d551d70af9207e111494b9cc23abc433857741afa48f30671091c8821a60aaa07ca621f243fbeee10322da11ac44d02f4f588b88bf
 DIST iproute2-2.6.29-1.tar.bz2 367905 SHA256 13ffb0ffe5404c9dcc8bed8c692f07d934aa3fd44661df79dd1efbb37f83fb9b SHA512 5c8e9ba81c6c6566aa3827bce9e1132a166a2a620a38de226f36779c45d6c1efa1d591a845c82c0456508448b555863199aeda3a5d15f5b10ddc093b9717c3e1 WHIRLPOOL 107eb626d3d5feff3a476c41a392b19e12ae240eb06815886a7fb2cdd2e85ce05f3af80d1cf42368ee8f9957c3502c4facbd5ec937e4da0986d8f1f5aaa5dd40
 DIST iproute2-2.6.35.tar.bz2 387193 SHA256 8ab2f47e129925fb8acb09421008d07aeafa01b2ddd1fcba4a056de079f090a3 SHA512 df93100d350f3153e6f7ca627ebb207af53a2f99a1187a12dcc046da9d87aa847817f77a50c3fed86034437d7394b376b7b316449690150ed2e3db2d998b6a94 WHIRLPOOL 865a2570314f7b4bc32c6d7c722ecbcfc007662c29801cd9402161943e9d9f7a1e7b0954ffbfa215960056c9fe1e1d327dcb7f0be899f398fd4fe5a0c14d9eb4
 DIST iproute2-2.6.38.tar.bz2 390166 SHA256 47629a4f547f21d94d8e823a87dd8e13042cadecefea2e2dc433e4134fa9aec4 SHA512 b3a0c15c41184554da1b7f2521f5f0586ae0df1a62899afe2514d4adb93f05ecfd10fc964e027ec8f83a990586f5858b0c9fb24ea8c78477ec6c7c51593c54bd WHIRLPOOL bbd3a415c8396adf1ab63f2f3c91591c65809f8da12f6333f6ea66997cbca428ec2339759f53d0bcc41a1e9c85718e598efde0206a000d394560cacc9a78e8cc
@@ -35,19 +36,25 @@ EBUILD iproute2-3.4.0.ebuild 3002 SHA256 345f9a7580ed2bb81811c60bd2a66ea580b5b10
 EBUILD iproute2-3.5.1.ebuild 3055 SHA256 90734a1a0822fea2d81649a2c6f06aff648903a393cb57906b560b16da41f02e SHA512 07550ab66ff8aef3afb76d5083c74548f77f9cb2a944261f2b32756011d25bafd4c83b5fafc1283ec0a96c564d84020a6b8381b55dcefab9d03fc426f31b6682 WHIRLPOOL b39b2b78640f59b7dafe3904ff245b298a9e1afd7c34c3d55fd1073b3a583fcfe28464096c4666151ff8a64f94f778007d93f8e0d91795ae6a239cd7871164c6
 EBUILD iproute2-3.6.0.ebuild 3114 SHA256 72459991b542f96e5faf4d342a2f22376b5b86925ce60f55c942b15818c930fe SHA512 4a4fd992d44ff336e11d095238829182b50384a80a981ffeddfc954384ecebb2f525e9c24930829959cf16dd474e5b0ded553b4ea41fe26379493b636e088402 WHIRLPOOL 378588c27d859d341167471cc8fb9402163b1667279696274a70355320684b231801e4501b5c65bffba85963579b985be84518917805b1633a525b2dd35a419b
 EBUILD iproute2-3.7.0.ebuild 3199 SHA256 f56b5e5c51fb9973041da16383aebc579a99c9b1f542f2807ddc619c4f07a24e SHA512 e8feff7bf4c396847c2bb2a99a62e8b2cca33c36dc8a6fb634e617dd76a2d2a5735787c8d4b1e8347ef978978b29c0ee56bf7d765d792ac95fee49829b65d508 WHIRLPOOL 25c396761d3a07ece0981082dc25c90f9264833813c60fadb275215c112b636937cc575587c3f290928f8a09a4e54ea8f0b943dc8d37dd98024620627c9229a1
-EBUILD iproute2-3.8.0.ebuild 3395 SHA256 b1a94e3af373378b51c5ffb2891e92ff858c90a5602716d0e80dfb40b18a43d4 SHA512 f9629c8fe027083870fdb431b9f0444f5f3f4fa16fb14c423a876afe6b09c72d302da32b25c82f7d1972a7ffc93388f47d1bde8e0c8e2333faf3fcb8a9d29d1a WHIRLPOOL 9b461e847a979390dcd7f8e07bebea822435009cf9b47327df04830dbf4db93f417bf75dcbd103d81329ece8f5b8081a8d475c11a5f4c0ccf8422e6a8702d1b2
+EBUILD iproute2-3.8.0.ebuild 3451 SHA256 693ccdfc5189e47bd86f0400865caa3d90cf11c0ba66dd32cf890d2aeebee87e SHA512 1bb755856ab6db55667fff6adff6bffc6c113c7675935b49a8e431ca1c46ac9b058b09da2f5e0bed2638503709806a2049652f35c8068cf0d429864a97bfb864 WHIRLPOOL aacf2f6b16f43bfe49e008eec77f1c2aef227d2e1834e658f6c5840e666c5ae428abde3166bf0867fed5bd59b09e8459b9d2eeee2ff688f51d8c28b844d9e092
 EBUILD iproute2-3.9.0.ebuild 3408 SHA256 accbf12840b91e6ba2a442f4999b69cd158c281e1d04b35a8a9166a5b6381a1d SHA512 83a761897f4238dc23d0bb5f353ac568948f336223f2bf0a4053e9ef98935d12e46fd0db6355cd7e57f7e932ea6c80cdff58ae48a5ed23affbd280f298b5f293 WHIRLPOOL 3fa222d5ec1836a01db9449662debc095260e4efa163186f8078f573579ef7162e39b7c5658b6b46b95472510b0d469760d897b1dbd1a66555b43d4738769917
 EBUILD iproute2-9999.ebuild 3055 SHA256 32b61f9313517614ffba60260c1ead2cf84fda286a74662acc5a1bd3c1c9344f SHA512 512e59cddd98de345b55adbb7c6946d837f9546359cae991815269fe3ef47785d3dceee9ca19c233d43a0af00b1cf92b2dbe31bc558e9343c44f814da1d4bd37 WHIRLPOOL 536b6da189a21e2bfb056575ca1bd3efdb428bd7f1d9240d6391dd4444946b39eb6b45838008d4e0db625c371140ecf38dc0fd0440d389985681aac023cb902c
-MISC ChangeLog 37476 SHA256 61a6427deb217b43bde517b85db7b9361ff703fc192e6321c68b3ed2f80d2e9c SHA512 9534d47a6f98ec4ef6f599a446ba2d2c55d15dcff4bccf8787b77e0103fb38932a1f0f488e028f69cf2362d4c4a743ddc5bc3a44cde3bf10574449205800d6c5 WHIRLPOOL c91fb8d8ab5c42732411a7380c00dd6e803a2f62b69730c2c104c962257ee8ebbf7999489154dba66c12833bd7c86189f18ac87d3abd05e1f37892b339614098
+MISC ChangeLog 37685 SHA256 3c9a13597b237954b84914f3b2d8b5fdba4b13d470c5ef53ba106bd911f4a8a9 SHA512 2a96423d83c259b78377c2782738fe43d2577bea3ef4b75bb687785fd06c6b7c9c18ba8ab267acf78014e13bcfa91a6e1bb06c1617107f1c8002cd97b4b89970 WHIRLPOOL 1adea53e2be82cb22807b3796e937425a245a83b82c72d2b371f08dc0d78648bc3ae5dcb274de6f49a5d95ea19ee21edc7e35c642d542ab2d827c0e7e0d4a9f9
 MISC metadata.xml 317 SHA256 45312a0c8b9363b8eaa97110513ca39053ffcd967af978900ee0a01aa81c00aa SHA512 2e6ed50522276dd0b09a61ba0c68ccc226ff33b64da2af87e92e349354f379cae040eb753961aeedc2a894eb65415fba7763541efe21bf328fe0a69706aeb872 WHIRLPOOL 73003e9201c29cba545b3245b53da9c36dc4b3c209ece693a9401b954896f6db5d29b209318fb7dd1c33db8920d01e097feaa88ef4ec0cb07590e850803bce09
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRgLZDAAoJEEqz6FtPBkyjPC8H/2j+n9jeDK8bugQdZhmHvjjs
-sj2ZufO5op4fTPb9kmNdQ+p0Ap7t+T5r9prLu4OecDMbCOeMn/Ot2HlZY8LCiiVo
-HlK4t1ltEpGAD2IC3+UdDVzIPR8otE+v5gJ5DzpWHLONKrA0u3vLviLpbyBY0Liv
-cVnAPj5f0ABfhNxcUfdE+L70fE1co6N9l1mqLF53vpkLYgH4osJxhFqpwms+FbJ9
-FDkZXkXn/aScOJ7fQS1eFd/b1vhydWhBj/sJh+19ZneKXvlS/WUrruhFjkmwdrc4
-IGHdTqn1OKu54NdQS9g0W19MqmHrbUjMZs7Tm92tJ+b9LO3PEOcA6MDS+NbjeVI=
-=1uG+
+iQIcBAEBCAAGBQJRhJf2AAoJELEHsLL7fEFWWogQAInwod8w7njxmM12vLZa3pDi
+RV2+AQW/9CJldICeaWJ3WkK4OuOKan6FhAi4ZF64fAPieIgOAQzc0MtqTWQqxhdv
+WJFTFTLrFM1sxBfKWlLgd+wNpO6OKE4X1lVFGpiJgxn2u3U3lyFlKoJgqMTLb/ZL
+vBEMDnviNwrP0G7GuBILTSxL4PBGHt7emGe3DHIoHCcd6LDQTs+Bsy9OUhX6t/yp
+b6eZ1VjMUxEESsL08Nmg2hs6u6aG0R8+ql/k5yhYWaXsyKBXpBXGOZaPqdNXtl2m
+hWU8W/OsQ4dTaux0TgM7avPlEI7rkcobNTvL98zwsMRhzDpyJDtB7uewcbcj8Up+
+McykI7z7E3SNEIKZk+uT1RoddYlwRVVy8gPk4RtD4nHkBkCnG3BjEM0oWa9d6P4y
+s8LaRTqCeCoji7GPrK4Vy8Whu5W/hfugUq7BH/8dlSZxkKLiyVKb6H/5MblxpHj6
+t2z180raENUPOAWQtuOKcr1cJ1hsOriHZd04GwqvzOzcln5lBgJtXzqEo2hqBm0Q
+dXuG7JsvxK/ITmzn01rNdwJPEGeaex5C9SbWG5sqxQcPLD3y32KCXTfKfxUOjht/
+AoCuU+eD8lnsTpqRT4DOlnr2pYHloHTAODR7FvW7X1PDHpMbDHFLwo4eEJr3P0XY
+nFz2cepu+I7pCI6C8sL3
+=jnwf
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/files/iproute2-3.8.0-old-mount-libc.patch b/sys-apps/iproute2/files/iproute2-3.8.0-old-mount-libc.patch
new file mode 100644
index 000000000000..96280e042453
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-3.8.0-old-mount-libc.patch
@@ -0,0 +1,38 @@
+From 03fdb011dd661315a83998af8af779d8f089e3fe Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <stephen@networkplumber.org>
+Date: Wed, 17 Apr 2013 13:33:26 -0700
+Subject: [PATCH] ipnetns: fix build on older systems
+
+Debian Squeeze has out of date <sys/mount.h> without the required flags.
+---
+ ip/ipnetns.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/ip/ipnetns.c b/ip/ipnetns.c
+index b047b97..c9bc20a 100644
+--- a/ip/ipnetns.c
++++ b/ip/ipnetns.c
+@@ -29,6 +29,20 @@
+ #define MNT_DETACH	0x00000002	/* Just detach from the tree */
+ #endif /* MNT_DETACH */
+ 
++/* sys/mount.h may be out too old to have these */
++#ifndef MS_REC
++#define MS_REC		16384
++#endif
++
++#ifndef MS_SLAVE
++#define MS_SLAVE	(1 << 19)
++#endif
++
++#ifndef MS_SHARED
++#define MS_SHARED	(1 << 20)
++#endif
++
++
+ #ifndef HAVE_SETNS
+ static int setns(int fd, int nstype)
+ {
+-- 
+1.8.2.1
+
diff --git a/sys-apps/iproute2/iproute2-3.8.0.ebuild b/sys-apps/iproute2/iproute2-3.8.0.ebuild
index 84ff71535b3c..a363a6b2c110 100644
--- a/sys-apps/iproute2/iproute2-3.8.0.ebuild
+++ b/sys-apps/iproute2/iproute2-3.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.8.0.ebuild,v 1.13 2013/04/29 21:06:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.8.0.ebuild,v 1.14 2013/05/04 05:09:02 vapier Exp $
 
 EAPI="4"
 
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	epatch "${FILESDIR}"/${P}-old-mount-libc.patch #468120
 	use ipv6 || epatch "${FILESDIR}"/${PN}-3.1.0-no-ipv6.patch #326849
 
 	sed -i \