diff options
Diffstat (limited to 'source/a/infozip')
| -rwxr-xr-x | source/a/infozip/infozip.SlackBuild | 8 | ||||
| -rw-r--r-- | source/a/infozip/unzip.process.c.diff | 28 | ||||
| -rw-r--r-- | source/a/infozip/unzip.use.system.libbz2.diff | 28 |
3 files changed, 61 insertions, 3 deletions
diff --git a/source/a/infozip/infozip.SlackBuild b/source/a/infozip/infozip.SlackBuild index 5ac456d10..9205fca60 100755 --- a/source/a/infozip/infozip.SlackBuild +++ b/source/a/infozip/infozip.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2013 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=6.0 ZIP=3.0 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -65,12 +65,14 @@ cd $TMP rm -rf unzip$(echo $VERSION | tr -d .) tar xvf $CWD/unzip$(echo $VERSION | tr -d .).tar.?z* || exit 1 cd unzip$(echo $VERSION | tr -d .) +zcat $CWD/unzip.use.system.libbz2.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/unzip.process.c.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . mkdir -p $PKG/usr/doc/unzip-$VERSION cp -a BUGS COPYING* Contents History.* INSTALL LICENSE README ToDo WHERE \ $PKG/usr/doc/unzip-$VERSION chmod 644 $PKG/usr/doc/unzip-$VERSION/* -make -f unix/Makefile generic || exit 1 +make -f unix/Makefile generic LOCAL_UNZIP=-DIZ_HAVE_UXUIDGID || exit 1 cat unzip > $PKG/usr/bin/unzip cat unzipsfx > $PKG/usr/bin/unzipsfx cat funzip > $PKG/usr/bin/funzip diff --git a/source/a/infozip/unzip.process.c.diff b/source/a/infozip/unzip.process.c.diff new file mode 100644 index 000000000..5894f7b0e --- /dev/null +++ b/source/a/infozip/unzip.process.c.diff @@ -0,0 +1,28 @@ +--- ./process.c.orig 2009-03-06 02:25:10.000000000 +0100 ++++ ./process.c 2013-09-12 10:51:16.000000000 +0200 +@@ -2895,9 +2895,9 @@ + */ + + #ifdef IZ_HAVE_UXUIDGID +- if (eb_len >= EB_UX3_MINLEN +- && z_uidgid != NULL +- && (*((EB_HEADSIZE + 0) + ef_buf) == 1) ++ if ((eb_len >= EB_UX3_MINLEN) ++ && (z_uidgid != NULL) ++ && ((*((EB_HEADSIZE + 0) + ef_buf) == 1))) + /* only know about version 1 */ + { + uch uid_size; +@@ -2909,10 +2909,10 @@ + flags &= ~0x0ff; /* ignore any previous UNIX field */ + + if ( read_ux3_value((EB_HEADSIZE + 2) + ef_buf, +- uid_size, z_uidgid[0]) ++ uid_size, &z_uidgid[0]) + && + read_ux3_value((EB_HEADSIZE + uid_size + 3) + ef_buf, +- gid_size, z_uidgid[1]) ) ++ gid_size, &z_uidgid[1]) ) + { + flags |= EB_UX2_VALID; /* signal success */ + } diff --git a/source/a/infozip/unzip.use.system.libbz2.diff b/source/a/infozip/unzip.use.system.libbz2.diff new file mode 100644 index 000000000..ab10997dc --- /dev/null +++ b/source/a/infozip/unzip.use.system.libbz2.diff @@ -0,0 +1,28 @@ +--- ./unix/configure.orig 2009-04-16 14:25:12.000000000 -0500 ++++ ./unix/configure 2013-09-12 13:32:24.274604436 -0500 +@@ -640,7 +640,24 @@ + D_USE_BZ2="-DUSE_BZIP2" + L_BZ2="${BZLF} -lbz2" + else +- echo "-- bzip2 sources not found - no bzip2 support" ++ echo " Check if OS already has bzip2 library installed" ++ cat > conftest.c << _EOF_ ++#include "bzlib.h" ++int main() ++{ ++ bz_stream strm; ++ BZ2_bzCompressEnd(&strm); ++ return 0; ++} ++_EOF_ ++ $CC $CFLAGS -o conftest conftest.c -lbz2 > /dev/null 2>/dev/null ++ if test $? -eq 0; then ++ echo "-- OS supports bzip2 - linking in bzip2" ++ D_USE_BZ2="-DUSE_BZIP2" ++ L_BZ2="${BZLF} -lbz2" ++ else ++ echo "-- Either bzlib.h or libbz2.a not found - no bzip2" ++ fi + fi + fi + |