aboutsummaryrefslogtreecommitdiffstats
path: root/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2018-08-04 00:11:42 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2018-09-27 10:29:07 +0000
commitbb3bc00f304cb4f0611d45555d124221d365bdce (patch)
tree1f96878a551b23276542247f90cd195fc4754643 /main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
parent4ecb921f61d14dab2ac6ed518325df376138aa9b (diff)
downloadaports-bb3bc00f304cb4f0611d45555d124221d365bdce.tar.gz
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/0012-udhcpc-Don-t-background-if-n-is-given.patch')
-rw-r--r--main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch11
1 files changed, 4 insertions, 7 deletions
diff --git a/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch b/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
index 50719b0035..ba289a230b 100644
--- a/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
+++ b/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
@@ -1,7 +1,7 @@
-From 7f3d0620051c30e2047593092aa054565756b57f Mon Sep 17 00:00:00 2001
+From f945fb1489f7d285c7f17d64fbe259637d3ef790 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 6 Jul 2017 13:39:15 +0200
-Subject: [PATCH 12/16] udhcpc: Don't background if -n is given
+Subject: [PATCH] udhcpc: Don't background if -n is given
we need add -b to our udhcpc options to prevent boot forever if there are no
dhcp server. We also need a way for users to disable this behavior by making
@@ -11,10 +11,10 @@ it possible to set -n option at runtime.
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
-index cc1d22c8e..10b846b0a 100644
+index 0b14b0332..623b87fbb 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
-@@ -1479,19 +1479,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
+@@ -1469,19 +1469,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
}
leasefail:
udhcp_run_script(NULL, "leasefail");
@@ -40,6 +40,3 @@ index cc1d22c8e..10b846b0a 100644
/* wait before trying again */
timeout = tryagain_timeout;
packet_num = 0;
---
-2.16.2
-