diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2013-12-29 00:26:05 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2013-12-29 00:26:05 +0200 |
| commit | 721328e3318d81a16461a0c3fb7ce74b74812fbc (patch) | |
| tree | d44280ef38c236390c6d98f9da80b0cb7d463a8b | |
| parent | bbb5054445ab75549c7d6fe26d13e5df1a1ae4ab (diff) | |
| download | aports-721328e3318d81a16461a0c3fb7ce74b74812fbc.tar.bz2 aports-721328e3318d81a16461a0c3fb7ce74b74812fbc.tar.xz | |
main/busybox: ifupdown: support 'link' address family
| -rw-r--r-- | main/busybox/0001-ifupdown-support-link-address-family.patch | 53 | ||||
| -rw-r--r-- | main/busybox/APKBUILD | 6 |
2 files changed, 58 insertions, 1 deletions
diff --git a/main/busybox/0001-ifupdown-support-link-address-family.patch b/main/busybox/0001-ifupdown-support-link-address-family.patch new file mode 100644 index 0000000000..c9102c865f --- /dev/null +++ b/main/busybox/0001-ifupdown-support-link-address-family.patch @@ -0,0 +1,53 @@ +From 93f75fe7ab255147e67517dc9c9bd19e3faa6568 Mon Sep 17 00:00:00 2001 +From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> +Date: Sat, 21 Dec 2013 17:32:57 +0200 +Subject: [PATCH] ifupdown: support 'link' address family + +Does not configure anything. L2 configuration hook scripts should do +their job on receiving ADDRFAM=link. Configuration will be done only +once, irrespective of L3 protocols used. + +Using the 'link' family in the interfaces file conforms to the Debian +implementation: + +http://sources.debian.net/src/ifupdown/0.7.47.1/link.defn + +Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> +--- + networking/ifupdown.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/networking/ifupdown.c b/networking/ifupdown.c +index 0f0857c..91a786d 100644 +--- a/networking/ifupdown.c ++++ b/networking/ifupdown.c +@@ -685,6 +685,18 @@ static const struct address_family_t addr_inet = { + + #endif /* FEATURE_IFUPDOWN_IPV4 */ + ++static int FAST_FUNC link_up_down(struct interface_defn_t *ifd UNUSED_PARAM, execfn *exec UNUSED_PARAM) ++{ ++ return 1; ++} ++ ++static const struct method_t link_methods[] = { ++ {"none", link_up_down, link_up_down} ++}; ++ ++static const struct address_family_t addr_link = { ++ "link", ARRAY_SIZE(link_methods), link_methods ++}; + + /* Returns pointer to the next word, or NULL. + * In 1st case, advances *buf to the word after this one. +@@ -831,6 +843,7 @@ static struct interfaces_file_t *read_interfaces(const char *filename, struct in + #if ENABLE_FEATURE_IFUPDOWN_IPV6 + &addr_inet6, + #endif ++ &addr_link, + NULL + }; + char *iface_name; +-- +1.8.1.4 + diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index 6efe1762c5..5dac1fa14b 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.21.1 -pkgrel=1 +pkgrel=2 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" @@ -23,6 +23,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch 0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch + 0001-ifupdown-support-link-address-family.patch busyboxconfig glibc.patch" @@ -112,6 +113,7 @@ f718d6d53b6cd1e012edcee32686a846 busybox-musl-fixes.patch 78f2bcb83779740f1217f71e87cf3077 sed-performance.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 b4e7c47c05c1fdaee0a418731e1d1135 busyboxconfig befaac2c59c380e36a452b3f1c1d4a3a glibc.patch" sha256sums="cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303 busybox-1.21.1.tar.bz2 @@ -125,6 +127,7 @@ a31ce8bcb8b81b20e80ffa407600a530d085806c6471f4e4249fcb3a491b79ef busybox-uname- e1c98f71b0888af6082c042b0f79c550896514038c064f97a4fe237f32af00d6 sed-performance.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 7774d71ddab017c4e436bc575637bd54e3936a7e82574756afced8e1e0077c57 busyboxconfig c604ef791c31d35a8c5ee4558d21428a46f37a6d762c4a7e29864f4037fc44a0 glibc.patch" sha512sums="b1dd626e1c111214ebd9b933ce2465c943fd8a0a515b6962a31f3a76276ff7992c21b7f96eeb9baeb861a5e734689054e6df5dd6414c753c37084e2d705810e1 busybox-1.21.1.tar.bz2 @@ -138,5 +141,6 @@ eed527c8cab79347ed786929c36da76028bf9592a4f047706c3ce14bc96787fc7e685441eca14006 b0b6dde2183a8b95ad0213c2157e6dadcaf0c95c6f6d035a5dfdbf08b5327b32d033ddae911d8aada3bf08a6d5aaea3f27dddbf55384490e8b0350471334095a sed-performance.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 373b23c3a0db5353dc19bc1f758ec1ebaec82a05f99ac1ab839b95c94e6214f1c252b6b39fcd56cd5f0e0b3bd6c32bd9dde72a4afa5be49c49b6bc9190a8776f busyboxconfig 1d2739379dab1deb3eae7cffd4845300eb7d30f7343b4a1209b21a5680860d55080ad45fdefe098b249ce3040c01951fa7f0a79cd447b2d7b260eb000099d9dc glibc.patch" |