p7zip: updated to 9.38.1

1 files changed, 25 insertions, 8 deletions

diff --git a/p7zip/build/p7zip.SlackBuild b/p7zip/build/p7zip.SlackBuild
index 05faf545..77038c14 100755
--- a/p7zip/build/p7zip.SlackBuild
+++ b/p7zip/build/p7zip.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2006, 2008, 2009, 2010, 2011  Eric Hameleers, Eindhoven, NL
+# Copyright 2006, 2008, 2009, 2010, 2011, 2015  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -43,6 +43,8 @@
 #             * Update.
 # 9.20.1-1:  18/may/2011 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 9.38.1-1:  20/jul/2015 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh p7zip.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -53,13 +55,13 @@
 # Set initial variables:
 
 PRGNAM=p7zip
-VERSION=${VERSION:-9.20.1}
+VERSION=${VERSION:-9.38.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
 GUI=${GUI:-YES}  # build the GUI: YES or NO
 
-DOCS="ChangeLog README TODO docs/*"
+DOCS="ChangeLog README* TODO DOC/*"
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -156,25 +158,34 @@ cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
 cd ${PRGNAM}_${VERSION}
+
+# Patches borrowed from Gentoo:
+touch $OUTPUT/patch-${PRGNAM}.log
+cat $SRCDIR/patches/p7zip_CVE-2015-1038.patch | patch -p1 --verbose \
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+cat $SRCDIR/patches/p7zip_osversion.patch | patch -p1 --verbose \
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
 echo Building ...
 # Some moving around for the benefit of my DOCS variable:
-mv DOCS docs
 mv contrib/gzip-like_CLI_wrapper_for_7z/README README.p7zip_wrapper
 
+cp -f makefile.linux_${ARCHSUFFIX} makefile.machine
+sed -i -e "s#/lib/#/lib${LIBDIRSUFFIX}/#g" $(grep -rl /lib/ .)
+sed -i -e 's/chmod 555/chmod 755/' -e 's/chmod 444/chmod 644/' install.sh
+
 # First, build the commandline tools:
 if [ "$GUI" = "YES" ]; then
   TARGETS=all4
+  make depend \
+  2>&1 | tee $OUTPUT/makedepend-${PRGNAM}.log
 else
   TARGETS=all3
 fi
 
-cp -f makefile.linux_${ARCHSUFFIX} makefile.machine
-#sed -i -e "s#/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#g" \
-#  CPP/7zip/UI/GUI/makefile.depend
-sed -i -e "s#/lib/#/lib${LIBDIRSUFFIX}/#g" $(grep -rl /lib/ .)
 make $TARGETS \
   OPTFLAGS="$SLKCFLAGS" \
   DEST_HOME=/usr \
@@ -190,6 +201,10 @@ make install \
   DEST_DIR=$PKG \
   2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 
+# Install the RAR decoder library:
+mkdir -p  $PKG/usr/lib${LIBDIRSUFFIX}/p7zip
+install -m 0644 bin/Codecs/*.so $PKG/usr/lib${LIBDIRSUFFIX}/p7zip/
+
 # Add a wrapper that allows p7z to be used as a compressor for tar:
 install -m 0755 contrib/gzip-like_CLI_wrapper_for_7z/p7zip $PKG/usr/bin/
 install -m 0644 contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1 $PKG/usr/man/man1/
@@ -276,6 +291,8 @@ EOT
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+# Why oh why:
+rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/{DOC,MANUAL}
 cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 644 {} \;