From 78f80f0300442b148852ba4c3cff0c771b61132d Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Wed, 22 Mar 2023 02:17:31 +0200 Subject: [PATCH] upg archlinux-keyring bison cryptsetup curl gpgme lvm2 --- archlinux-keyring/PKGBUILD | 7 +++---- archlinux-keyring/PKGBUILD-arch | 4 ++-- bison/PKGBUILD | 12 ++++++++---- bison/PKGBUILD-arch | 9 ++++----- bison/time | 9 ++++++--- cryptsetup/PKGBUILD | 7 +++---- cryptsetup/PKGBUILD-arch | 4 ++-- cryptsetup/install-sd-encrypt | 2 +- curl/PKGBUILD | 11 +++++------ curl/PKGBUILD-arch | 4 ++-- gpgme/PKGBUILD | 15 ++++++++------- gpgme/PKGBUILD-arch | 5 +++-- lvm2/PKGBUILD | 8 ++++---- lvm2/PKGBUILD-arch | 4 ++-- 14 files changed, 53 insertions(+), 48 deletions(-) diff --git a/archlinux-keyring/PKGBUILD b/archlinux-keyring/PKGBUILD index ef64e2c..384f507 100644 --- a/archlinux-keyring/PKGBUILD +++ b/archlinux-keyring/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=archlinux-keyring -_tag='06a97e2e7c7017c384d5afaeda7a34d53125d602' # git rev-parse ${pkgver} -pkgver=20230225 +_tag='4910f7835c9786342a3c93d66383dbbc9c1395df' # git rev-parse ${pkgver} +pkgver=20230320 pkgrel=01 pkgdesc='Arch Linux PGP keyring' arch=(any) @@ -54,5 +54,4 @@ validpgpkeys=('02FD1C7A934E614545849F19A6234074498E9CEE' # Christian Hesse pkgname=archlinux-keyring -_tag='06a97e2e7c7017c384d5afaeda7a34d53125d602' # git rev-parse ${pkgver} -pkgver=20230225 +_tag='4910f7835c9786342a3c93d66383dbbc9c1395df' # git rev-parse ${pkgver} +pkgver=20230320 pkgrel=1 pkgdesc='Arch Linux PGP keyring' arch=('any') diff --git a/bison/PKGBUILD b/bison/PKGBUILD index b17042a..da4c6cd 100644 --- a/bison/PKGBUILD +++ b/bison/PKGBUILD @@ -7,12 +7,10 @@ pkgname=bison pkgver=3.8.2 -pkgrel=04 +pkgrel=05 pkgdesc="The GNU general-purpose parser generator" -arch=('x86_64') url="https://www.gnu.org/software/bison/bison.html" depends=('glibc' 'm4' 'sh' 'gettext') -groups=('base-devel') source=("https://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz"{,.sig}) build() { @@ -32,7 +30,9 @@ package() { make DESTDIR="${pkgdir}" install } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('GPL3') @@ -40,3 +40,7 @@ validpgpkeys=('7DF84374B1EE1F9764BBE25D0DDCAA3278D5264E') # Akim Demaille sha256sums=(9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2 # bison-3.8.2.tar.xz aeff6fd7d7d7cad905ba3bc5228a2ccb95500c0f51fb4483e229c47c7c50f835) # bison-3.8.2.tar.xz.sig + + +## 6fd67770e1628a59eee2085b56e815b1df1640b01796facdd37b700671536a7a bison-3.8.2-05-x86_64.pkg.tar.lz + diff --git a/bison/PKGBUILD-arch b/bison/PKGBUILD-arch index d8be9be..55b6fab 100644 --- a/bison/PKGBUILD-arch +++ b/bison/PKGBUILD-arch @@ -4,20 +4,19 @@ pkgname=bison pkgver=3.8.2 -pkgrel=4 +pkgrel=5 pkgdesc="The GNU general-purpose parser generator" arch=('x86_64') license=('GPL3') url="https://www.gnu.org/software/bison/bison.html" depends=('glibc' 'm4' 'sh' 'gettext') -groups=('base-devel') source=("https://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz"{,.sig}) sha512sums=('d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e677445df8b2327aacccc15344acbbc3808a6f332a93cce23b444' 'SKIP') validpgpkeys=('7DF84374B1EE1F9764BBE25D0DDCAA3278D5264E') # Akim Demaille build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" CFLAGS+=' -ffat-lto-objects' \ ./configure --prefix=/usr --datadir=/usr/share @@ -25,11 +24,11 @@ build() { } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/bison/time b/bison/time index 97cfd6f..0430f18 100644 --- a/bison/time +++ b/bison/time @@ -1,3 +1,6 @@ -real 8m28.387s -user 30m32.463s -sys 1m33.920s + + +real 21m54.643s +user 20m42.356s +sys 1m14.659s + diff --git a/cryptsetup/PKGBUILD b/cryptsetup/PKGBUILD index feb1de3..a0804ce 100644 --- a/cryptsetup/PKGBUILD +++ b/cryptsetup/PKGBUILD @@ -7,7 +7,7 @@ pkgname=cryptsetup pkgver=2.6.1 -pkgrel=02 +pkgrel=03 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' url='https://gitlab.com/cryptsetup/cryptsetup/' depends=('device-mapper' 'libdevmapper.so' 'openssl' 'popt' 'util-linux-libs' @@ -59,7 +59,6 @@ sha256sums=(410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693 # 13847ffd76ccf3e8f359992f20f72213d4df7ddc955f40cc97923d393f76d6e8 # cryptsetup-2.6.1.tar.sign 839e961e053512293052250b424f38c347cb46c14cbd51d7e2705b3f5378ec02 # hooks-encrypt 2b71c6c56ef81e5bf4f49dcc08dbd1651b46bda51a8f75a0a342b344b2d0eccd # install-encrypt - 0105a26b58b4c271b0f7b65405b96b47014a4a517fc752cf1af8f6c556d2ea87) # install-sd-encrypt - -## 8dbae24de155020fc98c67d9cb209bbe1ffaadc123a68a8d23cacff8555350f9 cryptsetup-2.6.1-02-x86_64.pkg.tar.lz + ec983a55b09dd512ab5b2f329fe611cb10478e4cc1cd3bb65848cf234dcfebd8) # install-sd-encrypt +## 7298a88b3bc180a556311c39fe51ede4e35f4182307bc10810e211079b2e3887 cryptsetup-2.6.1-03-x86_64.pkg.tar.lz diff --git a/cryptsetup/PKGBUILD-arch b/cryptsetup/PKGBUILD-arch index 4441b80..a4f1b7d 100644 --- a/cryptsetup/PKGBUILD-arch +++ b/cryptsetup/PKGBUILD-arch @@ -3,7 +3,7 @@ pkgname=cryptsetup pkgver=2.6.1 -pkgrel=2 +pkgrel=3 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) license=('GPL') @@ -22,7 +22,7 @@ sha256sums=('410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693' 'SKIP' '839e961e053512293052250b424f38c347cb46c14cbd51d7e2705b3f5378ec02' '2b71c6c56ef81e5bf4f49dcc08dbd1651b46bda51a8f75a0a342b344b2d0eccd' - '0105a26b58b4c271b0f7b65405b96b47014a4a517fc752cf1af8f6c556d2ea87') + 'ec983a55b09dd512ab5b2f329fe611cb10478e4cc1cd3bb65848cf234dcfebd8') build() { cd "${srcdir}"/$pkgname-${pkgver} diff --git a/cryptsetup/install-sd-encrypt b/cryptsetup/install-sd-encrypt index 8bdaaf2..ca68f53 100644 --- a/cryptsetup/install-sd-encrypt +++ b/cryptsetup/install-sd-encrypt @@ -38,7 +38,7 @@ build() { add_binary '/usr/lib/ossl-modules/legacy.so' # add libraries dlopen()ed by systemd-cryptsetup - for FILE in $(find /usr/lib/ -maxdepth 1 -name "libfido.so*"); do + for FILE in $(find /usr/lib/ -maxdepth 1 -name "libfido2.so*"); do if [[ -L "${FILE}" ]]; then add_symlink "${FILE}" else diff --git a/curl/PKGBUILD b/curl/PKGBUILD index 8be0064..8f12cec 100644 --- a/curl/PKGBUILD +++ b/curl/PKGBUILD @@ -7,9 +7,8 @@ pkgbase=curl pkgname=(curl libcurl-compat libcurl-gnutls) -#pkgver=7.88.1 -_tag='741b214c095c688961ac847e86babfd68299e4ce' # git rev-parse v${_tag_name} -_tag_name='8_0_0' +_tag='6b77e19466486b37f93d07d2107579f9508a6645' # git rev-parse v${_tag_name} +_tag_name='8_0_1' pkgver="${_tag_name//_/.}" pkgrel=01 pkgdesc='command line tool and library for transferring data with URLs - w/o ipv6 & zstd' @@ -179,8 +178,8 @@ validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg sha256sums=(SKIP) -## 94dcd7e3964ea4a9644da8bca780ddd027378d2e5331c9f15443f07581686d60 curl-8.0.0-01-x86_64.pkg.tar.lz -## 48034bc4245c21c1a8cf53e590ab73f1ff6209dafe6405c1d87cf3258cd8dacd libcurl-compat-8.0.0-01-x86_64.pkg.tar.lz -## 53cdbaa260f4e2297b22bb2dc9906e14bb934dcfbaae32d0b978233a33d0cd91 libcurl-gnutls-8.0.0-01-x86_64.pkg.tar.lz +## cf875e586093856f255c8521a0e17e4524a53ba20ef9c9792e6a50e880e8d5ee curl-8.0.1-01-x86_64.pkg.tar.lz +## 17bdf19848f37459a4002f2168d8773831794dc4fa90e0512d2db9eebcf3d8fd libcurl-compat-8.0.1-01-x86_64.pkg.tar.lz +## cdb760b04e2b0d72ffc75ec337ad1fa2b5c67a8d18d159b0c2b29c5b9e7fbd55 libcurl-gnutls-8.0.1-01-x86_64.pkg.tar.lz diff --git a/curl/PKGBUILD-arch b/curl/PKGBUILD-arch index 3e90d0c..e879fdc 100644 --- a/curl/PKGBUILD-arch +++ b/curl/PKGBUILD-arch @@ -6,8 +6,8 @@ pkgbase=curl pkgname=(curl libcurl-compat libcurl-gnutls) -_tag='741b214c095c688961ac847e86babfd68299e4ce' # git rev-parse v${_tag_name} -_tag_name='8_0_0' +_tag='6b77e19466486b37f93d07d2107579f9508a6645' # git rev-parse v${_tag_name} +_tag_name='8_0_1' pkgver="${_tag_name//_/.}" pkgrel=1 pkgdesc='command line tool and library for transferring data with URLs' diff --git a/gpgme/PKGBUILD b/gpgme/PKGBUILD index de5044b..8706f7a 100644 --- a/gpgme/PKGBUILD +++ b/gpgme/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=gpgme pkgname=(gpgme qgpgme python-gpgme) pkgver=1.19.0 -pkgrel=02 +pkgrel=03 pkgdesc="A C wrapper library for GnuPG" #options=('debug') ## uncomment this to have the debug pkg produced url='https://www.gnupg.org/related_software/gpgme/' @@ -34,9 +34,11 @@ build() { ( # use a PEP517 workflow to get a reproducible Python package - cd lang/python/ - python -m build --wheel --no-isolation + # NOTE: top_builddir is required so that the build takes place against local gpgme, not system gpgme + cd lang/python/ + top_builddir="$srcdir/$pkgbase-$pkgver" python -m build --wheel --no-isolation ) + } check() { @@ -96,8 +98,7 @@ validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist sig sha256sums=(cb58494dc415fba9eeb12b826550ad3190dc92e265c5bb2ae1a21c92841cfd38 # gpgme-1.19.0.tar.bz2 eee2bab6a0ba332c86150c8440c3ec9f12e61b0047713a6663bb2c83b80b2926) # gpgme-1.19.0.tar.bz2.sig -## b21def79f924a1623950493bc4a5142ea890fc7f60d26c0247ae4672bc9db111 gpgme-1.19.0-02-x86_64.pkg.tar.lz -## c7d49cd681fba0729ec404e74d09bbc16fbacc0d8f062cdc3c84236f42d92713 python-gpgme-1.19.0-02-x86_64.pkg.tar.lz -## f2bd084c203731573dddf5b1e276da55e3861886cec36cc3751e5a70565d0ac9 qgpgme-1.19.0-02-x86_64.pkg.tar.lz - +## a2b52fa0edc0ac5354014761d727045b31e11d5b72204d0a98f90ea60494a930 gpgme-1.19.0-03-x86_64.pkg.tar.lz +## 143f9864b1b1220ba00b9359fe959f8759ca9478e7cba7dc570f9f0e812d4de2 python-gpgme-1.19.0-03-x86_64.pkg.tar.lz +## 2a55f39e2f477a19fffbf41a3922b801a8c073c9d0f5fd0149067b74bf35ee45 qgpgme-1.19.0-03-x86_64.pkg.tar.lz diff --git a/gpgme/PKGBUILD-arch b/gpgme/PKGBUILD-arch index 9929572..435571f 100644 --- a/gpgme/PKGBUILD-arch +++ b/gpgme/PKGBUILD-arch @@ -5,7 +5,7 @@ pkgbase=gpgme pkgname=(gpgme qgpgme python-gpgme) pkgver=1.19.0 -pkgrel=2 +pkgrel=3 pkgdesc='A C wrapper library for GnuPG' arch=('x86_64') url='https://www.gnupg.org/related_software/gpgme/' @@ -39,8 +39,9 @@ build() { ( # use a PEP517 workflow to get a reproducible Python package + # NOTE: top_builddir is required so that the build takes place against local gpgme, not system gpgme cd lang/python/ - python -m build --wheel --no-isolation + top_builddir="$srcdir/$pkgbase-$pkgver" python -m build --wheel --no-isolation ) } diff --git a/lvm2/PKGBUILD b/lvm2/PKGBUILD index f6d03c4..9dd74dc 100644 --- a/lvm2/PKGBUILD +++ b/lvm2/PKGBUILD @@ -7,8 +7,8 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -_tag='8a84d53c113371f1908325dbada488c233f04e97' # git rev-parse v${pkgver//./_} -pkgver=2.03.19 +_tag='aba3b33d3778ad28b445130ebaa8efca4ddba844' # git rev-parse v${pkgver//./_} +pkgver=2.03.20 pkgrel=01 arch=('x86_64') url='https://sourceware.org/lvm2/' @@ -134,6 +134,6 @@ sha256sums=(SKIP def6e03aa1629bbc0ca1ee5e84e620366daf779f037eab2fda47487a8471729b # lvm2_install e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0) # 11-dm-initramfs.rules -## 05ca7e0ce074ee15364c601f8be983aa84f64c4deea24a4bc45b6f0566f38bfe device-mapper-2.03.19-01-x86_64.pkg.tar.lz -## 9f9c65cc1234f84ca58fc816c433e2d3f3ffeb7688417c353679de0143df4129 lvm2-2.03.19-01-x86_64.pkg.tar.lz +## 6dd05162e48c8559660a8b84d80b7579ea10501535f138f59530592505b01cc9 device-mapper-2.03.20-01-x86_64.pkg.tar.lz +## 83d77b7ffbadb25e269b21fe3ab1b9935f82dec92bd608b5f7d901a8d58511d9 lvm2-2.03.20-01-x86_64.pkg.tar.lz diff --git a/lvm2/PKGBUILD-arch b/lvm2/PKGBUILD-arch index 9329963..762dfb6 100644 --- a/lvm2/PKGBUILD-arch +++ b/lvm2/PKGBUILD-arch @@ -3,8 +3,8 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -_tag='8a84d53c113371f1908325dbada488c233f04e97' # git rev-parse v${pkgver//./_} -pkgver=2.03.19 +_tag='aba3b33d3778ad28b445130ebaa8efca4ddba844' # git rev-parse v${pkgver//./_} +pkgver=2.03.20 pkgrel=1 arch=('x86_64') url='https://sourceware.org/lvm2/'