aboutsummaryrefslogtreecommitdiffstats
path: root/main/zip
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2020-01-19 15:26:57 +0100
committerLeo <thinkabit.ukim@gmail.com>2020-01-19 15:58:38 +0100
commit6245872c5c6580402a7dc74804498f7c38adadbe (patch)
treec3c99a1efdb9afe0d3a2cc1f98183d5856c0683e /main/zip
parent5c9c71c298df24c6ce811e5e712e2dbedf7e678d (diff)
downloadaports-6245872c5c6580402a7dc74804498f7c38adadbe.tar.gz
aports-6245872c5c6580402a7dc74804498f7c38adadbe.tar.bz2
aports-6245872c5c6580402a7dc74804498f7c38adadbe.tar.xz
main/zip: add patch fixing zipnote usage
fixes #8602
Diffstat (limited to 'main/zip')
-rw-r--r--main/zip/40-fix-zipnote.patch15
-rw-r--r--main/zip/APKBUILD8
2 files changed, 20 insertions, 3 deletions
diff --git a/main/zip/40-fix-zipnote.patch b/main/zip/40-fix-zipnote.patch
new file mode 100644
index 0000000000..1ffef14a4a
--- /dev/null
+++ b/main/zip/40-fix-zipnote.patch
@@ -0,0 +1,15 @@
+Fixes zipnote, see https://gitlab.alpinelinux.org/alpine/aports/issues/8602
+
+diff --git a/zipnote.c b/zipnote.c
+index 5e02cb6..996f012 100644
+--- a/zipnote.c
++++ b/zipnote.c
+@@ -661,7 +661,7 @@ char **argv; /* command line tokens */
+ if ((r = zipcopy(z)) != ZE_OK)
+ ziperr(r, "was copying an entry");
+ }
+- fclose(x);
++ fclose(in_file);
+
+ /* Write central directory and end of central directory with new comments */
+ if ((c = zftello(y)) == (zoff_t)-1) /* get start of central */
diff --git a/main/zip/APKBUILD b/main/zip/APKBUILD
index e4163d9d96..6d4b9fd2c8 100644
--- a/main/zip/APKBUILD
+++ b/main/zip/APKBUILD
@@ -2,7 +2,7 @@
pkgname=zip
pkgver=3.0
_pkgver=${pkgver%.*}${pkgver##*.}
-pkgrel=7
+pkgrel=8
pkgdesc="Creates PKZIP-compatible .zip files"
url="http://www.info-zip.org/pub/infozip/Zip.html"
arch="all"
@@ -14,7 +14,8 @@ subpackages="$pkgname-doc"
source="https://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz
10-zip-3.0-build.patch
20-zip-3.0-exec-stack.patch
- 30-zip-3.0-pic.patch"
+ 30-zip-3.0-pic.patch
+ 40-fix-zipnote.patch"
builddir="$srcdir"/${pkgname}${_pkgver}
@@ -32,4 +33,5 @@ package() {
sha512sums="c1c3d62bf1426476c0f9919b568013d6d7b03514912035f09ee283226d94c978791ad2af5310021e96c4c2bf320bfc9d0b8f4045c48e4667e034d98197e1a9b3 zip30.tar.gz
e71f7c6f6dd6f8f576018581b155f324eaf6810a2f7c5c402843bdfc3ce6772f09be166b33ff34dcb703774694b18584c8de1763f29895c1d563661679f43d71 10-zip-3.0-build.patch
2a6824066543684e02731bd36930e0ffa6ab48162c61d5e7af08e8ea0795401271ef28bdd0f6ace865d91fdb1a05b643813cdd458a9fdf554f1ca298ea7f50e3 20-zip-3.0-exec-stack.patch
-fcb2d728d79160128064af90eb17a9c03e980d9619c4d930c4dbf79cb13842c7bb694036dcbf5cd9b412efc6fc0b86bb94a88b3f110b6b63bf6bda2b97fe0568 30-zip-3.0-pic.patch"
+fcb2d728d79160128064af90eb17a9c03e980d9619c4d930c4dbf79cb13842c7bb694036dcbf5cd9b412efc6fc0b86bb94a88b3f110b6b63bf6bda2b97fe0568 30-zip-3.0-pic.patch
+f22649d1cbe94ffcacf622493400489393d6fac80067211e6ba12b85d7b062f76b041f318068731b267167e715b7749589bfe9205670a61c6e56e1ffdfaea29b 40-fix-zipnote.patch"