diff options
| author | Andy Postnikov <apostnikov@gmail.com> | 2019-07-04 19:02:57 +0300 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-07-04 19:46:49 +0000 |
| commit | 3a29380de54e41f23c2c083c6e7f11ea9c7ed845 (patch) | |
| tree | 948018ab756bf08f6ac7efdd5bd63a8af1995708 /main/bzip2 | |
| parent | 9cc4e3e4dec19c3a02d6c4a7afd87f4e60c35390 (diff) | |
| download | aports-3a29380de54e41f23c2c083c6e7f11ea9c7ed845.tar.bz2 aports-3a29380de54e41f23c2c083c6e7f11ea9c7ed845.tar.xz | |
main/bzip2: upgrade to 1.0.7
Diffstat (limited to 'main/bzip2')
| -rw-r--r-- | main/bzip2/APKBUILD | 16 | ||||
| -rw-r--r-- | main/bzip2/CVE-2016-3189.patch | 12 | ||||
| -rw-r--r-- | main/bzip2/CVE-2019-12900.patch | 11 | ||||
| -rw-r--r-- | main/bzip2/bzip2-1.0.6-saneso.patch | 8 |
4 files changed, 10 insertions, 37 deletions
diff --git a/main/bzip2/APKBUILD b/main/bzip2/APKBUILD index d91dd490ea..ffacb3c6bb 100644 --- a/main/bzip2/APKBUILD +++ b/main/bzip2/APKBUILD @@ -1,22 +1,20 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bzip2 -pkgver=1.0.6 -pkgrel=7 +pkgver=1.0.7 +pkgrel=0 pkgdesc="A high-quality data compression program" url="http://sources.redhat.com/bzip2" arch="all" license="BSD" depends="" subpackages="$pkgname-dev $pkgname-doc libbz2" -source="https://downloads.sourceforge.net/bzip2/bzip2-$pkgver.tar.gz +source="https://sourceware.org/pub/bzip2/bzip2-$pkgver.tar.gz bzip2-1.0.4-makefile-CFLAGS.patch bzip2-1.0.6-saneso.patch bzip2-1.0.4-man-links.patch bzip2-1.0.2-progress.patch bzip2-1.0.3-no-test.patch bzip2-1.0.4-POSIX-shell.patch - CVE-2016-3189.patch - CVE-2019-12900.patch " # secfixes: @@ -67,12 +65,10 @@ libbz2() { mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 bzip2-1.0.6.tar.gz +sha512sums="e0e19b493e6b1f7beeb0eeb0be8a6358c24202173f28acb1e902a768835be9e24f2cb966452fbc90fc3e4e692532ce0c7e86d06aef2d52c0d2a9ac16e12ec8c8 bzip2-1.0.7.tar.gz 58cc37430555520b6e35db2740e699cf37eacdd82989c21a222a593e36288710a0defb003662d4238235c12b3764bfc89cd646e6be9d0a08d54bd2c9baa6ad15 bzip2-1.0.4-makefile-CFLAGS.patch -8a7528b5b931bb72f637c6940bc811d54fb816fd5bb453af56d9b4a87091004eb5e191ba799d972794b24c56cf8134344a618b58946d3f1d985c508f88190845 bzip2-1.0.6-saneso.patch +54da5648e33e0489c34a06efd444059558e2d3002c5c9bec65ea6443de18ad5b2c43c23b3fc1a04e385e20c23db074dc13633a2479489096fb9666e78ef102d2 bzip2-1.0.6-saneso.patch 2d9a306bc0f552a58916ebc702d32350a225103c487e070d2082121a54e07f1813d3228f43293cc80a4bee62053fd597294c99a1751b1685cd678f4e5c6a2fe7 bzip2-1.0.4-man-links.patch b6810c73428f17245e0d7c2decd00c88986cd8ad1cfe4982defe34bdab808d53870ed92cb513b2d00c15301747ceb6ca958fb0e0458d0663b7d8f7c524f7ba4e bzip2-1.0.2-progress.patch aefcafaaadc7f19b20fe023e0bd161127b9f32e0cd364621f6e5c03e95fb976e7e69e354ec46673a554392519532a3bfe56d982a5cde608c10e0b18c3847a030 bzip2-1.0.3-no-test.patch -64ab461bf739c29615383750e7f260abb2d49df7eb23916940d512bd61fd9a37aaade4d8f6f94280c95fc781b8f92587ad4f3dda51e87dec7a92a7a6f8d8ae86 bzip2-1.0.4-POSIX-shell.patch -cef6f448b661a775cc433f9636730e89c1285d07075536217657056be56e0a11e96f41f7c14f6ec59e235464b9ddd649a71fb8de1c60eda2fd5c2cdfbb6a8fdc CVE-2016-3189.patch -924992e381f701b43ac2e8bdeee46be0e592c8459acb55663c4a93127f6d5195271ede6aeedc66d09388f5c6e1c0caa792c6e19a38b469ee0294f0de8d273070 CVE-2019-12900.patch" +64ab461bf739c29615383750e7f260abb2d49df7eb23916940d512bd61fd9a37aaade4d8f6f94280c95fc781b8f92587ad4f3dda51e87dec7a92a7a6f8d8ae86 bzip2-1.0.4-POSIX-shell.patch" diff --git a/main/bzip2/CVE-2016-3189.patch b/main/bzip2/CVE-2016-3189.patch deleted file mode 100644 index 6622670c91..0000000000 --- a/main/bzip2/CVE-2016-3189.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/bzip2recover.c b/bzip2recover.c -index f9de049..d159c92 100644 ---- a/bzip2recover.c -+++ b/bzip2recover.c -@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv ) - bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); - bsPutUInt32 ( bsWr, blockCRC ); - bsClose ( bsWr ); -+ outFile = NULL; - } - if (wrBlock >= rbCtr) break; - wrBlock++; diff --git a/main/bzip2/CVE-2019-12900.patch b/main/bzip2/CVE-2019-12900.patch deleted file mode 100644 index a213baac77..0000000000 --- a/main/bzip2/CVE-2019-12900.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/decompress.c -+++ b/decompress.c -@@ -287,7 +287,7 @@ - GET_BITS(BZ_X_SELECTOR_1, nGroups, 3); - if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); - GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); -- if (nSelectors < 1) RETURN(BZ_DATA_ERROR); -+ if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR); - for (i = 0; i < nSelectors; i++) { - j = 0; - while (True) { diff --git a/main/bzip2/bzip2-1.0.6-saneso.patch b/main/bzip2/bzip2-1.0.6-saneso.patch index 1968a63bf1..dc59f30147 100644 --- a/main/bzip2/bzip2-1.0.6-saneso.patch +++ b/main/bzip2/bzip2-1.0.6-saneso.patch @@ -4,10 +4,10 @@ bzlib.o all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) -- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 -+ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) -+ $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS) +- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7 ++ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.7 $(OBJS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7 rm -f libbz2.so.1.0 ln -s libbz2.so.1.0.6 libbz2.so.1.0 |