diff --git a/bzip2/build.sh b/bzip2/build.sh index 953c2e4..2716243 100755 --- a/bzip2/build.sh +++ b/bzip2/build.sh @@ -6,11 +6,11 @@ ########################################################### # Check the following 4 variables before running the script topdir=bzip2 -version=1.0.6 +version=1.0.8 pkgver=1 -source[0]=http://bzip.org/${version}/$topdir-$version.tar.gz +source[0]=https://sourceware.org/pub/$topdir/$topdir-$version.tar.gz # If there are no patches, simply comment this -patch[0]=bzip2-1.0.6-sane_soname.patch +patch[0]=bzip2-1.0.8-sane_soname.patch # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions @@ -67,6 +67,7 @@ install() ${__mv} ${stagedir}${prefix}/man ${stagedir}${prefix}/share compat bzip2 1.0.5 1 1 + compat bzip2 1.0.6 1 1 } reg pack diff --git a/bzip2/meta/ChangeLog b/bzip2/meta/ChangeLog index e4b5c72..1e2d2a1 100644 --- a/bzip2/meta/ChangeLog +++ b/bzip2/meta/ChangeLog @@ -1,4 +1,7 @@ CHANGELOG --------- +* Thu Jan 30 2020 Tom G. Christensen - 1.0.8-1 +- Update to 1.0.8 + * Wed Nov 20 2013 Tom G. Christensen - 1.0.6-1 - Update to 1.0.6 diff --git a/bzip2/src/bzip2-1.0.6-sane_soname.patch b/bzip2/src/bzip2-1.0.6-sane_soname.patch deleted file mode 100644 index 4c0d700..0000000 --- a/bzip2/src/bzip2-1.0.6-sane_soname.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up bzip2-1.0.6/Makefile-libbz2_so.orig bzip2-1.0.6/Makefile-libbz2_so ---- bzip2-1.0.6/Makefile-libbz2_so.orig 2012-05-20 14:59:29.220018000 +0200 -+++ bzip2-1.0.6/Makefile-libbz2_so 2012-05-20 15:01:03.570001000 +0200 -@@ -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.6 $(OBJS) -+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -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.6 libbz2.so.1.0 -+ rm -f libbz2.so.1 -+ ln -s libbz2.so.1.0.6 libbz2.so.1 - - clean: -- 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 libbz2.so.1 bzip2-shared - - blocksort.o: blocksort.c - $(CC) $(CFLAGS) -c blocksort.c diff --git a/bzip2/src/bzip2-1.0.8-sane_soname.patch b/bzip2/src/bzip2-1.0.8-sane_soname.patch new file mode 100644 index 0000000..a54afa7 --- /dev/null +++ b/bzip2/src/bzip2-1.0.8-sane_soname.patch @@ -0,0 +1,20 @@ +--- bzip2-1.0.8/Makefile-libbz2_so.orig 2020-01-30 17:34:50.239060000 +0000 ++++ bzip2-1.0.8/Makefile-libbz2_so 2020-01-30 17:36:23.339822000 +0000 +@@ -35,13 +35,13 @@ + 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