Commit in zlib/trunk (PKGBUILD)
Date: Wednesday, May 17, 2023 @ 18:16:01 Author: dvzrv Revision: 477993 Update maintainer info. Modified: zlib/trunk/PKGBUILD --+ PKGBUILD |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2023-05-17 18:14:52 UTC (rev 477992) +++ PKGBUILD2023-05-17 18:16:01 UTC (rev 477993) @@ -1,4 +1,6 @@ -# Maintainer: Pierre Schmitz +# Maintainer: David Runge +# Maintainer: Levente Polyak +# Contributor: Pierre Schmitz pkgbase=zlib pkgname=(zlib minizip)
Commit in zlib/trunk (PKGBUILD)
Date: Wednesday, May 17, 2023 @ 18:14:52 Author: dvzrv Revision: 477992 Move autoreconf call to prepare(). Modified: zlib/trunk/PKGBUILD --+ PKGBUILD | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2023-05-17 18:07:24 UTC (rev 477991) +++ PKGBUILD2023-05-17 18:14:52 UTC (rev 477992) @@ -18,6 +18,13 @@ 'SKIP') validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') +prepare() { + cd $pkgbase-$pkgver/contrib/minizip + cp Makefile Makefile.orig + cp ../README.contrib readme.txt + autoreconf -fiv +} + build() { cd $pkgbase-$pkgver @@ -26,9 +33,6 @@ make cd contrib/minizip - cp Makefile Makefile.orig - cp ../README.contrib readme.txt - autoreconf --install ./configure --prefix=/usr --enable-static=no make }
Commit in zlib/trunk (PKGBUILD)
Date: Wednesday, May 17, 2023 @ 18:07:24 Author: dvzrv Revision: 477991 Remove extraction of LICENSE file, as one is included. Modified: zlib/trunk/PKGBUILD --+ PKGBUILD |4 1 file changed, 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2023-05-17 18:01:59 UTC (rev 477990) +++ PKGBUILD2023-05-17 18:07:24 UTC (rev 477991) @@ -18,10 +18,6 @@ 'SKIP') validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') -prepare() { - grep -A 24 '^ Copyright' $pkgbase-$pkgver/zlib.h > LICENSE -} - build() { cd $pkgbase-$pkgver
Commit in zlib/trunk (PKGBUILD)
Date: Wednesday, May 17, 2023 @ 18:01:59 Author: dvzrv Revision: 477990 Remove use of srcdir and remove hardcoding of directory names. Modified: zlib/trunk/PKGBUILD --+ PKGBUILD | 21 - 1 file changed, 8 insertions(+), 13 deletions(-) Modified: PKGBUILD === --- PKGBUILD2023-05-17 17:39:48 UTC (rev 477989) +++ PKGBUILD2023-05-17 18:01:59 UTC (rev 477990) @@ -19,12 +19,11 @@ validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') prepare() { - cd "${srcdir}/zlib-$pkgver" - grep -A 24 '^ Copyright' zlib.h > LICENSE + grep -A 24 '^ Copyright' $pkgbase-$pkgver/zlib.h > LICENSE } build() { - cd "${srcdir}/zlib-$pkgver" + cd $pkgbase-$pkgver CFLAGS+=" -ffat-lto-objects" ./configure --prefix=/usr @@ -39,19 +38,16 @@ } check() { - cd "${srcdir}/zlib-$pkgver" - make test + make test -C $pkgbase-$pkgver - cd contrib/minizip - make -f Makefile.orig test + make -f Makefile.orig test -C $pkgbase-$pkgver/contrib/minizip } package_zlib() { pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' - cd "${srcdir}/zlib-$pkgver" - make install DESTDIR="${pkgdir}" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/zlib/LICENSE" + make install DESTDIR="${pkgdir}" -C $pkgbase-$pkgver + install -D -m644 $pkgbase-$pkgver/LICENSE -t "${pkgdir}/usr/share/licenses/$pkgname/" } package_minizip() { @@ -58,9 +54,8 @@ pkgdesc='Mini zip and unzip based on zlib' depends=('zlib') - cd "${srcdir}/zlib-$pkgver/contrib/minizip" - make install DESTDIR="${pkgdir}" - install -D -m644 "${srcdir}/zlib-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/minizip/LICENSE" + make install DESTDIR="${pkgdir}" -C $pkgbase-$pkgver/contrib/$pkgname + install -D -m644 $pkgbase-$pkgver/LICENSE -t "${pkgdir}/usr/share/licenses/$pkgname/" # https://github.com/madler/zlib/pull/229 rm "${pkgdir}/usr/include/minizip/crypt.h"
Commit in zlib/trunk (PKGBUILD)
Date: Wednesday, May 17, 2023 @ 17:39:48 Author: dvzrv Revision: 477989 Replace tabs with spaces. Modified: zlib/trunk/PKGBUILD --+ PKGBUILD | 54 +++--- 1 file changed, 27 insertions(+), 27 deletions(-) Modified: PKGBUILD === --- PKGBUILD2023-05-17 17:29:26 UTC (rev 477988) +++ PKGBUILD2023-05-17 17:39:48 UTC (rev 477989) @@ -19,49 +19,49 @@ validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') prepare() { - cd "${srcdir}/zlib-$pkgver" - grep -A 24 '^ Copyright' zlib.h > LICENSE + cd "${srcdir}/zlib-$pkgver" + grep -A 24 '^ Copyright' zlib.h > LICENSE } build() { - cd "${srcdir}/zlib-$pkgver" + cd "${srcdir}/zlib-$pkgver" - CFLAGS+=" -ffat-lto-objects" - ./configure --prefix=/usr - make + CFLAGS+=" -ffat-lto-objects" + ./configure --prefix=/usr + make - cd contrib/minizip - cp Makefile Makefile.orig - cp ../README.contrib readme.txt - autoreconf --install - ./configure --prefix=/usr --enable-static=no - make + cd contrib/minizip + cp Makefile Makefile.orig + cp ../README.contrib readme.txt + autoreconf --install + ./configure --prefix=/usr --enable-static=no + make } check() { - cd "${srcdir}/zlib-$pkgver" - make test + cd "${srcdir}/zlib-$pkgver" + make test - cd contrib/minizip - make -f Makefile.orig test + cd contrib/minizip + make -f Makefile.orig test } package_zlib() { - pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' + pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' - cd "${srcdir}/zlib-$pkgver" - make install DESTDIR="${pkgdir}" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/zlib/LICENSE" + cd "${srcdir}/zlib-$pkgver" + make install DESTDIR="${pkgdir}" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/zlib/LICENSE" } package_minizip() { - pkgdesc='Mini zip and unzip based on zlib' - depends=('zlib') + pkgdesc='Mini zip and unzip based on zlib' + depends=('zlib') - cd "${srcdir}/zlib-$pkgver/contrib/minizip" - make install DESTDIR="${pkgdir}" - install -D -m644 "${srcdir}/zlib-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/minizip/LICENSE" + cd "${srcdir}/zlib-$pkgver/contrib/minizip" + make install DESTDIR="${pkgdir}" + install -D -m644 "${srcdir}/zlib-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/minizip/LICENSE" - # https://github.com/madler/zlib/pull/229 - rm "${pkgdir}/usr/include/minizip/crypt.h" + # https://github.com/madler/zlib/pull/229 + rm "${pkgdir}/usr/include/minizip/crypt.h" }
Commit in zlib/trunk (PKGBUILD)
Date: Thursday, November 17, 2022 @ 16:40:24 Author: heftig Revision: 462084 1.2.13-2: enable debug Modified: zlib/trunk/PKGBUILD --+ PKGBUILD |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-11-17 16:39:42 UTC (rev 462083) +++ PKGBUILD2022-11-17 16:40:24 UTC (rev 462084) @@ -4,12 +4,15 @@ pkgname=(zlib minizip) epoch=1 pkgver=1.2.13 -pkgrel=1 +pkgrel=2 arch=('x86_64') license=('custom') url="https://www.zlib.net/; depends=('glibc') -options=('staticlibs') # needed by binutils testsuite +options=( + 'staticlibs' # needed by binutils testsuite + 'debug' +) source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc}) sha256sums=('b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30' 'SKIP')
Commit in zlib/trunk (PKGBUILD)
Date: Thursday, October 13, 2022 @ 21:29:59 Author: anthraxx Revision: 458153 upgpkg: zlib 1:1.2.13-1 Modified: zlib/trunk/PKGBUILD --+ PKGBUILD | 23 +-- 1 file changed, 5 insertions(+), 18 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-10-13 21:25:43 UTC (rev 458152) +++ PKGBUILD2022-10-13 21:29:59 UTC (rev 458153) @@ -3,34 +3,21 @@ pkgbase=zlib pkgname=(zlib minizip) epoch=1 -pkgver=1.2.12 -pkgrel=3 +pkgver=1.2.13 +pkgrel=1 arch=('x86_64') license=('custom') url="https://www.zlib.net/; depends=('glibc') options=('staticlibs') # needed by binutils testsuite -source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc} - $pkgname-handle-incorrect-crc-inputs.patch::https://github.com/madler/zlib/commit/ec3df00224d4.patch - $pkgname-CVE-2022-37434.patch::https://github.com/madler/zlib/commit/eff308af425b67093bab25f80f1ae950166bece1.patch - $pkgname-CVE-2022-37434-fix.patch::https://github.com/madler/zlib/commit/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch) -sha256sums=('91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9' -'SKIP' -'00e023c3ccb7b895ebb3421970b1b77f8a527b40190f35050b79fd0e817a7b0c' -'0bf4794975bd3be95f3f1d92cdf781a26c937d5c879b72939ae9cffbf6c430c7' -'db41b76fd40bdc77b26e9a202177cee807da5e7cf751e72298d62742c349057d') +source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc}) +sha256sums=('b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30' +'SKIP') validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') prepare() { cd "${srcdir}/zlib-$pkgver" grep -A 24 '^ Copyright' zlib.h > LICENSE - - # https://github.com/madler/zlib/issues/613 - patch -Np1 -i ../$pkgname-handle-incorrect-crc-inputs.patch - - # CVE-2022-37434 - patch -Np1 -i ../$pkgname-CVE-2022-37434.patch - patch -Np1 -i ../$pkgname-CVE-2022-37434-fix.patch } build() {
Commit in zlib/trunk (PKGBUILD)
Date: Wednesday, October 12, 2022 @ 23:03:27 Author: anthraxx Revision: 457805 upgpkg: zlib 1:1.2.12-3: security release CVE-2022-37434 Modified: zlib/trunk/PKGBUILD --+ PKGBUILD | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-10-12 22:52:59 UTC (rev 457804) +++ PKGBUILD2022-10-12 23:03:27 UTC (rev 457805) @@ -4,7 +4,7 @@ pkgname=(zlib minizip) epoch=1 pkgver=1.2.12 -pkgrel=2 +pkgrel=3 arch=('x86_64') license=('custom') url="https://www.zlib.net/; @@ -11,10 +11,14 @@ depends=('glibc') options=('staticlibs') # needed by binutils testsuite source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc} - $pkgname-handle-incorrect-crc-inputs.patch::https://github.com/madler/zlib/commit/ec3df00224d4.patch) + $pkgname-handle-incorrect-crc-inputs.patch::https://github.com/madler/zlib/commit/ec3df00224d4.patch + $pkgname-CVE-2022-37434.patch::https://github.com/madler/zlib/commit/eff308af425b67093bab25f80f1ae950166bece1.patch + $pkgname-CVE-2022-37434-fix.patch::https://github.com/madler/zlib/commit/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch) sha256sums=('91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9' 'SKIP' -'00e023c3ccb7b895ebb3421970b1b77f8a527b40190f35050b79fd0e817a7b0c') +'00e023c3ccb7b895ebb3421970b1b77f8a527b40190f35050b79fd0e817a7b0c' +'0bf4794975bd3be95f3f1d92cdf781a26c937d5c879b72939ae9cffbf6c430c7' +'db41b76fd40bdc77b26e9a202177cee807da5e7cf751e72298d62742c349057d') validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') prepare() { @@ -23,6 +27,10 @@ # https://github.com/madler/zlib/issues/613 patch -Np1 -i ../$pkgname-handle-incorrect-crc-inputs.patch + + # CVE-2022-37434 + patch -Np1 -i ../$pkgname-CVE-2022-37434.patch + patch -Np1 -i ../$pkgname-CVE-2022-37434-fix.patch } build() {
[arch-commits] Commit in zlib/trunk (PKGBUILD)
Date: Sunday, April 24, 2022 @ 06:20:33 Author: foutrelis Revision: 443862 upgpkg: zlib 1:1.2.12-2: fix CRC issue on some CPUs (FS#74371) Modified: zlib/trunk/PKGBUILD --+ PKGBUILD | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-04-23 22:05:45 UTC (rev 443861) +++ PKGBUILD2022-04-24 06:20:33 UTC (rev 443862) @@ -4,20 +4,25 @@ pkgname=(zlib minizip) epoch=1 pkgver=1.2.12 -pkgrel=1 +pkgrel=2 arch=('x86_64') license=('custom') url="https://www.zlib.net/; depends=('glibc') options=('staticlibs') # needed by binutils testsuite -source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc}) +source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc} + $pkgname-handle-incorrect-crc-inputs.patch::https://github.com/madler/zlib/commit/ec3df00224d4.patch) sha256sums=('91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9' -'SKIP') +'SKIP' +'00e023c3ccb7b895ebb3421970b1b77f8a527b40190f35050b79fd0e817a7b0c') validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') prepare() { cd "${srcdir}/zlib-$pkgver" grep -A 24 '^ Copyright' zlib.h > LICENSE + + # https://github.com/madler/zlib/issues/613 + patch -Np1 -i ../$pkgname-handle-incorrect-crc-inputs.patch } build() {
[arch-commits] Commit in zlib/trunk (PKGBUILD)
Date: Monday, March 28, 2022 @ 15:16:11 Author: pierre Revision: 440765 upgpkg: zlib 1:1.2.12-1 Modified: zlib/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-03-28 14:11:03 UTC (rev 440764) +++ PKGBUILD2022-03-28 15:16:11 UTC (rev 440765) @@ -3,8 +3,8 @@ pkgbase=zlib pkgname=(zlib minizip) epoch=1 -pkgver=1.2.11 -pkgrel=5 +pkgver=1.2.12 +pkgrel=1 arch=('x86_64') license=('custom') url="https://www.zlib.net/; @@ -11,7 +11,7 @@ depends=('glibc') options=('staticlibs') # needed by binutils testsuite source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc}) -sha256sums=('c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1' +sha256sums=('91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9' 'SKIP') validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA')
[arch-commits] Commit in zlib/trunk (PKGBUILD)
Date: Sunday, December 26, 2021 @ 09:15:22 Author: pierre Revision: 433118 upgpkg: zlib 1:1.2.11-5 Modified: zlib/trunk/PKGBUILD --+ PKGBUILD |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2021-12-26 08:25:45 UTC (rev 433117) +++ PKGBUILD2021-12-26 09:15:22 UTC (rev 433118) @@ -4,7 +4,7 @@ pkgname=(zlib minizip) epoch=1 pkgver=1.2.11 -pkgrel=4 +pkgrel=5 arch=('x86_64') license=('custom') url="https://www.zlib.net/; @@ -22,6 +22,8 @@ build() { cd "${srcdir}/zlib-$pkgver" + + CFLAGS+=" -ffat-lto-objects" ./configure --prefix=/usr make
[arch-commits] Commit in zlib/trunk (PKGBUILD)
Date: Saturday, January 16, 2021 @ 13:07:24 Author: pierre Revision: 406304 Use more modern checksums Modified: zlib/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-01-16 13:06:49 UTC (rev 406303) +++ PKGBUILD2021-01-16 13:07:24 UTC (rev 406304) @@ -11,8 +11,8 @@ depends=('glibc') options=('staticlibs') # needed by binutils testsuite source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc}) -md5sums=('1c9f62f0778697a09d36121ead88e08e' - 'SKIP') +sha256sums=('c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1' +'SKIP') validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') prepare() {
[arch-commits] Commit in zlib/trunk (PKGBUILD)
Date: Saturday, January 16, 2021 @ 12:55:05 Author: pierre Revision: 406298 Quote paths Modified: zlib/trunk/PKGBUILD --+ PKGBUILD | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-01-16 12:53:20 UTC (rev 406297) +++ PKGBUILD2021-01-16 12:55:05 UTC (rev 406298) @@ -16,12 +16,12 @@ validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') prepare() { - cd ${srcdir}/zlib-$pkgver + cd "${srcdir}/zlib-$pkgver" grep -A 24 '^ Copyright' zlib.h > LICENSE } build() { - cd ${srcdir}/zlib-$pkgver + cd "${srcdir}/zlib-$pkgver" ./configure --prefix=/usr make @@ -34,7 +34,7 @@ } check() { - cd ${srcdir}/zlib-$pkgver + cd "${srcdir}/zlib-$pkgver" make test cd contrib/minizip @@ -44,9 +44,9 @@ package_zlib() { pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' - cd ${srcdir}/zlib-$pkgver - make install DESTDIR=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/zlib/LICENSE + cd "${srcdir}/zlib-$pkgver" + make install DESTDIR="${pkgdir}" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/zlib/LICENSE" } package_minizip() { @@ -53,10 +53,10 @@ pkgdesc='Mini zip and unzip based on zlib' depends=('zlib') - cd ${srcdir}/zlib-$pkgver/contrib/minizip - make install DESTDIR=${pkgdir} - install -D -m644 ${srcdir}/zlib-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/minizip/LICENSE + cd "${srcdir}/zlib-$pkgver/contrib/minizip" + make install DESTDIR="${pkgdir}" + install -D -m644 "${srcdir}/zlib-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/minizip/LICENSE" # https://github.com/madler/zlib/pull/229 - rm ${pkgdir}/usr/include/minizip/crypt.h + rm "${pkgdir}/usr/include/minizip/crypt.h" }