diff --git a/archlinux-keyring/PKGBUILD b/archlinux-keyring/PKGBUILD index d692d03..ef64e2c 100644 --- a/archlinux-keyring/PKGBUILD +++ b/archlinux-keyring/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=archlinux-keyring -_tag='cee1de41bcb8a3b4bd50f3b7874d037e57edd548' # git rev-parse ${pkgver} -pkgver=20230223 +_tag='06a97e2e7c7017c384d5afaeda7a34d53125d602' # git rev-parse ${pkgver} +pkgver=20230225 pkgrel=01 pkgdesc='Arch Linux PGP keyring' arch=(any) @@ -54,4 +54,5 @@ validpgpkeys=('02FD1C7A934E614545849F19A6234074498E9CEE' # Christian Hesse pkgname=archlinux-keyring -_tag='cee1de41bcb8a3b4bd50f3b7874d037e57edd548' # git rev-parse ${pkgver} -pkgver=20230223 +_tag='06a97e2e7c7017c384d5afaeda7a34d53125d602' # git rev-parse ${pkgver} +pkgver=20230225 pkgrel=1 pkgdesc='Arch Linux PGP keyring' arch=('any') diff --git a/autoconf/PKGBUILD b/autoconf/PKGBUILD index 6cb9de3..81269ad 100644 --- a/autoconf/PKGBUILD +++ b/autoconf/PKGBUILD @@ -1,19 +1,25 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run +# Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=autoconf pkgver=2.71 -pkgrel=02 +pkgrel=03 pkgdesc="A GNU tool for automatically configuring source code" -arch=('any') url="https://www.gnu.org/software/autoconf" groups=('base-devel') depends=('awk' 'm4' 'diffutils' 'perl' 'sh') checkdepends=('gcc-fortran') -source=("https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}) +source=("https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig} + $pkgname-2.71-bash5.2.patch::https://github.com/autotools-mirror/autoconf/commit/412166e185c00d6eacbe67dfcb0326f622ec4020.patch ) + +prepare() { + # fix build for bash >= 5.2 + patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-2.71-bash5.2.patch +} build() { cd "${pkgname}-${pkgver}" @@ -24,8 +30,9 @@ build() { check() { cd "${pkgname}-${pkgver}" - # test 310 is a false positive due to warning outputted with our build flags - make check || true + # disable test 227 as it is broken + make check TESTSUITEFLAGS="1-226 228-" + } package() { @@ -39,12 +46,17 @@ package() { rm -f "$pkgdir"/usr/share/info/standards.info } -#---- license gpg-key sha256sums ---- + +#---- arch license gpg-key and sha256sums ---- + +arch=(x86_64) license=('GPL2' 'GPL3' 'custom') validpgpkeys=('82F854F3CE73174B8B63174091FCC32B6769AA64') # Zack Weinberg -sha256sums=(f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4 # autoconf-2.71.tar.xz - f33796ff686c45ee946d5862f46b776cf69cad68bf6861ce20847459a3a18a44) # autoconf-2.71.tar.xz.sig +sha256sums=(f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4 # autoconf-2.71.tar.xz + f33796ff686c45ee946d5862f46b776cf69cad68bf6861ce20847459a3a18a44 # autoconf-2.71.tar.xz.sig + ee07bb3f9692bed2b7689bd361ae4e2e9a1bd852864a0c98f90b7b4c8beddfe4) # autoconf-2.71-bash5.2.patch +## 75d63016160c4a14718d3dcbdafc5a6a6278dccb010d5159ef1e0075e02a57d7 autoconf-2.71-03-x86_64.pkg.tar.lz diff --git a/autoconf/PKGBUILD-arch b/autoconf/PKGBUILD-arch index fee77cf..6c4c9a6 100644 --- a/autoconf/PKGBUILD-arch +++ b/autoconf/PKGBUILD-arch @@ -4,7 +4,7 @@ pkgname=autoconf pkgver=2.71 -pkgrel=1 +pkgrel=3 pkgdesc="A GNU tool for automatically configuring source code" arch=('any') license=('GPL2' 'GPL3' 'custom') @@ -12,11 +12,19 @@ url="https://www.gnu.org/software/autoconf" groups=('base-devel') depends=('awk' 'm4' 'diffutils' 'perl' 'sh') checkdepends=('gcc-fortran') -source=("https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}) -md5sums=('12cfa1687ffa2606337efe1a64416106' - 'SKIP') +source=( + "https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig} + $pkgname-2.71-bash5.2.patch::https://github.com/autotools-mirror/autoconf/commit/412166e185c00d6eacbe67dfcb0326f622ec4020.patch +) +sha256sums=('f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4' + 'SKIP' + 'ee07bb3f9692bed2b7689bd361ae4e2e9a1bd852864a0c98f90b7b4c8beddfe4') validpgpkeys=('82F854F3CE73174B8B63174091FCC32B6769AA64') # Zack Weinberg +prepare() { + # fix build for bash >= 5.2 + patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-2.71-bash5.2.patch +} build() { cd "${pkgname}-${pkgver}" @@ -26,9 +34,8 @@ build() { check() { cd "${pkgname}-${pkgver}" - - # test 310 is a false positive due to warning outputted with our build flags - make check || true + # disable test 227 as it is broken + make check TESTSUITEFLAGS="1-226 228-" } package() { diff --git a/autoconf/autoconf-2.71-bash5.2.patch b/autoconf/autoconf-2.71-bash5.2.patch new file mode 100644 index 0000000..5f35ace --- /dev/null +++ b/autoconf/autoconf-2.71-bash5.2.patch @@ -0,0 +1,62 @@ +From 412166e185c00d6eacbe67dfcb0326f622ec4020 Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao +Date: Fri, 30 Sep 2022 11:36:03 -0400 +Subject: [PATCH] Fix testsuite failures with bash 5.2. + +Bash v5.2 includes several new optimizations to the number of +subshells used for various constructs; as a side effect, the value of +SHLVL is less stable than it used to be. Add SHLVL to the list of +built-in shell variables with unstable values, to be ignored when +checking for inappropriate differences to the shell environment +before and after a macro invocation / between two configure runs. + +Problem and solution reported by Xi Ruoyao in +https://lists.gnu.org/archive/html/autoconf/2022-09/msg00015.html +Problem also reported by Bruce Dubbs in +https://lists.gnu.org/archive/html/bug-autoconf/2022-09/msg00010.html + +* tests/local.at (_AT_CHECK_ENV, AT_CONFIG_CMP): Ignore changes in + value of SHLVL. +Copyright-paperwork-exempt: yes +--- + tests/local.at | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tests/local.at b/tests/local.at +index 193fd118..a9cf4050 100644 +--- a/tests/local.at ++++ b/tests/local.at +@@ -352,7 +352,7 @@ m4_define([AT_CHECK_CONFIGURE], + # - AC_SUBST'ed variables + # (FIXME: Generate a list of these automatically.) + # - _|@|.[*#?$].|argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS +-# |START_TIME|ToD|_AST_FEATURES ++# |SHLVL|START_TIME|ToD|_AST_FEATURES + # Some variables some shells use and change. + # '.[*#?$].' catches '$#' etc. which are displayed like this: + # | '!'=18186 +@@ -404,7 +404,7 @@ if test -f state-env.before && test -f state-env.after; then + [GREP|[EF]GREP|SED], + [[_@]|.[*@%:@?$].], + [argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM], +- [SECONDS|START_TIME|ToD|_AST_FEATURES]))=' \ ++ [SECONDS|SHLVL|START_TIME|ToD|_AST_FEATURES]))=' \ + $act_file || + test $? -eq 1 || echo failed >&2 + ) 2>stderr-$act_file | +@@ -435,6 +435,7 @@ fi + # - PPID [bash, zsh] + # - RANDOM [bash, zsh] + # - SECONDS [bash, zsh] ++# - SHLVL [bash] + # - START_TIME [NetBSD sh] + # - ToD [NetBSD sh] + # - '$' [zsh] +@@ -483,6 +484,7 @@ do + /^PPID=/ d + /^RANDOM=/ d + /^SECONDS=/ d ++ /^SHLVL=/ d + /^START_TIME=/ d + /^ToD=/ d + /'\'\\\$\''=/ d diff --git a/autoconf/time b/autoconf/time index 17a7700..5141469 100644 --- a/autoconf/time +++ b/autoconf/time @@ -1,4 +1,6 @@ -real 15m50.056s -user 13m31.633s -sys 1m51.727s + +real 23m24.353s +user 20m2.992s +sys 2m53.220s + diff --git a/make/PKGBUILD b/make/PKGBUILD index 480afe3..e2c9253 100644 --- a/make/PKGBUILD +++ b/make/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=make -pkgver=4.4 +pkgver=4.4.1 pkgrel=01 pkgdesc="GNU make utility to maintain groups of programs" arch=('x86_64') @@ -37,7 +37,8 @@ license=('GPL3') validpgpkeys=('6D4EEB02AD834703510B117680CB727A20C79BB2') # Paul Smith -sha256sums=(48d0fc0b2a04bb50f2911c16da65723285f7f4804c74fc5a2124a3df6c5f78c4 # make-4.4.tar.lz - 9e929a01572ff1878fd4f79d65622a0d4df1e74a05c6e797b27d19b00691f814) # make-4.4.tar.lz.sig +sha256sums=(8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9 # make-4.4.1.tar.lz + ce4acf9c93e686a8e365f4adc21e8c36575ef9bbeeb2bd8437f215005078a14f) # make-4.4.1.tar.lz.sig +## f71d50b9a082a726caf22b560008e4847243ae5754cceb5dfe082eea6fc6c435 make-4.4.1-01-x86_64.pkg.tar.lz diff --git a/make/PKGBUILD-arch b/make/PKGBUILD-arch index 747a0c0..d808df3 100644 --- a/make/PKGBUILD-arch +++ b/make/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: judd pkgname=make -pkgver=4.4 +pkgver=4.4.1 pkgrel=1 pkgdesc="GNU make utility to maintain groups of programs" arch=('x86_64') @@ -12,7 +12,7 @@ license=('GPL3') groups=('base-devel') depends=('glibc' 'guile') source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.lz"{,.sig}) -sha256sums=('48d0fc0b2a04bb50f2911c16da65723285f7f4804c74fc5a2124a3df6c5f78c4' +sha256sums=('8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9' 'SKIP') validpgpkeys=('6D4EEB02AD834703510B117680CB727A20C79BB2') # Paul Smith diff --git a/pacman-mirrorlist/PKGBUILD b/pacman-mirrorlist/PKGBUILD index c58ef42..dd21f0b 100644 --- a/pacman-mirrorlist/PKGBUILD +++ b/pacman-mirrorlist/PKGBUILD @@ -6,10 +6,9 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=pacman-mirrorlist -pkgver=20221204 +pkgver=20230226 pkgrel=01 pkgdesc="Arch Linux mirror list for use by pacman HTTPS ONLY" -arch=('any') url="https://www.archlinux.org/mirrorlist/" backup=(etc/pacman.d/mirrorlist) #source=(mirrorlist) @@ -33,11 +32,13 @@ package() { install -m644 "$srcdir/mirrorlist-https" "$pkgdir/etc/pacman.d/mirrorlist" } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=('any') license=('GPL') -sha256sums=(08362bba956e2bf029325941d64ca240c52359e75c3dc06593ab14e4b602a836) # mirrorlist +sha256sums=(aaa43f97adf0e0a5bbf8f2668237aa1d7aa35fd6e99d639602aabde09756c392) # mirrorlist +## 5db9c32f7376cd4e0f86dac19d1fce1177d8043ccad6d19024a4b5c8c3bbae1f pacman-mirrorlist-20230226-01-any.pkg.tar.lz -## ce7574d498f8300326b10ef310c65c82729b5aa8e4d93eff6b9e2cbcb1cf9731 pacman-mirrorlist-20221204-01-any.pkg.tar.xz diff --git a/pacman-mirrorlist/PKGBUILD-arch b/pacman-mirrorlist/PKGBUILD-arch index 33fcb89..e0f9005 100644 --- a/pacman-mirrorlist/PKGBUILD-arch +++ b/pacman-mirrorlist/PKGBUILD-arch @@ -2,7 +2,7 @@ # Contributor: Dan McGee pkgname=pacman-mirrorlist -pkgver=20221204 +pkgver=20230226 pkgrel=1 pkgdesc="Arch Linux mirror list for use by pacman" arch=('any') @@ -27,5 +27,5 @@ package() { install -m644 "$srcdir/mirrorlist" "$pkgdir/etc/pacman.d/" } -md5sums=('aa3b76f7e99b013751541d721862c906') -sha256sums=('08362bba956e2bf029325941d64ca240c52359e75c3dc06593ab14e4b602a836') +md5sums=('8509a072494866a4d5092ff3350cdaf6') +sha256sums=('aaa43f97adf0e0a5bbf8f2668237aa1d7aa35fd6e99d639602aabde09756c392')