Add various fixes from upstream.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

6 files changed, 86 insertions, 18 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index ac97b009e491..0eb15770e869 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.366 2014/01/20 06:34:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.367 2014/02/02 08:17:37 vapier Exp $
+
+  02 Feb 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/busybox-1.22.1-ash.patch, +files/busybox-1.22.1-date.patch,
+  +files/busybox-1.22.1-iplink.patch, busybox-1.22.1.ebuild:
+  Add various fixes from upstream.
 
 *busybox-1.22.1 (20 Jan 2014)
 
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 00f582c974da..d3c7636025ad 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -13,6 +13,9 @@ AUX busybox-1.22.0-find.patch 1138 SHA256 f6b9e561d02c08596183f05d5b5f9e04943173
 AUX busybox-1.22.0-grep.patch 2270 SHA256 8df2fa5a9a92216fb103d53e76a29c373d55414beb028013a95159a3c96a6d6c SHA512 861d3a03c1332e2f066938c4dafa78ba2304b44766151404bf89d6c6c4e5be51ab01eaf67a86361e48ce96a3d7c308bbe08606bbffdf45fc294922e54649e25e WHIRLPOOL 9c7d8b25abb7ea0b91679cf0972ca7fa6537080913ffb7ff8c23ca8a944d484da4983b5028a54688de28a986297e7c441a18e007e11efdd9f28cfb3b95f0b002
 AUX busybox-1.22.0-lineedit.patch 286 SHA256 7ec247a28fd86b160d7f621666cc14dc16397abaaa6a7797eebab20573b8b251 SHA512 f4c59650deb4b48a9c6191d3e896af62e77ef0badbaf98661585c80afca1b8da4c18d0285977f62263a0f016f8e42e3697daa52b66a0ee1e50d3ead94dacf902 WHIRLPOOL 97f966cb8a06f702a9b773eb65acaabd71d45a57bc6d3e0ef6397a40c0e54a5c801c94af02b026ff7b97999325a270bfafe4c686a487bda9e7f25bffebec63b5
 AUX busybox-1.22.0-ntpd.patch 328 SHA256 bb54653941bc67178d76c6c800fe1d35600e9f9a70e53213f525d14a8bd7e307 SHA512 cb8e0e439a486adbf21ab9bd247bcb562cd42d48a8eb893176247a7501ff000d12c0eb5b215c727b412eca591f00922b277074ca225f58e5fdb7503b8cd951a5 WHIRLPOOL 668726dc11a56ea3ff92c5c022a6a55489caaf2b7fccbc80b7f75cda0a6f91db41ded78bf17237599ca6d530a2b1405e2e9510e8b7d3f33caeedaaf039b450ff
+AUX busybox-1.22.1-ash.patch 344 SHA256 c3b5b5c5522fda8014b12a23c370d7f70f6d1625fefa93a62c5c14414528ad12 SHA512 297736a2b41badba50a64881e20778e05c9df5f6fed5cbe45cf8c5a31e5486a5fe85ce00897c2ef0c60787cc33467f03fc586f39945f513a7caeaea57aafc8d7 WHIRLPOOL bea756e5335b2ebcabb487b9a4f64e1aae0cf9a4652ed3bbab5232b31fb5730cdb726a152f1ef494aaaacc251a24a30c40bc89485d2b008eb56290f88008ea4e
+AUX busybox-1.22.1-date.patch 1008 SHA256 8502dd7454e948a56fcd8201f4fe9d629d2844b9df2bacff7ee0bb09398d12e8 SHA512 0836ef682e24fc0e6d660d0d835200d5f4cd863691a6b58d071e40d001923664389f61670037140c2f95deb2080a93c989037308c761ac9304165d83cbfd3d34 WHIRLPOOL 58b93b0553e81f98c49503bfec33f473c1a7cde2ca3110e96c0d80f45d458c98b5cea1528637b4d9bbbb3df4de6e074446d43cbeeee285cec3ea52a352c374d2
+AUX busybox-1.22.1-iplink.patch 425 SHA256 186b41734e43ee117cb367055ce6a4d5b3aac671c09d71f2a6347793874d653b SHA512 f213d11c842841a5b7a6c8b1ffb38719eb038cde220b06f8b5419e63998e21629b0e3f481ad7549d67a764e113abe524d8a7fa0fd9286b8b355a1f20211fd889 WHIRLPOOL c87b1c0dafab79fd707ec22d7540de939595d3fb6665df2c20e22059b4c675fab1d5f81353230e1a172a9fc618c766db32c8e0c35913f160a06224cd13de47a5
 AUX ginit.c 3097 SHA256 fd6a4715d3dd10f6db479020433da3997d397658301335c847fb779129238b8c SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c WHIRLPOOL a1ec3ccc296033d88a9504b693c7d249d0bd11b1d75e3f59a62137c5e4b4c914fe2b8971c86dbca2cc8ccc0d86f3f8c2c45bb44cec85a3628c44f091476baa92
 AUX klogd.confd 218 SHA256 737b78745964e110da2fd3357c6d5fb80ccacf979039b8d40c03cf1cb969e5f3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f WHIRLPOOL ea28c1d926e36fba0ab69de8ddfd2503889b7cfa3a4ada347a9d22d9894fe30be068c0ed55f899b952e62b8de3cb69e1a4209f7864787988ded28ede10c7445a
 AUX klogd.initd 359 SHA256 ef607b72d270797e4be1fba425c23ba26078633c47c698063bd4b17e7b4ff8c3 SHA512 e9d6215e4b0dcc4fbb507ce2bb84c818ad18951282c47c98b0c98b3fa58e6b28218f608689a7786cb0447673ae1f5c3ba5767f9b29cffd73325d93bf2a928ac9 WHIRLPOOL d7e82a0d2a6a60b2444a3b212022250297ca163001045bf508442972fc6330c4eea55cb965920778e090c92a69441e864e6721f02ecc6d10279b6196b14f7e71
@@ -38,24 +41,24 @@ EBUILD busybox-1.20.2.ebuild 8689 SHA256 7b8d73cfd1fef71b4dff1d1401a06409efcc13f
 EBUILD busybox-1.21.0.ebuild 8493 SHA256 c0753eba50809fd0a4520a645f62f632e2c88f90d7b1d8e6afd315ae6952d444 SHA512 10ed172f9ee2fddc8a87a4b2db1b09f5767b1afe148a3d3c67e5c5487f7d7c3eb999f21190672d688d16707fcba2ba0007dda9dfd1871e961545e730cff315d4 WHIRLPOOL 5f2ec0cf5f9cfc5dec73260bce07d564d675c88a34e47c01aed73983dcde522707963c7ec09b9549e82313d724438a9fd26d176d068861e1a1612f6e7fc646b0
 EBUILD busybox-1.21.1.ebuild 8506 SHA256 45e6ad003eaa29c594772f24aa1903f36125bb3857d8fb86c6af2290e6755204 SHA512 7b663ee5e3580ab0f5b31c725ce5d7481cc38edcacacda035a20ea953be2a6edbe0b4c8834bb923bbac7a17001f213efdc8a259a92b85cdf7bdcfdd533be4ff3 WHIRLPOOL c66565d1749fccaa0d5e66e975d4497596ac74b114beeade6a68110535616c937d88fbfa5ffe2f3a01b032b164afaefb51da559918a35bcefbe2394bf6754490
 EBUILD busybox-1.22.0.ebuild 8506 SHA256 409a8606aacc2292e12fea917d25d15e91e03079b698eb5fc687de767038660b SHA512 68d4434012dd21ed9bebb0f33125fea20eff243af676e5ff6246fd03fccc7b3411dae57327890208c7c74c22b298ab9e482425d44798d75d3200076d8b4d5ed5 WHIRLPOOL e6b6f6301dafda61cd553b5d808e41d7b05098a2b10a7161db74d157097639efcd83d24a92ff5430a17e266c682d293494d82c2eaedf2666b1a32768bf83642b
-EBUILD busybox-1.22.1.ebuild 8507 SHA256 0211bdc3d74c33d26bab95e47be193e6cfead41a3b13d6dff31e33f06b1483ab SHA512 81cfd7e9a88f6f0c42eb7182ffb7543de0e8217af58ebe51ca1f980dd589f5b064c75f0aefa737685d89ac927ea5fd3571bc6f69a3357c9faa249d231733b100 WHIRLPOOL b6eef9a3e3d32b2b93e2ef3d59a7219c4316964cad91603b17362e30e4d8ff356e58a1a84b838124a3dfd3c44574f1a5a3798b01651ff1c36e7b334266c376ab
+EBUILD busybox-1.22.1.ebuild 8506 SHA256 1dadda4bfa6642d9e3dbc01120caf68214f4aa01feed4979363ce73b7e3a8002 SHA512 80c477f4bcf2d2618dd95d2bdaa0c5ae4cf66018aa3012b7d58af5bc855395e56c554ed30c9c07bb91a286b60d7967fdb0b6c5abfd97d35d8e37b1861e5a7a4c WHIRLPOOL 8c8ba8d2ddc0dc932dbdbed681d0a891a6e2de90bc93b7273512b766fbe0d4869b98d2ea7036788809f197c2b015d9519b1176c0d2fe71d7668c097b2dceffae
 EBUILD busybox-9999.ebuild 8506 SHA256 08368826e7140b6d925b7eb348f1ccb99a851b825f9d6f4d80adee57d4f6dec0 SHA512 44f90f8eeb41cd2db2306df90debe289b7cd5ccf72bbd8185f64747067fc41717692a7609976738d6efefc9367a91d68c2ee9ae21ac74e3707dd896b5e6b4b69 WHIRLPOOL 11708cfbf79cb597a9f3ca75d0bffd77b0d1a247dbb25fecefeda5fe35aa5b5141c2b161c1e370c6c088597c0d9f4cd3db207e2071a456b3a66ec7203c11f2b7
-MISC ChangeLog 56116 SHA256 0309d16968ca70798b6e429dbb3abc55c4f8ce2ad714b9c9f482b88261850b21 SHA512 b46a9f7b71874df46403a82a00b8e83e7ddcb59015d49c45cb666409b4735de31ade72953333ab70aa6212e78cf61cddb1c30fa911adc6102f16186acf53d60b WHIRLPOOL 22572a451b1b3efa3ace30d2c20df80677610dc138cc68fbf5cd4d48d929b85b2a5b5c92c03fea6783cab7c52f098399e3fc897f184cacd727fb2f2aaee99625
+MISC ChangeLog 56332 SHA256 fc197f30befe41af7e907601706c5396f82ad4df2b5ae1594df64ec630ad645d SHA512 46492c72a2d1589f6b62590b563e5c75d7b154ac1a0db7fcdd5223dbf8dffe5ce8df9bb6fed343e0abf0d33e3546a507aa1f3935d3c3bce5630bcf2d134cc7d4 WHIRLPOOL bb603b572f17d19e0488f35f1169fb9c09505892b1a1ecd80a5104f9f1ae1b6ca69d24537a4041a238fbe4968611c9752aefffb51605b01f441ad6e7f03d4c1c
 MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS3MOEAAoJEPGu1DbS6WIAE78P/1q8gwt5ay8Eus9dFF4x9kxc
-K5Bf3+zKtCYhbI+bN43i+GEfEKLHcUXbclZ062KZYg697D8gAVDvACv6oc4ct6C/
-2Bf/YoVyY4h6R8D+M7kzDvOBDwklb4NhEWuWdq23228Pc4bXiUzZPTaHMNGZZrZs
-XKDQPgrz/9eqFmh6Cwo/ddMhZqv5t+m7nDAUmSIEaWtW6QueN/GSd9qh+z2htGQT
-PD4uIAMGL3maHx7O82AIa+mbxcZgrNj7qzg+b1w/QibOkU17lOSDJ9U78vlYwt47
-vhU2M83/BdNLCWEt85QALLDdqVFOhaUHqNKhVPpUmEsBBFOT/YoJvEQaGudLIoq+
-EGkK9FrTuq9zW4soMRlHaZ7viobz+eIaRW4Gs9savNpf/41Mw50QPwXgJXDdL5rA
-4kvCzDSdlrDOjImKFnI9M7xAgc8RcKwtvD0W6g4MV56DwEfN/96O0V1eUhRCE2Q3
-0vGCfQO6BY+WLt6IxXh++GVdvDdEPYzQ1GF0lkYtsu0NdkSlZ374aGoM2zEE7HqU
-qgnM3RHn/Z489SLPCkvIlCcC+awgdHXqf4JWZ5ij1Pul8elBxRrOFGk7CvLTNpuN
-Av0GRwbc5EpDT8Ah4lVBeMKmj9kZyo7AR8s/irDeMgcFXyaZYL7kDJoc1v9jbuEQ
-t+FwLWKVn/8DmmawG7r+
-=z7g8
+iQIcBAEBCAAGBQJS7f8iAAoJEPGu1DbS6WIAc9AP/RtrNhHCkzE+AXnw0VEK9fPs
+BXd5PNKrpzURuhlfiEBEBlqUkrM9rqR0tVTpA+x1Ycsca5ms+lKZVEywJQ/PqLIX
+b2ZBoYZDImfCrhWwwxG67h3ZVRE5ElEBEvXIHlKZmj6pd0zmMDlISmgVJLuUm1xH
+6POfOdhIR6PpIDtKuGDLqs/k5ljuAIuVZUA12Gy2GJ1niMHbsY+J1Q3H609VRhL8
+dhNoGL9qssTzLhvTPmbFZ1kj6y9r1mhGr9aC930eqL1atm2x6mKs6M5WR6DitQPs
+wsDK5iacbgc/+4drReYMkS4Cmz92NgNqRspSoqLfe7sCSn40oiCz50mGQA4I80av
+Otesf/IiDgnO/aeDciM8Yt0yu3mQ3wTO4pQnxZDzaBbz/htAO2/4pytsVBgYk0y8
+0+liequGS1tAS5VClkAPCboPA3LeyHtVo2r/ts5TWAotU0vXMmTo6XNA31mlvJCo
+MlHBQ46AzGF3Uzz65zvv8uiwPkLVTvMCp7NTsvQA7Ysdu4Myh2j3Gr7RArAucuvI
+bhB9rngWPhgWOhe7sfJR7/x0/+OY8pfR1oPXItg6Og9WUnouwejTasibrrBsWhDm
+LUaFr0Dpdo2uVfFN5i2/TOIfgKTV3Gbrqzx1/hMlqAIunny/M+7aISQMyjRmqX+h
+9Jx2klcchLZ1OjpPhGVC
+=0ka2
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.22.1.ebuild b/sys-apps/busybox/busybox-1.22.1.ebuild
index 84ffb88b364d..50209837a3c3 100644
--- a/sys-apps/busybox/busybox-1.22.1.ebuild
+++ b/sys-apps/busybox/busybox-1.22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.22.1.ebuild,v 1.1 2014/01/20 06:34:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.22.1.ebuild,v 1.2 2014/02/02 08:17:37 vapier Exp $
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
@@ -66,7 +66,7 @@ src_prepare() {
 
 	# patches go here!
 	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-	#epatch "${FILESDIR}"/${P}-*.patch
+	epatch "${FILESDIR}"/${P}-*.patch
 	cp "${FILESDIR}"/ginit.c init/ || die
 
 	# flag cleanup
diff --git a/sys-apps/busybox/files/busybox-1.22.1-ash.patch b/sys-apps/busybox/files/busybox-1.22.1-ash.patch
new file mode 100644
index 000000000000..301e9428d0b3
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.22.1-ash.patch
@@ -0,0 +1,11 @@
+--- busybox-1.22.1/shell/ash.c
++++ busybox-1.22.1-ash/shell/ash.c
+@@ -13014,7 +13014,7 @@ init(void)
+ 		setvar2("PPID", utoa(getppid()));
+ #if ENABLE_ASH_BASH_COMPAT
+ 		p = lookupvar("SHLVL");
+-		setvar2("SHLVL", utoa(p ? atoi(p) + 1 : 1));
++		setvar("SHLVL", utoa((p ? atoi(p) : 0) + 1), VEXPORT);
+ #endif
+ 		p = lookupvar("PWD");
+ 		if (p) {
diff --git a/sys-apps/busybox/files/busybox-1.22.1-date.patch b/sys-apps/busybox/files/busybox-1.22.1-date.patch
new file mode 100644
index 000000000000..6380d8781ea5
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.22.1-date.patch
@@ -0,0 +1,30 @@
+--- busybox-1.22.1/libbb/time.c
++++ busybox-1.22.1-date/libbb/time.c
+@@ -68,15 +68,23 @@ void FAST_FUNC parse_datestr(const char
+ 			/* else end != NUL and we error out */
+ 		}
+ 	} else
+-	/* yyyy-mm-dd HH */
+-	if (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year,
++	if (strchr(date_str, '-')
++	    /* Why strchr('-') check?
++	     * sscanf below will trash ptm->tm_year, this breaks
++	     * if parse_str is "10101010" (iow, "MMddhhmm" form)
++	     * because we destroy year. Do these sscanf
++	     * only if we saw a dash in parse_str.
++	     */
++		/* yyyy-mm-dd HH */
++	 && (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year,
+ 				&ptm->tm_mon, &ptm->tm_mday,
+ 				&ptm->tm_hour,
+ 				&end) >= 4
+-	/* yyyy-mm-dd */
+-	 || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year,
++		/* yyyy-mm-dd */
++	     || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year,
+ 				&ptm->tm_mon, &ptm->tm_mday,
+ 				&end) >= 3
++	    )
+ 	) {
+ 		ptm->tm_year -= 1900; /* Adjust years */
+ 		ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
diff --git a/sys-apps/busybox/files/busybox-1.22.1-iplink.patch b/sys-apps/busybox/files/busybox-1.22.1-iplink.patch
new file mode 100644
index 000000000000..dbd76c574996
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.22.1-iplink.patch
@@ -0,0 +1,19 @@
+--- busybox-1.22.1/networking/libiproute/iplink.c
++++ busybox-1.22.1-iplink/networking/libiproute/iplink.c
+@@ -31,6 +31,16 @@
+ #ifndef IFLA_LINKINFO
+ # define IFLA_LINKINFO 18
+ # define IFLA_INFO_KIND 1
++# define IFLA_INFO_DATA 2
++#endif
++
++#ifndef IFLA_VLAN_MAX
++# define IFLA_VLAN_ID 1
++# define IFLA_VLAN_FLAGS 2
++struct ifla_vlan_flags {
++	uint32_t	flags;
++	uint32_t	mask;
++};
+ #endif
+ 
+ /* taken from linux/sockios.h */