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/0005-udhcpc-set-default-discover-retries-to-5.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/0005-udhcpc-set-default-discover-retries-to-5.patch')
| -rw-r--r-- | main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch b/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch index 181acdb9a8..303b5cd860 100644 --- a/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch +++ b/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch @@ -1,7 +1,7 @@ -From b67940090709f3bbd868557dd4d5317cb807250d Mon Sep 17 00:00:00 2001 +From ed9d54e8920e6f90ddda8519c761217685c07044 Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Thu, 4 Aug 2016 11:08:35 +0200 -Subject: [PATCH 05/16] udhcpc: set default discover retries to 5 +Subject: [PATCH] udhcpc: set default discover retries to 5 Some slower nics needs more attempts to get a lease --- @@ -9,10 +9,10 @@ Some slower nics needs more attempts to get a lease 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c -index 55f21c187..cc1d22c8e 100644 +index c2805a009..0b14b0332 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c -@@ -1203,7 +1203,7 @@ static void client_background(void) +@@ -1197,7 +1197,7 @@ static void client_background(void) //usage: "\n -p FILE Create pidfile" //usage: "\n -B Request broadcast replies" //usage: "\n -t N Send up to N discover packets (default 3)" @@ -21,7 +21,7 @@ index 55f21c187..cc1d22c8e 100644 //usage: "\n -A SEC Wait if lease is not obtained (default 20)" //usage: "\n -n Exit if lease is not obtained" //usage: "\n -q Exit after obtaining lease" -@@ -1247,7 +1247,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) +@@ -1242,7 +1242,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) llist_t *list_x = NULL; int tryagain_timeout = 20; int discover_timeout = 3; @@ -30,6 +30,3 @@ index 55f21c187..cc1d22c8e 100644 uint32_t server_addr = server_addr; /* for compiler */ uint32_t requested_ip = 0; uint32_t xid = xid; /* for compiler */ --- -2.16.2 - |