From 6957f5c65b02bba533954eabc0b62f5de36be206 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 10 Apr 2018 17:26:49 +0100 Subject: gentoo resync : 10.04.2018 --- app-arch/bzip2/files/bzip2-1.0.3-no-test.patch | 4 ++-- app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch | 4 ++-- app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch | 8 ++++---- app-arch/bzip2/files/bzip2-1.0.4-man-links.patch | 4 ++-- app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch | 4 ++-- app-arch/bzip2/files/bzip2-1.0.6-progress.patch | 8 ++++---- app-arch/bzip2/files/bzip2-1.0.6-saneso.patch | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'app-arch/bzip2/files') diff --git a/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch b/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch index 672c89dfbd20..9e554f79515f 100644 --- a/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch +++ b/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch @@ -1,5 +1,5 @@ ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -23,5 +23,5 @@ bzlib.o diff --git a/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch b/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch index b31cc061db6f..74f8df000b1a 100644 --- a/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch +++ b/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch @@ -3,8 +3,8 @@ with calls to sed so POSIX shells work http://bugs.gentoo.org/193365 ---- bzgrep -+++ bzgrep +--- a/bzgrep ++++ b/bzgrep @@ -63,10 +63,9 @@ bzip2 -cdfq "$i" | $grep $opt "$pat" r=$? diff --git a/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch index 5a95ed68b2d0..04bd0d9abda7 100644 --- a/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch +++ b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch @@ -1,5 +1,5 @@ ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -18,10 +18,9 @@ CC=gcc AR=ar @@ -12,8 +12,8 @@ # Where you want it installed when you do 'make install' PREFIX=/usr/local ---- Makefile-libbz2_so -+++ Makefile-libbz2_so +--- a/Makefile-libbz2_so ++++ b/Makefile-libbz2_so @@ -24,7 +24,7 @@ SHELL=/bin/sh CC=gcc diff --git a/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch b/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch index 308f5f9b3e89..deaa981adccb 100644 --- a/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch +++ b/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch @@ -1,7 +1,7 @@ http://bugs.gentoo.org/172986 ---- bzip2-1.0.4/Makefile -+++ bzip2-1.0.4/Makefile +--- a/Makefile ++++ b/Makefile @@ -85,4 +85,7 @@ cp -f bzip2.1 $(PREFIX)/share/man/man1 chmod a+r $(PREFIX)/share/man/man1/bzip2.1 diff --git a/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch b/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch index 1d0c3a6dd34f..b031c808fef3 100644 --- a/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch +++ b/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch @@ -6,8 +6,8 @@ Signed-off-by: Armin Kuster Index: bzip2-1.0.6/bzip2recover.c =================================================================== ---- bzip2-1.0.6.orig/bzip2recover.c -+++ bzip2-1.0.6/bzip2recover.c +--- 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 ); diff --git a/app-arch/bzip2/files/bzip2-1.0.6-progress.patch b/app-arch/bzip2/files/bzip2-1.0.6-progress.patch index 7691d63e27c8..8369597714b5 100644 --- a/app-arch/bzip2/files/bzip2-1.0.6-progress.patch +++ b/app-arch/bzip2/files/bzip2-1.0.6-progress.patch @@ -2,8 +2,8 @@ Ripped from Mandrake http://bugs.gentoo.org/82192 ---- bzip2-1.0.6/bzip2.1 -+++ bzip2-1.0.6/bzip2.1 +--- a/bzip2.1 ++++ b/bzip2.1 @@ -235,6 +235,10 @@ Suppress non-essential warning messages. Messages pertaining to I/O errors and other critical events will not be suppressed. @@ -15,8 +15,8 @@ http://bugs.gentoo.org/82192 .B \-v --verbose Verbose mode -- show the compression ratio for each file processed. Further \-v's increase the verbosity level, spewing out lots of ---- bzip2-1.0.6/bzip2.c -+++ bzip2-1.0.6/bzip2.c +--- a/bzip2.c ++++ b/bzip2.c @@ -145,6 +145,7 @@ #include #include diff --git a/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch index 9c4ddf05307b..52ea791ce34a 100644 --- a/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch +++ b/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch @@ -1,5 +1,5 @@ ---- Makefile-libbz2_so -+++ Makefile-libbz2_so +--- a/Makefile-libbz2_so ++++ b/Makefile-libbz2_so @@ -35,8 +35,8 @@ bzlib.o -- cgit v1.2.3