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/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.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/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch')
| -rw-r--r-- | main/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/main/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch b/main/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch index 72df8ecf9c..fd2503e7b9 100644 --- a/main/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch +++ b/main/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch @@ -1,14 +1,14 @@ -From bce882404ab41d32d5d9def274e49264717135b2 Mon Sep 17 00:00:00 2001 +From 2e673aac06d661038001286fd389d1b45c511c66 Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Tue, 28 Nov 2017 13:23:17 +0100 -Subject: [PATCH 02/16] fsck: resolve LABEL=.../UUID=... spec to device +Subject: [PATCH] fsck: resolve LABEL=.../UUID=... spec to device --- e2fsprogs/fsck.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c -index 1c285bb92..5af38c0aa 100644 +index f5aa3dbe4..e2edc9747 100644 --- a/e2fsprogs/fsck.c +++ b/e2fsprogs/fsck.c @@ -60,6 +60,7 @@ @@ -19,7 +19,7 @@ index 1c285bb92..5af38c0aa 100644 #include "common_bufsiz.h" /* "progress indicator" code is somewhat buggy and ext[23] specific. -@@ -523,12 +524,13 @@ static int wait_many(int flags) +@@ -524,12 +525,13 @@ static int wait_many(int flags) * Execute a particular fsck program, and link it into the list of * child processes we are waiting for. */ @@ -34,7 +34,7 @@ index 1c285bb92..5af38c0aa 100644 G.args[0] = xasprintf("fsck.%s", type); -@@ -543,7 +545,8 @@ static void execute(const char *type, const char *device, +@@ -544,7 +546,8 @@ static void execute(const char *type, const char *device, } #endif @@ -44,7 +44,7 @@ index 1c285bb92..5af38c0aa 100644 /* G.args[G.num_args - 1] = NULL; - already is */ if (G.verbose || G.noexecute) { -@@ -972,9 +975,6 @@ int fsck_main(int argc UNUSED_PARAM, char **argv) +@@ -973,9 +976,6 @@ int fsck_main(int argc UNUSED_PARAM, char **argv) /* "/dev/blk" or "/path" or "UUID=xxx" or "LABEL=xxx" */ if ((arg[0] == '/' && !opts_for_fsck) || strchr(arg, '=')) { @@ -54,6 +54,3 @@ index 1c285bb92..5af38c0aa 100644 devices = xrealloc_vector(devices, 2, num_devices); devices[num_devices++] = arg; continue; --- -2.16.2 - |