diff --git a/packages/libbz2/build.sh b/packages/libbz2/build.sh index 13bc864e17..c7537e39b5 100644 --- a/packages/libbz2/build.sh +++ b/packages/libbz2/build.sh @@ -1,9 +1,9 @@ TERMUX_PKG_HOMEPAGE=http://www.bzip.org/ TERMUX_PKG_DESCRIPTION="BZ2 format compression library" TERMUX_PKG_LICENSE="BSD" -TERMUX_PKG_VERSION=1.0.7 +TERMUX_PKG_VERSION=1.0.8 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/bzip2-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=3a704a84a4b98fc88b0cfc5d3b6bab8edd658133fda4de09ec7512b2dfb49d81 +TERMUX_PKG_SHA256=47fd74b2ff83effad0ddf62074e6fad1f6b4a77a96e121ab421c20a216371a1f TERMUX_PKG_EXTRA_MAKE_ARGS="PREFIX=$TERMUX_PREFIX" TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/libbz2/bzdiff.patch b/packages/libbz2/bzdiff.patch new file mode 100644 index 0000000000..09d6f3819f --- /dev/null +++ b/packages/libbz2/bzdiff.patch @@ -0,0 +1,20 @@ +diff -uNr bzip2-1.0.8/bzdiff bzip2-1.0.8.mod/bzdiff +--- bzip2-1.0.8/bzdiff 2019-07-13 20:50:05.000000000 +0300 ++++ bzip2-1.0.8.mod/bzdiff 2019-07-20 11:46:36.090211623 +0300 +@@ -49,14 +49,14 @@ + case "$2" in + *.bz2) + F=`echo "$2" | sed 's|.*/||;s|.bz2$||'` +- tmp=`mktemp "${TMPDIR:-/tmp}"/bzdiff.XXXXXXXXXX` || { ++ tmp=`mktemp "${TMPDIR:-@TERMUX_PREFIX@/tmp}"/bzdiff.XXXXXXXXXX` || { + echo 'cannot create a temporary file' >&2 + exit 1 + } + bzip2 -cdfq "$2" > "$tmp" + bzip2 -cdfq "$1" | $comp $OPTIONS - "$tmp" + STAT="$?" +- /bin/rm -f "$tmp";; ++ rm -f "$tmp";; + + *) bzip2 -cdfq "$1" | $comp $OPTIONS - "$2" + STAT="$?";; diff --git a/packages/libbz2/fix-paths.patch b/packages/libbz2/fix-paths.patch deleted file mode 100644 index 36490b1a80..0000000000 --- a/packages/libbz2/fix-paths.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -uNr bzip2-1.0.6/bzdiff bzip2-1.0.6.mod/bzdiff ---- bzip2-1.0.6/bzdiff 2007-01-03 04:00:55.000000000 +0200 -+++ bzip2-1.0.6.mod/bzdiff 2019-03-01 20:44:12.401418675 +0200 -@@ -37,7 +37,7 @@ - echo "Usage: $prog [${comp}_options] file [file]" - exit 1 - fi --tmp=`mktemp ${TMPDIR:-/tmp}/bzdiff.XXXXXXXXXX` || { -+tmp=`mktemp ${TMPDIR:-@TERMUX_PREFIX@/tmp}/bzdiff.XXXXXXXXXX` || { - echo 'cannot create a temporary file' >&2 - exit 1 - } -@@ -56,7 +56,7 @@ - bzip2 -cdfq "$2" > $tmp - bzip2 -cdfq "$1" | $comp $OPTIONS - $tmp - STAT="$?" -- /bin/rm -f $tmp;; -+ rm -f $tmp;; - - *) bzip2 -cdfq "$1" | $comp $OPTIONS - "$2" - STAT="$?";; diff --git a/packages/libbz2/shared_library.patch b/packages/libbz2/shared_library.patch index ee8066f19a..1cdd4abcc6 100644 --- a/packages/libbz2/shared_library.patch +++ b/packages/libbz2/shared_library.patch @@ -1,24 +1,26 @@ -diff -uNr bzip2-1.0.7/Makefile-libbz2_so bzip2-1.0.7.mod/Makefile-libbz2_so ---- bzip2-1.0.7/Makefile-libbz2_so 2019-06-27 21:15:39.000000000 +0300 -+++ bzip2-1.0.7.mod/Makefile-libbz2_so 2019-07-07 14:27:21.338209706 +0300 -@@ -22,9 +22,7 @@ +diff -uNr bzip2-1.0.8/Makefile-libbz2_so bzip2-1.0.8.mod/Makefile-libbz2_so +--- bzip2-1.0.8/Makefile-libbz2_so 2019-07-13 20:50:05.000000000 +0300 ++++ bzip2-1.0.8.mod/Makefile-libbz2_so 2019-07-20 11:51:36.370015038 +0300 +@@ -22,9 +22,9 @@ SHELL=/bin/sh -CC=gcc ++CC ?= gcc BIGFILES=-D_FILE_OFFSET_BITS=64 -CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++CFLAGS ?= -fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) OBJS= blocksort.o \ huffman.o \ -@@ -35,8 +33,8 @@ +@@ -35,8 +35,8 @@ bzlib.o all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS) -- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7 -+ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7 +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) +- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 ++ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.7 libbz2.so.1.0 + ln -s libbz2.so.1.0.8 libbz2.so.1.0