main/busybox: upstream patches for iplink and nc, enable locales

4 files changed, 49 insertions, 7 deletions

diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 4da71d1ce9..1de116786e 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.22.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
@@ -21,6 +21,8 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 
 	busybox-1.22.1-ash.patch
 	busybox-1.22.1-date.patch
+	busybox-1.22.1-iplink.patch
+	busybox-1.22.1-nc.patch
 
 	0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 	0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
@@ -117,13 +119,15 @@ c5a8dbc8696db6da9c4624b0e11d8fba  bb-app-location.patch
 8c42c9ef0f0419c314c86bcaf7796106  loginutils-sha512.patch
 a2dad16b8d7d29ea8120b6d27cf98529  busybox-1.22.1-ash.patch
 bc381f9ceb3824141c968f5bc4353943  busybox-1.22.1-date.patch
+24686ec2750a8703feb57fc9c6aaed1d  busybox-1.22.1-iplink.patch
+69eecaae5f812d08655dfdf34b60503f  busybox-1.22.1-nc.patch
 04eeda8c49d4688e6dec02451f8b6aae  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 e1c183cbe1ca18a0fa0d9597314076c9  0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
 b15c67be5ccb3e523f540d8e218d5c85  0001-ifupdown-support-link-address-family.patch
 d372d376820957fd5f2aee158af9867e  0001-sendmail-make-f-optional-document-its-default-value.patch
 9d83db6173fe5b0fb8ee6ce741d5bb18  0002-sendmail-use-FQDN-in-default-envelope-sender.patch
 239dbe5dae5d36bbf73548b2749a22b1  0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch
-305337cd6f27dec11f318f438195a2cc  busyboxconfig
+24d2e29a35e6260a77c2737ab79f6486  busyboxconfig
 befaac2c59c380e36a452b3f1c1d4a3a  glibc.patch"
 sha256sums="ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b  busybox-1.22.1.tar.bz2
 81957f1fe0c386120dad1c8174ccc1fcfeed98c14d229db7d164d4fb4c938b3d  bbsuid.c
@@ -134,13 +138,15 @@ a31ce8bcb8b81b20e80ffa407600a530d085806c6471f4e4249fcb3a491b79ef  busybox-uname-
 57674b20158c0b266ed028b0c65299f9cbcad7d33d19c9fcc403d3967daba493  loginutils-sha512.patch
 9917257771ab715480427a6b744785b035d381e7ec0de381faf945bc7abadb97  busybox-1.22.1-ash.patch
 8502dd7454e948a56fcd8201f4fe9d629d2844b9df2bacff7ee0bb09398d12e8  busybox-1.22.1-date.patch
+186b41734e43ee117cb367055ce6a4d5b3aac671c09d71f2a6347793874d653b  busybox-1.22.1-iplink.patch
+0d2f9ba2e9e5db813fe9feb6fc84052ac85403ce2debefb8b1281a05aadec052  busybox-1.22.1-nc.patch
 2e9d56335ca39e944b9abd9ecc91d0e47a3fe3434f8b7ec3f526bc8fa0895ada  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 53563c6dc4db13004d0b37f7bf1748e861b5a5c4244c1d34f102c23b689420c5  0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
 9a41b920dd7ee4746866f9dd4ae42899198cd9b10bfa433f2f5ead8083957da2  0001-ifupdown-support-link-address-family.patch
 422ce68917dadf1a49085df2a00ffab670e2d0866dcdb7209ee49318ad195fca  0001-sendmail-make-f-optional-document-its-default-value.patch
 7c88ef1d837ec8efb7c21e5b1b16e4ac3060ccde7ad5f698e9e6ef630d412593  0002-sendmail-use-FQDN-in-default-envelope-sender.patch
 ac2cd5fed91bfaec22ed1f2766396d0feb29b9b96f20b2c12d5d8ac8769afae9  0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch
-e3877200295a541c88c977cf510b756c1ab22bf7cad8ff69bcf277ea1ec9fe2f  busyboxconfig
+998220ffadc9ae4307082498df92503ba9a2a2157d50ee5755da268eda29caf5  busyboxconfig
 c604ef791c31d35a8c5ee4558d21428a46f37a6d762c4a7e29864f4037fc44a0  glibc.patch"
 sha512sums="3e99fe373d638f714c3a61e1b02493d85ca532f472df038f7557db518ded38347072882ed568852941be7aac46fc34007257b4287375335ff5a09b60b295ce80  busybox-1.22.1.tar.bz2
 16b3dd6a8b76b062d51458351fcb44f84b49eb4bf898584c933df90fb2cb3966f9547865a4d7447589bb20b7c203beb04ff7512f76f85d29138d2cff4eb9ee81  bbsuid.c
@@ -151,11 +157,13 @@ eb7cce973bfd53ce3350713437b9e2751becfb8dfb10b14f27c4f812297c403b90f80dc2906179d4
 69af4800fcf765b4ae029daced7ff171b6b04d810c94a987c7ba848e275a27b77b18b38df1b85f4a12c4a47ed42f62e0768260eb1198e2aff1c3cea898b85c61  loginutils-sha512.patch
 000bbc9f1b87b676fab5d86c6f535008f2e99e830af9a48354d669b457998044c1d7ac74090f1d2ae56c14eecf88ae9a15eba61c5347f5a9124b518d0f278051  busybox-1.22.1-ash.patch
 0836ef682e24fc0e6d660d0d835200d5f4cd863691a6b58d071e40d001923664389f61670037140c2f95deb2080a93c989037308c761ac9304165d83cbfd3d34  busybox-1.22.1-date.patch
+f213d11c842841a5b7a6c8b1ffb38719eb038cde220b06f8b5419e63998e21629b0e3f481ad7549d67a764e113abe524d8a7fa0fd9286b8b355a1f20211fd889  busybox-1.22.1-iplink.patch
+9988abf5936f8b8d952627999630c40cbfb4f6f1b91030a2692bbaa7b7e8516758a1ce0959bb5122c6911cd547ee04fce29a0c60c91ccf25e82f59ca52ac1e8f  busybox-1.22.1-nc.patch
 f2ed7bf994766a20ceecb28bea8c66307b6b66cdd7099408b1f29a529786ce07e55824b21256321708663e00d6fe9428480b0d3e121b67d6ebd8a8a87b1486d1  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 b1a1cc2ada657a3d3364c8c96853575d73784e769cd8768c170c27a3e59abd2beace75dff6d5047c4391725e961d93149f9c3f45ed75fb1c582bf18b818282c9  0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
 2dcda497ba3b7c0a7dc9d85e08efa71e51c57e84967fa1a5f06d48f29c9ee9f14a1931c1c2854e9632a5db785c8e72df10bdfb0735a9ecad7a8d390fff74abd1  0001-ifupdown-support-link-address-family.patch
 7fde27b1742f641ad1da376d5cf7a96e1f60fef70fb9d382ca47b062df76d1c35d7a7f08cba5350484f818383eb897c772d5469fd515e648023d0a85d0ed640e  0001-sendmail-make-f-optional-document-its-default-value.patch
 d466676cd2779ff33f288bb073aa2baa4f3606cf8b96ec514e624a7acb46442a2839ef18c47e19cc18a8234a485de39596773b44e4be2eff39617d7cf677dd38  0002-sendmail-use-FQDN-in-default-envelope-sender.patch
 6781b10ca078296b243373d2c3f2bca2507a9df18a6b06d051e9ce84ed31a238aef3b2bb085daf12b145550be68c07c854272bd78a6f77da9197779b9c7cd9e9  0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch
-24f0387ad1de1db4a1919303d0605a708b0d2d1a108776397cd2bc50864a3503c5e4454aa3fde89759c7898cb632ffc92eb644ba67cfe59c6918f7c0e87eaacf  busyboxconfig
+8dee6f044f54e6d355abd28aded74b4f6cd68e091936d13d86c0fece5cc124f8ffe71e534c61e5ec01c363e144f7c22c5b99642e48d0e2ff46ec00d60929aa97  busyboxconfig
 1d2739379dab1deb3eae7cffd4845300eb7d30f7343b4a1209b21a5680860d55080ad45fdefe098b249ce3040c01951fa7f0a79cd447b2d7b260eb000099d9dc  glibc.patch"
diff --git a/main/busybox/busybox-1.22.1-iplink.patch b/main/busybox/busybox-1.22.1-iplink.patch
new file mode 100644
index 0000000000..dbd76c5749
--- /dev/null
+++ b/main/busybox/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 */
diff --git a/main/busybox/busybox-1.22.1-nc.patch b/main/busybox/busybox-1.22.1-nc.patch
new file mode 100644
index 0000000000..1ddb4834bd
--- /dev/null
+++ b/main/busybox/busybox-1.22.1-nc.patch
@@ -0,0 +1,15 @@
+--- busybox-1.22.1/networking/nc_bloaty.c
++++ busybox-1.22.1-nc/networking/nc_bloaty.c
+@@ -175,9 +175,9 @@ enum {
+ 	OPT_w = (1 << 5),
+ 	OPT_l = (1 << 6) * ENABLE_NC_SERVER,
+ 	OPT_k = (1 << 7) * ENABLE_NC_SERVER,
+-	OPT_i = (1 << (7+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+-	OPT_o = (1 << (8+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+-	OPT_z = (1 << (9+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
++	OPT_i = (1 << (6+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
++	OPT_o = (1 << (7+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
++	OPT_z = (1 << (8+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+ };
+ 
+ #define o_nflag   (option_mask32 & OPT_n)
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index 7162f81f96..85159ec381 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -25,9 +25,9 @@ CONFIG_FEATURE_VERBOSE_USAGE=y
 CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_FEATURE_INSTALLER=y
 # CONFIG_INSTALL_NO_USR is not set
-# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_LOCALE_SUPPORT=y
 CONFIG_UNICODE_SUPPORT=y
-# CONFIG_UNICODE_USING_LOCALE is not set
+CONFIG_UNICODE_USING_LOCALE=y
 CONFIG_FEATURE_CHECK_UNICODE_IN_ENV=y
 CONFIG_SUBST_WCHAR=63
 CONFIG_LAST_SUPPORTED_WCHAR=767
@@ -35,7 +35,7 @@ CONFIG_UNICODE_COMBINING_WCHARS=y
 CONFIG_UNICODE_WIDE_WCHARS=y
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
-# CONFIG_UNICODE_PRESERVE_BROKEN is not set
+CONFIG_UNICODE_PRESERVE_BROKEN=y
 CONFIG_LONG_OPTS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set