diff --git a/system/base/bzip2/actions.py b/system/base/bzip2/actions.py index 904fb9af..926e7bb5 100755 --- a/system/base/bzip2/actions.py +++ b/system/base/bzip2/actions.py @@ -40,6 +40,7 @@ def install(): pisitools.dosym("libbz2.so.1", "/lib/libbz2.so") pisitools.dosym("libbz2.so.%s" % libversion, "/lib/libbz2.so.1") + pisitools.dohtml("manual.html") pisitools.dodoc("README", "CHANGES", "bzip2.txt") diff --git a/system/base/bzip2/files/bzip2-1.0.8-manpath.patch b/system/base/bzip2/files/bzip2-1.0.8-manpath.patch new file mode 100644 index 00000000..828bc42a --- /dev/null +++ b/system/base/bzip2/files/bzip2-1.0.8-manpath.patch @@ -0,0 +1,48 @@ +diff -Nru bzip2-1.0.8.orig/Makefile bzip2-1.0.8/Makefile +--- bzip2-1.0.8.orig/Makefile 2019-07-13 20:50:05.000000000 +0300 ++++ bzip2-1.0.8/Makefile 2019-12-13 16:35:37.615371592 +0300 +@@ -72,8 +72,8 @@ + install: bzip2 bzip2recover + if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi + if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi +- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi +- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi ++ if ( test ! -d $(PREFIX)/share/man ) ; then mkdir -p $(PREFIX)/share/man ; fi ++ if ( test ! -d $(PREFIX)/share/man/man1 ) ; then mkdir -p $(PREFIX)/share/man/man1 ; fi + if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi + cp -f bzip2 $(PREFIX)/bin/bzip2 + cp -f bzip2 $(PREFIX)/bin/bunzip2 +@@ -83,8 +83,8 @@ + chmod a+x $(PREFIX)/bin/bunzip2 + chmod a+x $(PREFIX)/bin/bzcat + chmod a+x $(PREFIX)/bin/bzip2recover +- cp -f bzip2.1 $(PREFIX)/man/man1 +- chmod a+r $(PREFIX)/man/man1/bzip2.1 ++ cp -f bzip2.1 $(PREFIX)/share/man/man1 ++ chmod a+r $(PREFIX)/share/man/man1/bzip2.1 + cp -f bzlib.h $(PREFIX)/include + chmod a+r $(PREFIX)/include/bzlib.h + cp -f libbz2.a $(PREFIX)/lib +@@ -99,14 +99,14 @@ + cp -f bzdiff $(PREFIX)/bin/bzdiff + ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp + chmod a+x $(PREFIX)/bin/bzdiff +- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1 +- chmod a+r $(PREFIX)/man/man1/bzgrep.1 +- chmod a+r $(PREFIX)/man/man1/bzmore.1 +- chmod a+r $(PREFIX)/man/man1/bzdiff.1 +- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1 +- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1 +- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1 +- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 ++ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/share/man/man1 ++ chmod a+r $(PREFIX)/share/man/man1/bzgrep.1 ++ chmod a+r $(PREFIX)/share/man/man1/bzmore.1 ++ chmod a+r $(PREFIX)/share/man/man1/bzdiff.1 ++ echo ".so man1/bzgrep.1" > $(PREFIX)/share/man/man1/bzegrep.1 ++ echo ".so man1/bzgrep.1" > $(PREFIX)/share/man/man1/bzfgrep.1 ++ echo ".so man1/bzmore.1" > $(PREFIX)/share/man/man1/bzless.1 ++ echo ".so man1/bzdiff.1" > $(PREFIX)/share/man/man1/bzcmp.1 + + clean: + rm -f *.o libbz2.a bzip2 bzip2recover \ diff --git a/system/base/bzip2/pspec.xml b/system/base/bzip2/pspec.xml index ffed2383..0c55ed72 100755 --- a/system/base/bzip2/pspec.xml +++ b/system/base/bzip2/pspec.xml @@ -12,13 +12,17 @@ app:console A high-quality data compressor bzip2 is high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression. - https://sourceware.org/pub/bzip2/bzip2-1.0.6.tar.gz + https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz bzip2-1.0.2-progress.patch - bzip2-1.0.4-bzip2recover.patch - bzip2-1.0.4-man-links.patch - bzip2-1.0.6-saneso.patch - manpath.patch + + bzip2-1.0.4-makefile-CFLAGS.patch + + bzip2-1.0.6-nselectors-upper-bound-check.patch + + + bzip2-1.0.8-saneso.patch + bzip2-1.0.8-manpath.patch @@ -36,9 +40,9 @@ - 2019-10-01 - 1.0.6 - Rebuild + 2019-12-13 + 1.0.8 + Version bump Idris Kalp idriskalp@gmail.com