summaryrefslogtreecommitdiffhomepage
path: root/patches
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2019-10-13 16:16:48 +0000
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2019-10-13 16:16:48 +0000
commitd420de1b87a13bdf0f75a1c30c658a25977bd4de (patch)
tree08087aaddfdc28867abb1f8f3d25ac4bd7ef2beb /patches
parente108232e4e7fc332d5585266f20a8dba3f62ce9c (diff)
downloadmidipix_build-d420de1b87a13bdf0f75a1c30c658a25977bd4de.tar.bz2
midipix_build-d420de1b87a13bdf0f75a1c30c658a25977bd4de.tar.xz
vars/build.vars:bzip2: updated to v1.0.8 (via Redfoxmoon.)
patches/bzip2/CVE-2016-3189.patch: removes obsolete patch (via Redfoxmoon.) patches/bzip2/bzip2-1.0.4-POSIX-shell.patch: removes obsolete patch (via Redfoxmoon.) patches/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch: via Redfoxmoon. patches/bzip2/bzip2-1.0.4-man-links.patch: updated (via Redfoxmoon.) patches/bzip2/bzip2-1.0.6-saneso.patch: removes obsolete patch (via Redfoxmoon.) patches/bzip2/saneso.patch: via Redfoxmoon.
Diffstat (limited to 'patches')
-rw-r--r--patches/bzip2/CVE-2016-3189.patch12
-rw-r--r--patches/bzip2/bzip2-1.0.4-POSIX-shell.patch21
-rw-r--r--patches/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch25
-rw-r--r--patches/bzip2/bzip2-1.0.4-man-links.patch6
-rw-r--r--patches/bzip2/bzip2-1.0.6-saneso.patch13
-rw-r--r--patches/bzip2/saneso.patch23
6 files changed, 51 insertions, 49 deletions
diff --git a/patches/bzip2/CVE-2016-3189.patch b/patches/bzip2/CVE-2016-3189.patch
deleted file mode 100644
index 6622670c..00000000
--- a/patches/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/patches/bzip2/bzip2-1.0.4-POSIX-shell.patch b/patches/bzip2/bzip2-1.0.4-POSIX-shell.patch
deleted file mode 100644
index a5916eaf..00000000
--- a/patches/bzip2/bzip2-1.0.4-POSIX-shell.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-bzgrep uses !/bin/sh but then uses the bashism ${var//} so replace those
-with calls to sed so POSIX shells work
-
-http://bugs.gentoo.org/193365
-
---- ./bzgrep
-+++ ./bzgrep
-@@ -63,10 +63,9 @@
- bzip2 -cdfq "$i" | $grep $opt "$pat"
- r=$?
- else
-- j=${i//\\/\\\\}
-- j=${j//|/\\|}
-- j=${j//&/\\&}
-- j=`printf "%s" "$j" | tr '\n' ' '`
-+ # the backslashes here are doubled up as we have to escape each one for the
-+ # shell and then escape each one for the sed expression
-+ j=`printf "%s" "${i}" | sed -e 's:\\\\:\\\\\\\\:g' -e 's:[|]:\\\\|:g' -e 's:[&]:\\\\&:g' | tr '\n' ' '`
- bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
- r=$?
- fi
diff --git a/patches/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch b/patches/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
new file mode 100644
index 00000000..cf146188
--- /dev/null
+++ b/patches/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
@@ -0,0 +1,25 @@
+--- ./Makefile
++++ ./Makefile
+@@ -18,10 +18,9 @@
+ CC=gcc
+ AR=ar
+ RANLIB=ranlib
+-LDFLAGS=
+
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS+=-Wall -Winline $(BIGFILES) $(CPPFLAGS)
+
+ # Where you want it installed when you do 'make install'
+ PREFIX=/usr/local
+--- ./Makefile-libbz2_so
++++ ./Makefile-libbz2_so
+@@ -24,7 +24,7 @@
+ SHELL=/bin/sh
+ CC=gcc
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) $(CPPFLAGS)
+
+ OBJS= blocksort.o \
+ huffman.o \
diff --git a/patches/bzip2/bzip2-1.0.4-man-links.patch b/patches/bzip2/bzip2-1.0.4-man-links.patch
index db3978b5..2427d6a7 100644
--- a/patches/bzip2/bzip2-1.0.4-man-links.patch
+++ b/patches/bzip2/bzip2-1.0.4-man-links.patch
@@ -5,8 +5,8 @@ http://bugs.gentoo.org/172986
@@ -85,4 +85,7 @@
cp -f bzip2.1 $(PREFIX)/share/man/man1
chmod a+r $(PREFIX)/share/man/man1/bzip2.1
-+ ln -fs bzip2.1 $(PREFIX)/share/man/man1/bunzip2.1
-+ ln -fs bzip2.1 $(PREFIX)/share/man/man1/bzcat.1
-+ ln -fs bzip2.1 $(PREFIX)/share/man/man1/bzip2recover.1
++ ln -s bzip2.1 $(PREFIX)/share/man/man1/bunzip2.1
++ ln -s bzip2.1 $(PREFIX)/share/man/man1/bzcat.1
++ ln -s bzip2.1 $(PREFIX)/share/man/man1/bzip2recover.1
cp -f bzlib.h $(PREFIX)/include
chmod a+r $(PREFIX)/include/bzlib.h
diff --git a/patches/bzip2/bzip2-1.0.6-saneso.patch b/patches/bzip2/bzip2-1.0.6-saneso.patch
deleted file mode 100644
index 1968a63b..00000000
--- a/patches/bzip2/bzip2-1.0.6-saneso.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./Makefile-libbz2_so
-+++ ./Makefile-libbz2_so
-@@ -35,8 +35,8 @@
- 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
- rm -f libbz2.so.1.0
- ln -s libbz2.so.1.0.6 libbz2.so.1.0
-
diff --git a/patches/bzip2/saneso.patch b/patches/bzip2/saneso.patch
new file mode 100644
index 00000000..529a0c20
--- /dev/null
+++ b/patches/bzip2/saneso.patch
@@ -0,0 +1,23 @@
+diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so
+index fb0f230..2c95a3a 100644
+--- a/Makefile-libbz2_so
++++ b/Makefile-libbz2_so
+@@ -35,13 +35,13 @@ OBJS= blocksort.o \
+ bzlib.o
+
+ all: $(OBJS)
+- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
++ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS)
+ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
+- rm -f libbz2.so.1.0
+- ln -s libbz2.so.1.0.8 libbz2.so.1.0
++ rm -f libbz2.so.1
++ ln -s libbz2.so.1.0.8 libbz2.so.1
+
+ clean:
+- rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared
++ rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1 bzip2-shared
+
+ blocksort.o: blocksort.c
+ $(CC) $(CFLAGS) -c blocksort.c
+