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/0013-testsuite-fix-cpio-tests.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/0013-testsuite-fix-cpio-tests.patch')
-rw-r--r-- | main/busybox/0013-testsuite-fix-cpio-tests.patch | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/main/busybox/0013-testsuite-fix-cpio-tests.patch b/main/busybox/0013-testsuite-fix-cpio-tests.patch index a9ba0c4d0d..3b9c79e5dd 100644 --- a/main/busybox/0013-testsuite-fix-cpio-tests.patch +++ b/main/busybox/0013-testsuite-fix-cpio-tests.patch @@ -1,7 +1,7 @@ -From 495a53387a12bffe393dcd0d6de2bc64374d38d2 Mon Sep 17 00:00:00 2001 +From 69b954f128d397bbe44deb044313810c41cdcbbb Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Thu, 6 Jul 2017 13:41:32 +0200 -Subject: [PATCH 13/16] testsuite: fix cpio tests +Subject: [PATCH] testsuite: fix cpio tests The cpio tests don't search for the right output line correctly, using a hardcoded tail offset. Instead, grep for the file entry @@ -77,6 +77,3 @@ index 39205242c..1d48e90be 100755 1 abc 123 --- -2.16.2 - |