add more missing patch and notes

2 files changed, 22 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ae8bff71c01..b3c6481a1084 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = unzip-iconv
 	pkgdesc = Unpacks .zip archives such as those made by PKZIP. With iconv patch for -O / -I goodness.
 	pkgver = 6.0
-	pkgrel = 8
+	pkgrel = 9
 	url = http://www.info-zip.org/UnZip.html
 	arch = i686
 	arch = x86_64
@@ -27,10 +27,12 @@ pkgbase = unzip-iconv
 	source = CVE-2019-13232_p3.patch::http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/CVE-2019-13232_p3.patch
 	source = http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/fix-security-format.patch
 	source = http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/symlink.patch
+	source = http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/avoid-strip.patch
+	source = http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/define-ldflags.patch
 	sha256sums = 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37
-	sha256sums = 1333a0d14e8f59c3a114764bf008ae489d386fd561130a60c1c7f2f4c9386b9b
-	sha256sums = 1a1390390402e674ef7b143705ade0e9aa082131bb9686e95fb7985310def885
-	sha256sums = 04e72b17f46bc320fff871f2b99f48dca17befceac83a7caca719bc20dae6268
+	sha256sums = d628193875fd6881d8797cfc7fabda6ff21558550e830bd6aa9cefd49af5df15
+	sha256sums = aea4d52e2a328a22674f030c27492592e8edaf945e77ea63240df296e902fdc1
+	sha256sums = ae5b9f43dd5960cb4d40c639b6dc6ade34bba6dba62a7d8830657785964db1b1
 	sha256sums = ccdbae7d75b135f2471964bc8314457959563658b2d410f3026e2cd9e1944a8f
 	sha256sums = 8eb5dedf36e37b986acc42d1a8b6701b7429d32e426a90f5b41d6004ffe0aa46
 	sha256sums = bae6410203af2d5b32f427cba8dffe381b6f5adc52bf9f87a9655b3d2374f801
@@ -44,6 +46,8 @@ pkgbase = unzip-iconv
 	sha256sums = 31a312410454738f994dc881c32b020b6051cfdf769bcc69f9f680428ea508fe
 	sha256sums = 035f179c634149158645bd54aa4bef270e7422af14e9693431e19a9219dbbeaa
 	sha256sums = ac5e55017484f62381c86e81b462ddbf1cb09bd3282289cfe4df804788e14d20
+	sha256sums = 666a2f8cf805105c283aca5cd15089c97365d89d3d2561fe8057c9c2b99d12f7
+	sha256sums = 55a4f15716cdeb55275365a9d7446cf64150116ac6c8dd03ce6dd84466694f3d
 
 pkgname = unzip-iconv
 
diff --git a/PKGBUILD b/PKGBUILD
index 67ea03597ff4..0f7a30eaccf2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=unzip-iconv
 pkgver=6.0
-pkgrel=8
+pkgrel=9
 pkgdesc="Unpacks .zip archives such as those made by PKZIP. With iconv patch for -O / -I goodness."
 arch=('i686' 'x86_64')
 url='http://www.info-zip.org/UnZip.html'
@@ -18,8 +18,8 @@ provides=('unzip')
 conflicts=('unzip')
 source=("http://downloads.sourceforge.net/infozip/unzip${pkgver/./}.tar.gz"
         'CVE-2014-8139.patch::http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch' # https://bugzilla.redhat.com/attachment.cgi?id=990132
-        'CVE-2014-8140.patch::http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch' # https://bugzilla.redhat.com/attachment.cgi?id=969621
-        'CVE-2014-8141.patch::http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch' # https://bugzilla.redhat.com/attachment.cgi?id=969625
+        'CVE-2014-8140.patch::http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch' # https://bugzilla.redhat.com/attachment.cgi?id=969621 (needs -Np0)
+        'CVE-2014-8141.patch::http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch' # https://bugzilla.redhat.com/attachment.cgi?id=969625 (needs -Np0)
         'CVE-2014-9636.patch::http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/cve-2014-9636.patch'
         'CVE-2014-9913.patch::http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/18-cve-2014-9913-unzip-buffer-overflow.patch'
         'CVE-2016-9844.patch::http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/19-cve-2016-9844-zipinfo-buffer-overflow.patch'
@@ -33,11 +33,13 @@ source=("http://downloads.sourceforge.net/infozip/unzip${pkgver/./}.tar.gz"
         'CVE-2019-13232_p3.patch::http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/CVE-2019-13232_p3.patch'
         'http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/fix-security-format.patch'
         'http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/symlink.patch'
+        'http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/avoid-strip.patch'
+        'http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/unzip/unzip/define-ldflags.patch'
         )
 sha256sums=('036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37'
-            '1333a0d14e8f59c3a114764bf008ae489d386fd561130a60c1c7f2f4c9386b9b'
-            '1a1390390402e674ef7b143705ade0e9aa082131bb9686e95fb7985310def885'
-            '04e72b17f46bc320fff871f2b99f48dca17befceac83a7caca719bc20dae6268'
+            'd628193875fd6881d8797cfc7fabda6ff21558550e830bd6aa9cefd49af5df15'
+            'aea4d52e2a328a22674f030c27492592e8edaf945e77ea63240df296e902fdc1'
+            'ae5b9f43dd5960cb4d40c639b6dc6ade34bba6dba62a7d8830657785964db1b1'
             'ccdbae7d75b135f2471964bc8314457959563658b2d410f3026e2cd9e1944a8f'
             '8eb5dedf36e37b986acc42d1a8b6701b7429d32e426a90f5b41d6004ffe0aa46'
             'bae6410203af2d5b32f427cba8dffe381b6f5adc52bf9f87a9655b3d2374f801'
@@ -51,14 +53,16 @@ sha256sums=('036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37'
             '31a312410454738f994dc881c32b020b6051cfdf769bcc69f9f680428ea508fe'
             '035f179c634149158645bd54aa4bef270e7422af14e9693431e19a9219dbbeaa'
             'ac5e55017484f62381c86e81b462ddbf1cb09bd3282289cfe4df804788e14d20'
+            '666a2f8cf805105c283aca5cd15089c97365d89d3d2561fe8057c9c2b99d12f7'
+            '55a4f15716cdeb55275365a9d7446cf64150116ac6c8dd03ce6dd84466694f3d'
             )
 
 prepare() {
   cd "unzip${pkgver/./}"
 
   patch -Np1 -i "${srcdir}/CVE-2014-8139.patch"                              # FS#43300
-  patch -Np0 -i "${srcdir}/CVE-2014-8140.patch"                              # FS#43391
-  patch -Np0 -i "${srcdir}/CVE-2014-8141.patch"                              # FS#43300
+  patch -Np1 -i "${srcdir}/CVE-2014-8140.patch"                              # FS#43391
+  patch -Np1 -i "${srcdir}/CVE-2014-8141.patch"                              # FS#43300
   patch -Np1 -i "${srcdir}/CVE-2014-9636.patch"                              # FS#44171
   patch -Np1 -i "${srcdir}/iconv-utf8+CVE-2015-1315.patch"                   # iconv patch + CEV 2015-1315 fix http://seclists.org/oss-sec/2015/q1/579
   patch -Np1 -i "${srcdir}/CVE-2015-7696.patch"                              # FS#46955
@@ -70,6 +74,8 @@ prepare() {
   patch -Np1 -i "${srcdir}/CVE-2019-13232_p3.patch"
   patch -Np1 -i "${srcdir}/fix-security-format.patch"
   patch -Np1 -i "${srcdir}/symlink.patch"
+  patch -Np1 -i "${srcdir}/avoid-strip.patch"
+  patch -Np1 -i "${srcdir}/define-ldflags.patch"
 }
 
 build() {