summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-04-17 23:27:03 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-04-17 23:27:03 -0300
commit1b636dfda3ad0a941b0249806265bdb328bb1190 (patch)
treeb6bfa146591ddfb4327357813bcf3cfbdf5e01ad
parent1dc3e95c69cf9a3c80d948b1e722001157c3e3a5 (diff)
unzip-6.0-12.parabola1: fix 0-byte file regression - FS#47039 -> https://bugs.archlinux.org/task/47039
-rw-r--r--libre/unzip/PKGBUILD8
-rw-r--r--libre/unzip/csiz-underflow.patch2
2 files changed, 5 insertions, 5 deletions
diff --git a/libre/unzip/PKGBUILD b/libre/unzip/PKGBUILD
index e58f91f1f..5988f4f30 100644
--- a/libre/unzip/PKGBUILD
+++ b/libre/unzip/PKGBUILD
@@ -1,5 +1,5 @@
-# $Id: PKGBUILD 250045 2015-11-03 07:35:37Z bisson $
-# Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: Lukas Fleischer <lfleischer@archlinux.org>
+# Contributor (Arch): Gaetan Bisson <bisson@archlinux.org>
# Contributor (Arch): Douglas Soares de Andrade <douglas@archlinux.org>
# Contributor (Arch): Robson Peixoto
# Maintainer: André Silva <emulatorman@parabola.nu>
@@ -8,7 +8,7 @@ _pkgname=unzip-libre
pkgname=unzip
pkgver=6.0
_pkgver=${pkgver/./}
-pkgrel=11.parabola1
+pkgrel=12.parabola1
pkgdesc='For extracting and viewing files in .zip archives'
url='http://www.info-zip.org/UnZip.html'
arch=('i686' 'x86_64' 'armv7h')
@@ -36,7 +36,7 @@ sha1sums=('80808a3b520f8b73ee3a4dc4b5c29411cba43aa2'
'691d0751bf0bc98cf9f9889dee39baccabefdc4d'
'82c9fe9172779a0ee92a187d544e74e8f512b013'
'4f77b01454fd2ffa69bfad985bfbdc579ee26010'
- '9f86b1115c76e527ff7a2c3771d398f024533cf9'
+ 'dccc6d6a5aed0098031bbd7cc4275ab9b10a2177'
'b325fac556abf169264ed5ae364b9136016e43f3')
mksource() {
diff --git a/libre/unzip/csiz-underflow.patch b/libre/unzip/csiz-underflow.patch
index 52321c208..45afbdd68 100644
--- a/libre/unzip/csiz-underflow.patch
+++ b/libre/unzip/csiz-underflow.patch
@@ -17,7 +17,7 @@ Suggested-by: Stefan Cornelius
- if (G.pInfo->encrypted)
+ if (G.pInfo->encrypted) {
-+ if (csiz_decrypted <= 12) {
++ if (csiz_decrypted < 12) {
+ /* handle the error now to prevent unsigned overflow */
+ Info(slide, 0x401, ((char *)slide,
+ LoadFarStringSmall(ErrUnzipNoFile),