diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2018-08-04 00:11:42 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-09-27 10:29:07 +0000 |
| commit | bb3bc00f304cb4f0611d45555d124221d365bdce (patch) | |
| tree | 1f96878a551b23276542247f90cd195fc4754643 /main/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch | |
| parent | 4ecb921f61d14dab2ac6ed518325df376138aa9b (diff) | |
| download | aports-bb3bc00f304cb4f0611d45555d124221d365bdce.tar.bz2 aports-bb3bc00f304cb4f0611d45555d124221d365bdce.tar.xz | |
main/busybox: upgrade to 1.29.3
* Remove all patches already applied upstream
* 0001-ash-add-support-for-command_not_found_handle-hook-fu.patch
* 0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch
* 0001-wget-emit-a-message-that-certificate-verification-is.patch
* 0015-ash-introduce-a-config-option-to-search-current-dire.patch
* 0016-top-handle-much-larger-VSZ-values.patch
* 0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch
* Rename config option for command_not_found hook
* upstream patch adding this hook slightly differs from our
downstream patch in this regard
* Rebase some patches manually:
* external_ssl_client.patch
* 0006-ping-make-ping-work-without-root-privileges.patch
* 0007-fbsplash-support-image-and-bar-alignment-and-positio.patch
* Add support for `-e` to our ssl_client
* See https://git.busybox.net/busybox/commit/?id=403f2999f94937ba3f37db6d093832f636815bb9
* Update the configuration file
* Regenerate all patches using `git format-patch --no-numbered --no-signature`
to reduce the diff for future upgrades.
Diffstat (limited to 'main/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch')
| -rw-r--r-- | main/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/main/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch b/main/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch deleted file mode 100644 index bdf24b7838..0000000000 --- a/main/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 444a2f6be54186ae9ade1f2c3d4356cd62a720c5 Mon Sep 17 00:00:00 2001 -From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> -Date: Fri, 23 Mar 2018 14:56:52 +0200 -Subject: [PATCH] ifupdown: do not fail if interface disappears during ifdown - -Interface may not exist because it got deleted by an ifdown hook script -earlier. This may happen when a virtual interface, such as VLAN, has multiple -iface blocks defined. - -Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> ---- - networking/ifupdown.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/networking/ifupdown.c b/networking/ifupdown.c -index 534c9f0c7..35d13c5e1 100644 ---- a/networking/ifupdown.c -+++ b/networking/ifupdown.c -@@ -141,6 +141,7 @@ - #include "libbb.h" - #include "common_bufsiz.h" - /* After libbb.h, since it needs sys/types.h on some systems */ -+#include <net/if.h> - #include <sys/utsname.h> - #include <fnmatch.h> - -@@ -503,6 +504,7 @@ static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec) - - static int FAST_FUNC static_down6(struct interface_defn_t *ifd, execfn *exec) - { -+ if (!if_nametoindex(ifd->iface)) return 1; - # if ENABLE_FEATURE_IFUPDOWN_IP - return execute("ip link set %iface% down", ifd, exec); - # else -@@ -598,6 +600,7 @@ static int FAST_FUNC static_up(struct interface_defn_t *ifd, execfn *exec) - static int FAST_FUNC static_down(struct interface_defn_t *ifd, execfn *exec) - { - int result; -+ if (!if_nametoindex(ifd->iface)) return 2; - # if ENABLE_FEATURE_IFUPDOWN_IP - /* Optional "label LBL" is necessary if interface is an alias (eth0:0), - * otherwise "ip addr flush dev eth0:0" flushes all addresses on eth0. --- -2.14.3 - |