[arch-commits] Commit in unzip/trunk (PKGBUILD)

[Jonas Witschel]

    Date: Wednesday, November 3, 2021 @ 12:28:46
  Author: diabonas
Revision: 427050

unzip: sync existing patches with Fedora

This is done in preparation for adding more patches from Fedore to fix various
security issues. The contents of the patches is identical to the existing ones,
apart from unzip-6.0-cve-2014-8139.patch, which is an updated version of
crc32.patch, cf. https://bugzilla.redhat.com/show_bug.cgi?id=1174844 The three
patches csiz-underflow.patch, empty-input.patch and nextbyte-overflow.patch are
all incorporated into the single unzip-6.0-heap-overflow-infloop.patch.

Modified:
  unzip/trunk/PKGBUILD

----------+
 PKGBUILD |   40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-03 11:54:52 UTC (rev 427049)
+++ PKGBUILD	2021-11-03 12:28:46 UTC (rev 427050)
@@ -13,35 +13,29 @@
 license=('custom')
 depends=('bzip2' 'bash')
 source=("https://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz"
-        'overflow-fsize.patch'
-        'cve20149636.patch'
-        'test_compr_eb.patch'
-        'getZip64Data.patch'
-        'crc32.patch'
-        'empty-input.patch'
-        'csiz-underflow.patch'
-        'nextbyte-overflow.patch')
+        'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-6.0-overflow-long-fsize.patch'
+        'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-6.0-overflow.patch'
+        'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-6.0-cve-2014-8140.patch'
+        'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-6.0-cve-2014-8141.patch'
+        'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-6.0-cve-2014-8139.patch'
+        'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-6.0-heap-overflow-infloop.patch')
 sha1sums=('abf7de8a4018a983590ed6f5cbd990d4740f8a22'
-          '2852ce1a9db8d646516f8828436a44d34785a0b3'
+          'e8fbdd7388f2ea13a1c2f0e8b278268e02b67bd1'
           'e8c0bc17c63eeed97ad62b86845d75c849bcf4f8'
-          '614c3e7fa7d6da7c60ea2aa79e36f4cbd17c3824'
-          '691d0751bf0bc98cf9f9889dee39baccabefdc4d'
-          '82c9fe9172779a0ee92a187d544e74e8f512b013'
-          '4f77b01454fd2ffa69bfad985bfbdc579ee26010'
-          'dccc6d6a5aed0098031bbd7cc4275ab9b10a2177'
-          'b325fac556abf169264ed5ae364b9136016e43f3')
+          'adcf7d53fcc14bf505938d9336c5c3c131c17cb8'
+          '27709673b38ffea4efd004d9fb8fa62916bf50d4'
+          '7d5283893dc89cb163950de83a88920be7aab1d2'
+          '393b6ae0da77c436209eeb0354fa2712500b00b4')
 
 prepare() {
 	cd "${srcdir}/${pkgname}${_pkgver}"
 	sed -i "/MANDIR =/s#)/#)/share/#" unix/Makefile
-	patch -p1 -i ../overflow-fsize.patch #FS#44171
-	patch -p1 -i ../cve20149636.patch #FS#44171
-	patch -i ../test_compr_eb.patch # FS#43391
-	patch -i ../getZip64Data.patch # FS#43300
-	patch -i ../crc32.patch # FS#43300
-	patch -p1 -i ../empty-input.patch # FS#46955
-	patch -p1 -i ../csiz-underflow.patch # FS#46955
-	patch -p1 -i ../nextbyte-overflow.patch # FS#46955
+	patch -p1 -i ../unzip-6.0-overflow-long-fsize.patch #FS#44171
+	patch -p1 -i ../unzip-6.0-overflow.patch #FS#44171
+	patch -i ../unzip-6.0-cve-2014-8140.patch # FS#43391
+	patch -i ../unzip-6.0-cve-2014-8141.patch # FS#43300
+	patch -i ../unzip-6.0-cve-2014-8139.patch # FS#43300
+	patch -p1 -i ../unzip-6.0-heap-overflow-infloop.patch # FS#46955
 }
 
 build() {