diff options
author | William Pitcock <nenolod@dereferenced.org> | 2017-10-19 16:21:45 +0000 |
---|---|---|
committer | William Pitcock <nenolod@dereferenced.org> | 2017-10-19 16:21:45 +0000 |
commit | 325510d175ed6d66c9caac4b2c5ef2850477bebf (patch) | |
tree | 6c8a188866f6d6fe23924893689ef61a403b11f8 /main/busybox | |
parent | b98ab969477896ed990992d6c0a2804ab5484252 (diff) | |
download | aports-325510d175ed6d66c9caac4b2c5ef2850477bebf.tar.bz2 aports-325510d175ed6d66c9caac4b2c5ef2850477bebf.tar.xz |
main/busybox: upgrade to 1.27.2
Diffstat (limited to 'main/busybox')
-rw-r--r-- | main/busybox/0001-unzip-fix-regression-on-big-endian-machines.patch | 31 | ||||
-rw-r--r-- | main/busybox/APKBUILD | 10 | ||||
-rw-r--r-- | main/busybox/busyboxconfig | 1 | ||||
-rw-r--r-- | main/busybox/busyboxconfig-extras | 1 |
4 files changed, 6 insertions, 37 deletions
diff --git a/main/busybox/0001-unzip-fix-regression-on-big-endian-machines.patch b/main/busybox/0001-unzip-fix-regression-on-big-endian-machines.patch deleted file mode 100644 index e0307430cf..0000000000 --- a/main/busybox/0001-unzip-fix-regression-on-big-endian-machines.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 32ba988add53a003cf086ac660809f2a33a55b02 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 25 Jul 2017 20:38:18 +0200 -Subject: [PATCH] unzip: fix regression on big-endian machines - -This fixes a regression which was introduced with commit 2a0867a5 -("unzip: optional support for bzip2 and lzma") and causes unzip to exit -with error when extracting archives: - - unzip: unsupported method 2048 - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - archival/unzip.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/archival/unzip.c b/archival/unzip.c -index bb39d954e..8ed9ae7d5 100644 ---- a/archival/unzip.c -+++ b/archival/unzip.c -@@ -114,6 +114,7 @@ typedef union { - - #define FIX_ENDIANNESS_ZIP(zip) \ - do { if (BB_BIG_ENDIAN) { \ -+ (zip).fmt.method = SWAP_LE16((zip).fmt.method ); \ - (zip).fmt.crc32 = SWAP_LE32((zip).fmt.crc32 ); \ - (zip).fmt.cmpsize = SWAP_LE32((zip).fmt.cmpsize ); \ - (zip).fmt.ucmpsize = SWAP_LE32((zip).fmt.ucmpsize ); \ --- -2.13.2 - diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index 63fc3369c6..3f005861d7 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Oliver Smith <ollieparanoid@bitmessage.ch> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox -pkgver=1.27.1 +pkgver=1.27.2 pkgrel=0 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net @@ -30,7 +30,6 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch 0010-udhcpc-Don-t-background-if-n-is-given.patch 0011-testsuite-fix-cpio-tests.patch - 0001-unzip-fix-regression-on-big-endian-machines.patch 0012-microcom-segfault.patch top-buffer-overflow.patch @@ -170,7 +169,7 @@ static() { "$subpkgdir"/bin/busybox.static } -sha512sums="f5ae32bc2dff535bb6ad17dc3a56f576e9078cd574a8fcff58ba601c36e668f26b66db8b361201441b72215bda79750a03353b0fff7bddb472d8e9a8b855236f busybox-1.27.1.tar.bz2 +sha512sums="d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c busybox-1.27.2.tar.bz2 1930775839354a63c30970f0d52d00cfd3a8f6b9f48d6de45ea7d2478d080bde7193c1c2cce026dc7337d9ecf0b65f5ff1dd4351c1eb195e6f0c0c5126f10511 0001-ash-exec-busybox.static.patch a756aa89c4602cd091df0052e2e3d7b45a359fbfe953b70aa3029e3eeb8e5d1772cbf1525bb62df6ce6547f1e5605617195ddae336e1ffe41f5c58d524af6ba6 0002-app-location-for-cpio-vi-and-lspci.patch fc17ce9b12726e3449518692bf0d4906c36f091534706b5b91c910866bd8cd50d8f7d4b449d54eeed24ee656012a6ef04612bf092874e4b83b0723f852fdce0e 0003-udhcpc-set-default-discover-retries-to-5.patch @@ -182,12 +181,11 @@ baac796f8aa96fbeab19f96eea7787ace5737b182f49e02f1b1e911d0a927ae14f3c334daad42418 d1c375184f806f7550bac5c82ab5471bdb8085d845172c973724b22af05ab3759b3ce982e088b4c45815ade56b9adfb7a677d0c180e077545ac7ec003c8aa7c4 0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch 9b5143d0be615b1604d82007628d59a62721f1e61a63cca7a4ffa5e60fa8da102bfc21fa20cc35c2f5a0a24bc8013598f8eff5888f9d0f3bcfa796343b5f5a91 0010-udhcpc-Don-t-background-if-n-is-given.patch f4e00eb13fda752df13f300a7ed9b1320ca9f573c4309247f292c8710464d7be8740148f42e4aff16312335eadabce5a629dce4af58334b9199faf2fd658e4f9 0011-testsuite-fix-cpio-tests.patch -daa6732a95a52a194d2031f2d5af5f658b9da3e8669fc2206000faaab7da56966a62646eed615fd1cbc5f07d42c03bf19ff183ef6f933b7daaeef1d388e21874 0001-unzip-fix-regression-on-big-endian-machines.patch a09a64b3bce8048c58a68dcd2dd9e63c911009c06195d6bb4e5aecfb5700e479c25b34635c60899127975fae32275ad51846ee75f840d612e00668ce9aba8322 0012-microcom-segfault.patch 524e858b52cb31fb8d24e8c7f18606fff349aeab6a14da9cca3902641f6127980daed73c53586c6e8b41eecda06cdb29c40ff1dde2dc82a318c2649680458921 top-buffer-overflow.patch a9b1403c844c51934637215307dd9e2adb9458921047acff0d86dcf229b6e0027f4b2c6cdaa25a58407aad9d098fb5685d58eb5ff8d2aa3de4912cdea21fe54c acpid.logrotate -857dece10267a065e0e8c16dd6190656f890a5aff774e96321715673dda23e75a8e61148e81d6286b7bdfe737a0b99104f9b04deeb4f392c72b63d8e3d00e556 busyboxconfig -341cd3e82a9152743aaf0e1a2969bef11b914aa0ee0ed584e74cd72bbb409e6b15207857046743822179909a0760f00c37f5618a660670e1a0e56f82abc9f470 busyboxconfig-extras +5e2d662cbcf71b1d3db40942197d80f6612b8ee1b52cf50db46a75c56a948556b2219ef9cd692afa3956c49ac2fe46a041c632ce664ae7001415d93c4abe2c5e busyboxconfig +46533a71c04d2b342a247c9ec7a01679f966c5c97ae45ccf0bb06074be45f3e8ca95db3c842b889aedb6e231d4efa3393ff069ac9eb6e39a43887b6ac4033561 busyboxconfig-extras e84087a453f8c9814951c9ad496cce19f8280b80a8ab6a1c8e21385f1facb17e987adc8d1d72c7cb463c04eb0cadd2bd6fb9b6f6c0067ddd21eeacf91ca42f32 bbsuid.c a1127c8a384294135e11500fde7ead33b73d24b11c21911b08447a4c4ef71d7a9965d6466f60f2da64e3b877213b0a3e924a5add3c5333ee3ecde8c2a91c5e02 dad.if-up 4e7c291a70e879b74c0fc07c54a73ef50537d8be68fee6b2d409425c07afd2d67f9b6afcd8c33a7971014913cc5de85e45079681c9e77200c6cc2f34acfba6d2 nologin.c" diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig index 5a8bf59d3e..04c7223e68 100644 --- a/main/busybox/busyboxconfig +++ b/main/busybox/busyboxconfig @@ -51,6 +51,7 @@ CONFIG_SYSROOT="" CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" +CONFIG_FEDORA_COMPAT=n # # Installation Options ("make install" behavior) diff --git a/main/busybox/busyboxconfig-extras b/main/busybox/busyboxconfig-extras index c19998bd9d..245e28fc74 100644 --- a/main/busybox/busyboxconfig-extras +++ b/main/busybox/busyboxconfig-extras @@ -51,6 +51,7 @@ CONFIG_SYSROOT="" CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" +CONFIG_FEDORA_COMPAT=n # # Installation Options ("make install" behavior) |