From 9a71905944b99eac7cf34220027735165fb7d76e Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 15 Mar 2011 07:25:56 +0000 Subject: [PATCH] bzip2: update to 1.0.6 --- bzip2/.footprint | 4 +- bzip2/.md5sum | 4 +- bzip2/Pkgfile | 7 +- bzip2/{bzip2-1.0.5.patch => bzip2.patch} | 90 +++++++++++++++++------- 4 files changed, 71 insertions(+), 34 deletions(-) rename bzip2/{bzip2-1.0.5.patch => bzip2.patch} (59%) diff --git a/bzip2/.footprint b/bzip2/.footprint index 608a3f8..2c1ca92 100644 --- a/bzip2/.footprint +++ b/bzip2/.footprint @@ -16,8 +16,8 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libbz2.a lrwxrwxrwx root/root usr/lib/libbz2.so -> libbz2.so.1.0 -lrwxrwxrwx root/root usr/lib/libbz2.so.1.0 -> libbz2.so.1.0.4 --rwxr-xr-x root/root usr/lib/libbz2.so.1.0.4 +lrwxrwxrwx root/root usr/lib/libbz2.so.1.0 -> libbz2.so.1.0.6 +-rwxr-xr-x root/root usr/lib/libbz2.so.1.0.6 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ lrwxrwxrwx root/root usr/man/man1/bunzip2.1.gz -> bzip2.1.gz diff --git a/bzip2/.md5sum b/bzip2/.md5sum index 596d03d..fb5468a 100644 --- a/bzip2/.md5sum +++ b/bzip2/.md5sum @@ -1,2 +1,2 @@ -f1f92eeecbcb78b71d661d2fa202c86c bzip2-1.0.5.patch -3c15a0c8d1d3ee1c46a1634d00617b1a bzip2-1.0.5.tar.gz +00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz +21bba891a5e515d69fa6ca6b11eac726 bzip2.patch diff --git a/bzip2/Pkgfile b/bzip2/Pkgfile index 0190128..34fda81 100644 --- a/bzip2/Pkgfile +++ b/bzip2/Pkgfile @@ -5,14 +5,15 @@ # Depends on: name=bzip2 -version=1.0.5 +version=1.0.6 release=1 source=(http://www.bzip.org/$version/$name-$version.tar.gz \ - $name-$version.patch) + $name.patch) build() { cd $name-$version - patch -p1 -i $SRC/$name-$version.patch + patch -Np1 -i $SRC/$name.patch + sed "s|all: libbz2.a bzip2 bzip2recover test|all: libbz2.a bzip2 bzip2recover|g" -i Makefile make CC="$CC" AR="$AR" RANLIB="$RANLIB" make PREFIX=$PKG/usr install make -f Makefile-libbz2_so CC="$CC" diff --git a/bzip2/bzip2-1.0.5.patch b/bzip2/bzip2.patch similarity index 59% rename from bzip2/bzip2-1.0.5.patch rename to bzip2/bzip2.patch index b2203a2..f0f9341 100644 --- a/bzip2/bzip2-1.0.5.patch +++ b/bzip2/bzip2.patch @@ -1,25 +1,16 @@ -diff -purN bzip2-1.0.5.orig/Makefile bzip2-1.0.5/Makefile ---- bzip2-1.0.5.orig/Makefile 2009-11-20 17:39:43.000000000 +0100 -+++ bzip2-1.0.5/Makefile 2009-11-20 17:42:54.000000000 +0100 -@@ -21,7 +21,7 @@ RANLIB=ranlib +diff -aur bzip2-1.0.6.orig/Makefile bzip2-1.0.6/Makefile +--- bzip2-1.0.6.orig/Makefile 2008-02-14 13:39:18.000000000 +0100 ++++ bzip2-1.0.6/Makefile 2009-06-14 13:49:03.889599030 +0200 +@@ -21,7 +21,7 @@ LDFLAGS= BIGFILES=-D_FILE_OFFSET_BITS=64 -CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) -+CFLAGS+=-Wall -Winline $(BIGFILES) ++CFLAGS+=-fpic -Wall -Winline $(BIGFILES) # Where you want it installed when you do 'make install' PREFIX=/usr/local -@@ -35,7 +35,7 @@ OBJS= blocksort.o \ - decompress.o \ - bzlib.o - --all: libbz2.a bzip2 bzip2recover test -+all: libbz2.a bzip2 bzip2recover - - bzip2: libbz2.a bzip2.o - $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2 -@@ -70,43 +70,36 @@ test: bzip2 +@@ -70,43 +70,36 @@ @cat words3 install: bzip2 bzip2recover @@ -93,34 +84,79 @@ diff -purN bzip2-1.0.5.orig/Makefile bzip2-1.0.5/Makefile clean: rm -f *.o libbz2.a bzip2 bzip2recover \ -diff -purN bzip2-1.0.5.orig/Makefile-libbz2_so bzip2-1.0.5/Makefile-libbz2_so ---- bzip2-1.0.5.orig/Makefile-libbz2_so 2009-11-20 17:39:43.000000000 +0100 -+++ bzip2-1.0.5/Makefile-libbz2_so 2009-11-20 17:43:20.000000000 +0100 +diff -aur bzip2-1.0.6.orig/Makefile-libbz2_so bzip2-1.0.6/Makefile-libbz2_so +--- bzip2-1.0.6.orig/Makefile-libbz2_so 2007-12-09 14:00:50.000000000 +0100 ++++ bzip2-1.0.6/Makefile-libbz2_so 2009-06-14 13:48:27.519580669 +0200 @@ -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) ++CFLAGS+=-fpic -Wall -Winline $(BIGFILES) OBJS= blocksort.o \ huffman.o \ -@@ -37,11 +37,15 @@ OBJS= blocksort.o \ +@@ -37,11 +37,15 @@ all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 + $(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 - rm -f libbz2.so.1.0 -- ln -s libbz2.so.1.0.4 libbz2.so.1.0 +- ln -s libbz2.so.1.0.6 libbz2.so.1.0 + +install: + install -d $(PREFIX)/lib -+ install -m 755 libbz2.so.1.0.4 $(PREFIX)/lib -+ ln -sf libbz2.so.1.0.4 $(PREFIX)/lib/libbz2.so.1.0 ++ install -m 755 libbz2.so.1.0.6 $(PREFIX)/lib ++ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0 + ln -sf libbz2.so.1.0 $(PREFIX)/lib/libbz2.so clean: -- rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared -+ rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 bzip2-shared +- rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared ++ rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 bzip2-shared blocksort.o: blocksort.c $(CC) $(CFLAGS) -c blocksort.c +diff -aur bzip2-1.0.6.orig/bzlib_private.h bzip2-1.0.6/bzlib_private.h +--- bzip2-1.0.6.orig/bzlib_private.h 2007-12-09 15:00:46.000000000 +0100 ++++ bzip2-1.0.6/bzlib_private.h 2009-06-14 13:53:28.200579230 +0200 +@@ -128,7 +128,7 @@ + + /*-- Stuff for randomising repetitive blocks. --*/ + +-extern Int32 BZ2_rNums[512]; ++extern const Int32 BZ2_rNums[512]; + + #define BZ_RAND_DECLS \ + Int32 rNToGo; \ +@@ -152,7 +152,7 @@ + + /*-- Stuff for doing CRCs. --*/ + +-extern UInt32 BZ2_crc32Table[256]; ++extern const UInt32 BZ2_crc32Table[256]; + + #define BZ_INITIALISE_CRC(crcVar) \ + { \ +diff -aur bzip2-1.0.6.orig/crctable.c bzip2-1.0.6/crctable.c +--- bzip2-1.0.6.orig/crctable.c 2007-12-09 13:29:49.000000000 +0100 ++++ bzip2-1.0.6/crctable.c 2009-06-14 13:52:33.248830630 +0200 +@@ -28,7 +28,7 @@ + comp.compression FAQ. + --*/ + +-UInt32 BZ2_crc32Table[256] = { ++const UInt32 BZ2_crc32Table[256] = { + + /*-- Ugly, innit? --*/ + +diff -aur bzip2-1.0.6.orig/randtable.c bzip2-1.0.6/randtable.c +--- bzip2-1.0.6.orig/randtable.c 2007-12-09 13:32:55.000000000 +0100 ++++ bzip2-1.0.6/randtable.c 2009-06-14 13:53:38.063580427 +0200 +@@ -23,7 +23,7 @@ + + + /*---------------------------------------------*/ +-Int32 BZ2_rNums[512] = { ++const Int32 BZ2_rNums[512] = { + 619, 720, 127, 481, 931, 816, 813, 233, 566, 247, + 985, 724, 205, 454, 863, 491, 741, 242, 949, 214, + 733, 859, 335, 708, 621, 574, 73, 654, 730, 472, -- 2.26.2