sskras / build / midipix_build

Forked from build/midipix_build 2 years ago
Clone
Source Code
GIT

d420de vars/build.vars:bzip2: updated to v1.0.8 (via Redfoxmoon.)

Authored and Committed by Lucio Andrés Illanes Albornoz 5 years ago
raw patch tree parent
7 files changed. 55 lines added. 53 lines removed.
patches/bzip2/CVE-2016-3189.patch
file removed
-12
patches/bzip2/bzip2-1.0.4-POSIX-shell.patch
file removed
-21
patches/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
file added
+25
patches/bzip2/bzip2-1.0.4-man-links.patch
file modified
+3 -3
patches/bzip2/bzip2-1.0.6-saneso.patch
file removed
-13
patches/bzip2/saneso.patch
file added
+23
vars/build.vars
file modified
+4 -4 
    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.
file removed
-12
patches/bzip2/CVE-2016-3189.patch DELETED
@@ -1,12 +0,0 @@
1
- diff --git a/bzip2recover.c b/bzip2recover.c
2
- index f9de049..d159c92 100644
3
- --- a/bzip2recover.c
4
- +++ b/bzip2recover.c
5
- @@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv )
6
- bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
7
- bsPutUInt32 ( bsWr, blockCRC );
8
- bsClose ( bsWr );
9
- + outFile = NULL;
10
- }
11
- if (wrBlock >= rbCtr) break;
12
- wrBlock++;
file removed
-21
patches/bzip2/bzip2-1.0.4-POSIX-shell.patch DELETED
@@ -1,21 +0,0 @@
1
- bzgrep uses !/bin/sh but then uses the bashism ${var//} so replace those
2
- with calls to sed so POSIX shells work
3
-
4
- http://bugs.gentoo.org/193365
5
-
6
- --- ./bzgrep
7
- +++ ./bzgrep
8
- @@ -63,10 +63,9 @@
9
- bzip2 -cdfq "$i" | $grep $opt "$pat"
10
- r=$?
11
- else
12
- - j=${i//\\/\\\\}
13
- - j=${j//|/\\|}
14
- - j=${j//&/\\&}
15
- - j=`printf "%s" "$j" | tr '\n' ' '`
16
- + # the backslashes here are doubled up as we have to escape each one for the
17
- + # shell and then escape each one for the sed expression
18
- + j=`printf "%s" "${i}" | sed -e 's:\\\\:\\\\\\\\:g' -e 's:[|]:\\\\|:g' -e 's:[&]:\\\\&:g' | tr '\n' ' '`
19
- bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
20
- r=$?
21
- fi
file added
+25
patches/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch ADDED
@@ -0,0 +1,25 @@
1
+ --- ./Makefile
2
+ +++ ./Makefile
3
+ @@ -18,10 +18,9 @@
4
+ CC=gcc
5
+ AR=ar
6
+ RANLIB=ranlib
7
+ -LDFLAGS=
8
+
9
+ BIGFILES=-D_FILE_OFFSET_BITS=64
10
+ -CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
11
+ +CFLAGS+=-Wall -Winline $(BIGFILES) $(CPPFLAGS)
12
+
13
+ # Where you want it installed when you do 'make install'
14
+ PREFIX=/usr/local
15
+ --- ./Makefile-libbz2_so
16
+ +++ ./Makefile-libbz2_so
17
+ @@ -24,7 +24,7 @@
18
+ SHELL=/bin/sh
19
+ CC=gcc
20
+ BIGFILES=-D_FILE_OFFSET_BITS=64
21
+ -CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
22
+ +CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) $(CPPFLAGS)
23
+
24
+ OBJS= blocksort.o \
25
+ huffman.o \
file modified
+3 -3
patches/bzip2/bzip2-1.0.4-man-links.patch CHANGED
@@ -5,8 +5,8 @@ http://bugs.gentoo.org/172986
5
5
@@ -85,4 +85,7 @@
6
6
cp -f bzip2.1 $(PREFIX)/share/man/man1
7
7
chmod a+r $(PREFIX)/share/man/man1/bzip2.1
8
- + ln -fs bzip2.1 $(PREFIX)/share/man/man1/bunzip2.1
9
- + ln -fs bzip2.1 $(PREFIX)/share/man/man1/bzcat.1
10
- + ln -fs bzip2.1 $(PREFIX)/share/man/man1/bzip2recover.1
8
+ + ln -s bzip2.1 $(PREFIX)/share/man/man1/bunzip2.1
9
+ + ln -s bzip2.1 $(PREFIX)/share/man/man1/bzcat.1
10
+ + ln -s bzip2.1 $(PREFIX)/share/man/man1/bzip2recover.1
11
11
cp -f bzlib.h $(PREFIX)/include
12
12
chmod a+r $(PREFIX)/include/bzlib.h
file removed
-13
patches/bzip2/bzip2-1.0.6-saneso.patch DELETED
@@ -1,13 +0,0 @@
1
- --- ./Makefile-libbz2_so
2
- +++ ./Makefile-libbz2_so
3
- @@ -35,8 +35,8 @@
4
- bzlib.o
5
-
6
- all: $(OBJS)
7
- - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
8
- - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
9
- + $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS)
10
- + $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
11
- rm -f libbz2.so.1.0
12
- ln -s libbz2.so.1.0.6 libbz2.so.1.0
13
-
file added
+23
patches/bzip2/saneso.patch ADDED
@@ -0,0 +1,23 @@
1
+ diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so
2
+ index fb0f230..2c95a3a 100644
3
+ --- a/Makefile-libbz2_so
4
+ +++ b/Makefile-libbz2_so
5
+ @@ -35,13 +35,13 @@ OBJS= blocksort.o \
6
+ bzlib.o
7
+
8
+ all: $(OBJS)
9
+ - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
10
+ + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS)
11
+ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
12
+ - rm -f libbz2.so.1.0
13
+ - ln -s libbz2.so.1.0.8 libbz2.so.1.0
14
+ + rm -f libbz2.so.1
15
+ + ln -s libbz2.so.1.0.8 libbz2.so.1
16
+
17
+ clean:
18
+ - rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared
19
+ + rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1 bzip2-shared
20
+
21
+ blocksort.o: blocksort.c
22
+ $(CC) $(CFLAGS) -c blocksort.c
23
+
file modified
+4 -4
vars/build.vars CHANGED
@@ -739,12 +739,12 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
739
739
: ${PKG_APR_UTIL_CONFIGURE_ARGS_EXTRA:="--with-apr=${BUILD_WORKDIR}/apr-native-${DEFAULT_TARGET}/obj"};
740
740
: ${PKG_APR_UTIL_DEPS_PARENT:=apr};
741
741
: ${PKG_APR_UTIL_INSTALL_FILES:=bin/apu-1-config=${PREFIX}/bin/${DEFAULT_TARGET}-apu-1-config};
742
- : ${PKG_BZIP2_SHA256SUM:=d70a9ccd8bdf47e302d96c69fecd54925f45d9c7b966bb4ef5f56b770960afa7};
743
- : ${PKG_BZIP2_VERSION:=1.0.6};
744
- : ${PKG_BZIP2_URL:=https://fossies.org/linux/misc/bzip2-${PKG_BZIP2_VERSION}.tar.bz2};
742
+ : ${PKG_BZIP2_SHA256SUM:=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269};
743
+ : ${PKG_BZIP2_VERSION:=1.0.8};
744
+ : ${PKG_BZIP2_URL:=https://sourceware.org/pub/bzip2/bzip2-${PKG_BZIP2_VERSION}.tar.gz};
745
745
: ${PKG_BZIP2_CFLAGS_BUILD_EXTRA:=${LIB_PACKAGES_CFLAGS_CONFIGURE}};
746
746
: ${PKG_BZIP2_IN_TREE:=1};
747
- : ${PKG_BZIP2_INSTALL_FILES:="@bzdiff=bin/bzcmp @bzgrep=bin/bzegrep @bzgrep=bin/bzfgrep @bzmore=bin/bzless ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1.0=lib/ ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1.0.6=lib/"};
747
+ : ${PKG_BZIP2_INSTALL_FILES:="@bzdiff=bin/bzcmp @bzgrep=bin/bzegrep @bzgrep=bin/bzfgrep @bzmore=bin/bzless ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1=lib/ ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1.0.8=lib/"};
748
748
: ${PKG_BZIP2_MAKEFLAGS_BUILD_EXTRA:=-f Makefile-libbz2_so};
749
749
: ${PKG_BZIP2_MAKE_INSTALL_VNAME:=PREFIX};
750
750
: ${PKG_LIBDMTX_SHA256SUM:=686bcfb44e50b96345aa53f41e285f2118a2cf87a333b69b74165a2e7ddca492};

Powered by Pagure 5.13.3

SSH Hostkey/Fingerprint | Documentation | About

© Red Hat, Inc. and others.