main/busybox: backport ipv6 support for ifupdown

fixes #423
(cherry picked from commit 3b276856d373634dbdfbcaa6a80c441cc51f1523)

2 files changed, 32 insertions, 1 deletions

diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 20825181bc..57ffa24c49 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.17.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 license="GPL-2"
@@ -13,6 +13,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
         http://busybox.net/downloads/fixes-1.17.3/busybox-1.17.3-sort.patch
         http://busybox.net/downloads/fixes-1.17.3/busybox-1.17.3-dnsd.patch
         http://busybox.net/downloads/fixes-1.17.3/busybox-1.17.3-unicode.patch
+        ifupdown-ipv6.patch
         $pkgname-1.11.1-bb.patch
         busyboxconfig"
 
@@ -74,5 +75,6 @@ md5sums="a2ce1a951571da8c6e0eaf75b1acef60  busybox-1.17.3.tar.bz2
 6d9c722fdbefda5ed408da63dc6bbefe  busybox-1.17.3-sort.patch
 05e661d04ee0e4e2b46f50debd1a50d6  busybox-1.17.3-dnsd.patch
 c54cde6523fb24fa6fd5b1850c4daa2a  busybox-1.17.3-unicode.patch
+08af7b8b4e41f86a34a16270a8691e31  ifupdown-ipv6.patch
 4c0f3b486eaa0674961b7ddcd0c60a9b  busybox-1.11.1-bb.patch
 403e0b9fe99a7a18c5b9ae91283a5f9a  busyboxconfig"
diff --git a/main/busybox/ifupdown-ipv6.patch b/main/busybox/ifupdown-ipv6.patch
new file mode 100644
index 0000000000..6d46034aae
--- /dev/null
+++ b/main/busybox/ifupdown-ipv6.patch
@@ -0,0 +1,29 @@
+--- busybox-1.17.1-updated/networking/ifupdown.c
++++ busybox-1.17.1/networking/ifupdown.c
+@@ -353,6 +353,11 @@
+ #endif
+ }
+ 
++static int FAST_FUNC manual_up_down6(struct interface_defn_t *ifd UNUSED_PARAM, execfn *exec UNUSED_PARAM)
++{
++       return 1;
++}
++
+ static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec)
+ {
+        int result;
+@@ -398,10 +403,11 @@
+ 
+ static const struct method_t methods6[] = {
+ #if ENABLE_FEATURE_IFUPDOWN_IP
+-       { "v4tunnel", v4tunnel_up, v4tunnel_down, },
++       { "v4tunnel" , v4tunnel_up     , v4tunnel_down   , },
+ #endif
+-       { "static", static_up6, static_down6, },
+-       { "loopback", loopback_up6, loopback_down6, },
++       { "static"   , static_up6      , static_down6    , },
++       { "manual"   , manual_up_down6 , manual_up_down6 , },
++       { "loopback" , loopback_up6    , loopback_down6  , },
+ };
+ 
+ static const struct address_family_t addr_inet6 = {