From 47b14d79d3fdd8b9eeaf1e5c13b81334ae4adb5f Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sun, 24 Jun 2018 05:04:02 +0200 Subject: [PATCH] zziplib, bump version (#2720) --- .../zziplib/patches/zziplib-0.13.69.patchset | 97 ++++++++++++++++ dev-libs/zziplib/zziplib-0.13.69.recipe | 104 ++++++++++++++++++ 2 files changed, 201 insertions(+) create mode 100644 dev-libs/zziplib/patches/zziplib-0.13.69.patchset create mode 100644 dev-libs/zziplib/zziplib-0.13.69.recipe diff --git a/dev-libs/zziplib/patches/zziplib-0.13.69.patchset b/dev-libs/zziplib/patches/zziplib-0.13.69.patchset new file mode 100644 index 000000000..a29b7bb55 --- /dev/null +++ b/dev-libs/zziplib/patches/zziplib-0.13.69.patchset @@ -0,0 +1,97 @@ +From 7029bf1cb8803265aeb139088fd2bb9b6b488203 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Thu, 21 Jun 2018 17:31:25 +0200 +Subject: gcc2 fix + + +diff --git a/zzip/mmapped.c b/zzip/mmapped.c +index 8af18f4..829e4bb 100644 +--- a/zzip/mmapped.c ++++ b/zzip/mmapped.c +@@ -444,12 +444,14 @@ zzip_disk_findfirst(ZZIP_DISK * disk) + errno = EFBIG; + return 0; + } ++ { + zzip_size_t rootseek = zzip_disk64_trailer_get_rootseek(trailer); + rootsize = zzip_disk64_trailer_get_rootsize(trailer); + DBG2("disk64 rootseek at %lli", (long long)rootseek); + root = disk->buffer + rootseek; + if (root > p) + continue; ++ } + } else + { + continue; +-- +2.16.4 + + +From b11f2e7dad028a6308cc9e857dbcdff0bc7030d9 Mon Sep 17 00:00:00 2001 +From: Leorize +Date: Thu, 21 Jun 2018 17:34:03 +0200 +Subject: test: set LIBRARY_PATH instead of LD_LIBRARY_PATH + + +diff --git a/test/Makefile.am b/test/Makefile.am +index 49b3fc0..f0639ef 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -80,7 +80,7 @@ zzshowme$(EXEEXT) : zzipself$(EXEEXT) zzipsetstub$(EXEEXT) + + check-sfx : zzshowme$(EXEEXT) + echo :$@: "./zzshowme readme >readme.out 2>readme.err" +- export LD_LIBRARY_PATH="../zzip/.libs:$$LD_LIBRARY_PATH" \ ++ export LIBRARY_PATH="../zzip/.libs:$$LD_LIBRARY_PATH" \ + ; ./zzshowme readme >readme.out 2>readme.err ; true + @ echo 'diff readme.out $(README) || grep "libzzip-" readme.err' \ + ; if test -s readme.out ; then diff readme.out $(README) \ +-- +2.16.4 + + +From ec69742a9b7fc042d81183f876ab5a8b43b2455e Mon Sep 17 00:00:00 2001 +From: Leorize +Date: Thu, 21 Jun 2018 17:36:28 +0200 +Subject: test: use rpath to direct zzipself to correct libpath + + +diff --git a/test/Makefile.am b/test/Makefile.am +index f0639ef..bd42521 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -64,7 +64,7 @@ check-readme : $(zzcat) test.zip + + noinst_PROGRAMS = zzipself zzipsetstub + +-zzipself_LDFLAGS = @ZZIPLIB_LDFLAGS@ ++zzipself_LDFLAGS = @ZZIPLIB_LDFLAGS@ -Wl,-rpath,\$$ORIGIN/../zzip/.libs + zzipself_LDADD = ../zzip/libzzip.la @RESOLVES@ -lz + + ../zzip/libzzip.la : @top_srcdir@/zzip/*.c +-- +2.16.4 + + +From c3a4c9813151e6958f21ab7859b467289cfbdee6 Mon Sep 17 00:00:00 2001 +From: Leorize +Date: Thu, 21 Jun 2018 17:38:49 +0200 +Subject: test: split file list with xargs + + +diff --git a/test/zziptests.py b/test/zziptests.py +index ea11388..8cd6ad7 100644 +--- a/test/zziptests.py ++++ b/test/zziptests.py +@@ -285,7 +285,7 @@ class ZZipTest(unittest.TestCase): + filename = os.path.join(tmpdir,"README") + filetext = self.readme() + self.mkfile(filename, filetext) +- shell("{exe} ../{zipfile} ??*.* README".format(**locals()), cwd=tmpdir) ++ shell("printf '%s\n' ??*.* | xargs {exe} -un README ../{zipfile} README".format(**locals()), cwd=tmpdir) + self.assertGreater(os.path.getsize(zipfile), 10) + def test_10003_make_test3_zip(self): + """ create a test3.zip for later tests using standard 'zip' +-- +2.16.4 + diff --git a/dev-libs/zziplib/zziplib-0.13.69.recipe b/dev-libs/zziplib/zziplib-0.13.69.recipe new file mode 100644 index 000000000..0fda69742 --- /dev/null +++ b/dev-libs/zziplib/zziplib-0.13.69.recipe @@ -0,0 +1,104 @@ +SUMMARY="The zziplib extract data from archives in a single zip" +DESCRIPTION="Lightweight library used to easily extract data from \ +files archived in a single zip file." +HOMEPAGE="http://zziplib.sourceforge.net/" +COPYRIGHT="1999-2010 Guido Draheim" +LICENSE="GNU LGPL v2.1 + MPL v1.1" +REVISION="2" +SOURCE_URI="https://github.com/gdraheim/zziplib/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="846246d7cdeee405d8d21e2922c6e97f55f24ecbe3b6dcf5778073a88f120544" +PATCHES="zziplib-$portVersion.patchset" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" + +libVersion="13.0.69" +libVersionCompat="$libVersion compat >= 10" + +PROVIDES=" + zziplib$secondaryArchSuffix = $portVersion + cmd:unzip_mem$secondaryArchSuffix = $portVersion + cmd:unzzip$secondaryArchSuffix = $portVersion + cmd:unzzip_big$secondaryArchSuffix = $portVersion + cmd:unzzip_mem$secondaryArchSuffix = $portVersion + cmd:unzzip_mix$secondaryArchSuffix = $portVersion + cmd:zzcat$secondaryArchSuffix = $portVersion + cmd:zzdir$secondaryArchSuffix = $portVersion + cmd:zzxorcat$secondaryArchSuffix = $portVersion + cmd:zzxorcopy$secondaryArchSuffix = $portVersion + cmd:zzxordir$secondaryArchSuffix = $portVersion + lib:libzzip_0$secondaryArchSuffix = $libVersionCompat + lib:libzzipfseeko_0$secondaryArchSuffix = $libVersionCompat + lib:libzzipmmapped_0$secondaryArchSuffix = $libVersionCompat + lib:libzzipwrap_0$secondaryArchSuffix = $libVersion compat >= 13 + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +PROVIDES_devel=" + zziplib${secondaryArchSuffix}_devel = $portVersion + devel:libzzip$secondaryArchSuffix = $libVersionCompat + devel:libzzipfseeko$secondaryArchSuffix = $libVersionCompat + devel:libzzipmmapped$secondaryArchSuffix = $libVersionCompat + devel:libzzipwrap$secondaryArchSuffix = $libVersion compat >= 13 + " +REQUIRES_devel=" + zziplib${secondaryArchSuffix}_devel == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + docbook_xml_dtd + docbook_xsl_stylesheets + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:awk + cmd:libtoolize$secondaryArchSuffix + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:perl + cmd:pkg_config$secondaryArchSuffix + cmd:python2 + cmd:tar + cmd:xmlto + cmd:zip + " +PATCH() +{ + sed -i 's/\--export-dynamic/\-export-dynamic/' configure.ac +} +BUILD() +{ + libtoolize -fci + autoreconf -vfi + runConfigure ./configure --mandir=$manDir + make $jobArgs +} + +INSTALL() +{ + make install + rm $libDir/libzzip*.la + + prepareInstalledDevelLibs \ + libzzip \ + libzzipfseeko \ + libzzipmmapped \ + libzzipwrap + + fixPkgconfig + + packageEntries devel \ + $developDir +} + +TEST() +{ + make check +}