From 55d535af8275f568bc584b0072f61289d2f6c555 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Mon, 21 Aug 2023 02:30:15 +0300 Subject: [PATCH] upg gzip zlib --- gzip/PKGBUILD | 18 +++++++++--------- gzip/PKGBUILD-arch | 6 +++--- gzip/time | 8 +++++--- zlib/PKGBUILD | 20 ++++++++++---------- zlib/PKGBUILD-arch | 41 +++++++++++++++++++++++------------------ 5 files changed, 50 insertions(+), 43 deletions(-) diff --git a/gzip/PKGBUILD b/gzip/PKGBUILD index 4c99f75..e8b88dc 100644 --- a/gzip/PKGBUILD +++ b/gzip/PKGBUILD @@ -6,16 +6,14 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=gzip -pkgver=1.12 -pkgrel=03 +pkgver=1.13 +pkgrel=01 pkgdesc='GNU compression utility' -arch=('x86_64') url='https://www.gnu.org/software/gzip/' depends=('glibc' 'bash' 'coreutils' 'sed' 'grep') optdepends=('less: zless support' 'more: zmore support' - 'diffutils: zdiff/zcmp support' - ) + 'diffutils: zdiff/zcmp support') source=("https://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz"{,.sig}) prepare() { @@ -47,14 +45,16 @@ package() { make prefix="$pkgdir/usr" install } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('GPL3') validpgpkeys=('155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering -sha256sums=(ce5e03e519f637e1f814011ace35c4f87b33c0bbabeec35baf5fbd3479e91956 # gzip-1.12.tar.xz - 3ed9ab54452576e0be0d477c772c9f47baa36415133fef7dd1fcf7b15480ba32) # gzip-1.12.tar.xz.sig +sha256sums=(7454eb6935db17c6655576c2e1b0fabefd38b4d0936e0f87f48cd062ce91a057 # gzip-1.13.tar.xz + aa752d6460fff2e0064857f1c6057d2dc49a28a45ad28c6b29c525851d6771f1) # gzip-1.13.tar.xz.sig -## e373f543d2c8f504f5ac10fe06d0aa6b25b36ce5b3d4395b06f4fa847331479d gzip-1.12-03-x86_64.pkg.tar.lz +## c8b3ad1254aefa236e59e56d1fcc7d6daca205a311acc9d9cb6a2cf89c3ab8bc gzip-1.13-01-x86_64.pkg.tar.lz diff --git a/gzip/PKGBUILD-arch b/gzip/PKGBUILD-arch index abb48a6..34c025c 100644 --- a/gzip/PKGBUILD-arch +++ b/gzip/PKGBUILD-arch @@ -3,8 +3,8 @@ # Contributor: judd pkgname=gzip -pkgver=1.12 -pkgrel=3 +pkgver=1.13 +pkgrel=1 pkgdesc='GNU compression utility' arch=('x86_64') url='https://www.gnu.org/software/gzip/' @@ -16,7 +16,7 @@ optdepends=('less: zless support' ) validpgpkeys=('155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering source=("https://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz"{,.sig}) -sha256sums=('ce5e03e519f637e1f814011ace35c4f87b33c0bbabeec35baf5fbd3479e91956' +sha256sums=('7454eb6935db17c6655576c2e1b0fabefd38b4d0936e0f87f48cd062ce91a057' 'SKIP') prepare() { cd $pkgname-$pkgver diff --git a/gzip/time b/gzip/time index c26c7c8..0f3a647 100644 --- a/gzip/time +++ b/gzip/time @@ -1,4 +1,6 @@ -real 0m16.855s -user 0m19.545s -sys 0m2.763 + +real 0m48.277s +user 0m41.571s +sys 0m5.484s + diff --git a/zlib/PKGBUILD b/zlib/PKGBUILD index 28a9c75..0b5212d 100644 --- a/zlib/PKGBUILD +++ b/zlib/PKGBUILD @@ -7,9 +7,10 @@ pkgbase=zlib pkgname=(zlib minizip) +pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' epoch=1 -pkgver=1.2.13 -pkgrel=03 +pkgver=1.3 +pkgrel=01 url="https://www.zlib.net/" depends=('glibc') makedepends=('automake' 'autoconf') @@ -61,20 +62,19 @@ package_minizip() { arch=(x86_64) -license=('custom') +#license=('custom') +license=(Zlib) validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') -sha256sums=(b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 # zlib-1.2.13.tar.gz - 1263ec60e148a1cf8de3894418df79a6c8bc95f211af92731da0f04170f8b0ac) # zlib-1.2.13.tar.gz.asc - -## e46172298b68e56b19b38cdfb57187b0e6690d00033297fe3c710e175e9ab6ec minizip-1:1.2.13-03-x86_64.pkg.tar.lz -## 69cb255bc9ae0a31ea470a95371b25afb957bf97d4c874916ef93b386a24e827 zlib-1:1.2.13-03-x86_64.pkg.tar.lz - +sha256sums=(ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e # zlib-1.3.tar.gz + bf1e20cc852e179fa38093565c3910d5ad9cd44eee4c45dd7e5445adcc0be1c3) # zlib-1.3.tar.gz.asc +## 0859981253c09aac897d298b7ebed07bf9f9dd53f9283a866eecbd53c9aca624 minizip-1:1.3-01-x86_64.pkg.tar.lz +## ca8dd48ebcbf0ae6e2fb07df4259178cd37da7ed7f569f7722bb0e79b712a94d zlib-1:1.3-01-x86_64.pkg.tar.lz # Note to packager: ls -l *pkg.tar.lz echo "you must rename this package to meet SF naming before you move to the repo" -mv $(ls -l $pkgname*pkg.tar.lz) $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz >pkg-mv.log +echo "mv $pkgname-$epoch:$pkgver-$pkgrel-$arch.pkg.tar.lz $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz" diff --git a/zlib/PKGBUILD-arch b/zlib/PKGBUILD-arch index 27ec2e7..819a26a 100644 --- a/zlib/PKGBUILD-arch +++ b/zlib/PKGBUILD-arch @@ -5,20 +5,22 @@ pkgbase=zlib pkgname=(zlib minizip) epoch=1 -pkgver=1.2.13 -pkgrel=3 -arch=('x86_64') -license=('custom') +pkgver=1.3 +pkgrel=1 +pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' +arch=(x86_64) +license=(Zlib) url="https://www.zlib.net/" -depends=('glibc') options=( - 'staticlibs' # needed by binutils testsuite - 'debug' + staticlibs # needed by binutils testsuite + debug ) -source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc}) -sha256sums=('b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30' +source=(https://github.com/madler/zlib/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc}) +sha512sums=('3868ac4da5842dd36c9dad794930675b9082ce15cbd099ddb79c0f6bd20a24aa8f33a123f378f26fe0ae02d91f31f2994dccaac565cedeaffed7b315e6ded2a2' 'SKIP') -validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') +b2sums=('5fe0f32339267348a313f23a21e9588bdb180b7415be303c85f5f169444d019e5f176ef7322f6e64297c360acc2a6041c50e2f66d1860e5c392d8970990f176a' + 'SKIP') +validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') # Mark Adler prepare() { cd $pkgbase-$pkgver/contrib/minizip @@ -46,20 +48,23 @@ check() { } package_zlib() { - pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' - provides=('libz.so') + depends=(glibc) + provides=(libz.so) - make install DESTDIR="${pkgdir}" -C $pkgbase-$pkgver - install -D -m644 $pkgbase-$pkgver/LICENSE -t "${pkgdir}/usr/share/licenses/$pkgname/" + make install DESTDIR="$pkgdir" -C $pkgbase-$pkgver + install -D -m644 $pkgbase-$pkgver/LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/" } package_minizip() { pkgdesc='Mini zip and unzip based on zlib' - depends=('zlib') + depends=( + glibc + zlib + ) - make install DESTDIR="${pkgdir}" -C $pkgbase-$pkgver/contrib/$pkgname - install -D -m644 $pkgbase-$pkgver/LICENSE -t "${pkgdir}/usr/share/licenses/$pkgname/" + 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" + rm "$pkgdir/usr/include/minizip/crypt.h" }