aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/busybox/patches/000-busybox-1.25.0-gzip.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2016-10-15 19:06:11 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2016-10-15 20:45:10 +0300
commit859d30d5211be15666ebf2f0dc780f89409fa28f (patch)
treee2223a8cfdd662dbb0b491709df647a1c9a097a2 /package/utils/busybox/patches/000-busybox-1.25.0-gzip.patch
parent83f7ec31f8f9641ef842212c45db61b72682debf (diff)
downloadupstream-859d30d5211be15666ebf2f0dc780f89409fa28f.tar.gz
upstream-859d30d5211be15666ebf2f0dc780f89409fa28f.tar.bz2
upstream-859d30d5211be15666ebf2f0dc780f89409fa28f.zip
busybox: update to version 1.25.1
Dropped upstream patches: 000-busybox-1.25.0-gzip.patch 000-busybox-1.25.0-ip.patch 000-busybox-1.25.0-ntpd.patch Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'package/utils/busybox/patches/000-busybox-1.25.0-gzip.patch')
-rw-r--r--package/utils/busybox/patches/000-busybox-1.25.0-gzip.patch30
1 files changed, 0 insertions, 30 deletions
diff --git a/package/utils/busybox/patches/000-busybox-1.25.0-gzip.patch b/package/utils/busybox/patches/000-busybox-1.25.0-gzip.patch
deleted file mode 100644
index 7110f8d2c5..0000000000
--- a/package/utils/busybox/patches/000-busybox-1.25.0-gzip.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-gzip: fix compression level bug. Closes 9131
-fix broken logic to get the gzip_level_config value from options -1 to
--9.
-
-This fixes an off-by-one bug that caused gzip -9 output bigger files
-than the other compression levels.
-
-It fixes so that compression level 1 to 3 are actually mapped to level 4
-as comments say.
-
-It also fixes that levels -4 to -9 is mapped to correct level and avoids
-out-of-bounds access.
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-
---- a/archival/gzip.c
-+++ b/archival/gzip.c
-@@ -2220,10 +2220,7 @@ int gzip_main(int argc UNUSED_PARAM, cha
- opt >>= ENABLE_GUNZIP ? 7 : 5; /* drop cfv[dt]qn bits */
- if (opt == 0)
- opt = 1 << 6; /* default: 6 */
-- /* Map 1..3 to 4 */
-- if (opt & 0x7)
-- opt |= 1 << 4;
-- opt = ffs(opt >> 3);
-+ opt = ffs(opt >> 4); /* Maps -1..-4 to [0], -5 to [1] ... -9 to [5] */
- max_chain_length = 1 << gzip_level_config[opt].chain_shift;
- good_match = gzip_level_config[opt].good;
- max_lazy_match = gzip_level_config[opt].lazy2 * 2;