From 2ba85b85b7d9a61eb72a632460251d343449ca33 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Thu, 16 Feb 2023 02:25:49 +0200 Subject: [PATCH] upg git lighttpd python-setuptools sane --- git/PKGBUILD | 10 ++++++---- git/PKGBUILD-arch | 4 ++-- lighttpd/PKGBUILD | 12 +++++++----- lighttpd/PKGBUILD-arch | 4 ++-- python-setuptools/PKGBUILD | 14 +++++++------- python-setuptools/PKGBUILD-arch | 9 +++++---- sane/PKGBUILD | 9 ++++++--- sane/PKGBUILD-arch | 7 +++++-- 8 files changed, 40 insertions(+), 29 deletions(-) diff --git a/git/PKGBUILD b/git/PKGBUILD index f362b59..7a135b9 100644 --- a/git/PKGBUILD +++ b/git/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=git -pkgver=2.39.1 +pkgver=2.39.2 pkgrel=01 pkgdesc='the fast distributed version control system w/o systemd' arch=('x86_64') @@ -127,8 +127,10 @@ license=('GPL2') validpgpkeys=('96E07AF25771955980DAD10020D04E5A713660A7') # Junio C Hamano -sha256sums=(40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161 # git-2.39.1.tar.xz - f647af355cbaa5a73e6be7a029b8134d99373cbb91460e78f365086d14a76eb2 # git-2.39.1.tar.sign +sha256sums=(475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6 # git-2.39.2.tar.xz + 55a24131e4f46f94d782ad0246a8d886f3b7cb3c40a3c1394227ede68734dc41 # git-2.39.2.tar.sign 7630e8245526ad80f703fac9900a1328588c503ce32b37b9f8811674fcda4a45) # git-sysusers.conf - +## 97f483a2aee0351f43b99d4c921e62293a334c1811c64bf7aac98a4cbe0f4993 git-2.39.2-01-x86_64.pkg.tar.lz + + diff --git a/git/PKGBUILD-arch b/git/PKGBUILD-arch index 60b3233..bf533af 100644 --- a/git/PKGBUILD-arch +++ b/git/PKGBUILD-arch @@ -2,7 +2,7 @@ # Maintainer: Dan McGee pkgname=git -pkgver=2.39.1 +pkgver=2.39.2 pkgrel=1 pkgdesc='the fast distributed version control system' arch=('x86_64') @@ -30,7 +30,7 @@ source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar."{xz,sign} 'git-daemon@.service' 'git-daemon.socket' 'git-sysusers.conf') -sha256sums=('40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161' +sha256sums=('475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6' 'SKIP' '14c0b67cfe116b430645c19d8c4759419657e6809dfa28f438c33a005245ad91' 'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203' diff --git a/lighttpd/PKGBUILD b/lighttpd/PKGBUILD index 9877b00..5c169b6 100644 --- a/lighttpd/PKGBUILD +++ b/lighttpd/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=lighttpd -pkgver=1.4.68 +pkgver=1.4.69 pkgrel=01 pkgdesc='A secure, fast, compliant and very flexible web-server w/o systemd' arch=('x86_64') @@ -74,10 +74,12 @@ validpgpkeys=('C7CA1E9E29DC77F5480894B2E0E7D0171E95BAD7' '649D0DD767FF206202A76C5158F14A786FE198C8' 'EAAF41A8BE3BB8D001CACD136DE62CA242909B84') -sha256sums=(e56f37ae52b63e1ada4d76ce78005affb6e56eea2f6bdb0ce17d6d36e9583384 # lighttpd-1.4.68.tar.xz - a74ebaf2b8d523885b48396e97057507289d60b51646f3f7510a52b56f4e0273 # lighttpd-1.4.68.tar.xz.asc +sha256sums=(16ac8db95e719629ba61949b99f8a26feba946a81d185215b28379bb4116b0b4 # lighttpd-1.4.68.tar.xz + 979ea8150d2fac7e4420a3a25d9d94b73465b45c3ad674cbbb2f9f5e06ffe0ed # lighttpd-1.4.69.tar.xz.asc 41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe # lighttpd.logrotate.d fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f # lighttpd.conf d8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871) # lighttpd.tmpfiles - - + +## aaa6868aae8bd36485678cbd74a250f305ba9619bad5d7f84b1a52007190eeb1 lighttpd-1.4.69-01-x86_64.pkg.tar.lz + + diff --git a/lighttpd/PKGBUILD-arch b/lighttpd/PKGBUILD-arch index 689ccd8..4127345 100644 --- a/lighttpd/PKGBUILD-arch +++ b/lighttpd/PKGBUILD-arch @@ -1,7 +1,7 @@ # Maintainer: Pierre Schmitz pkgname=lighttpd -pkgver=1.4.68 +pkgver=1.4.69 pkgrel=1 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') @@ -17,7 +17,7 @@ backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd') options=('emptydirs') source=("https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"{,.asc} 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service') -sha256sums=('e56f37ae52b63e1ada4d76ce78005affb6e56eea2f6bdb0ce17d6d36e9583384' +sha256sums=('16ac8db95e719629ba61949b99f8a26feba946a81d185215b28379bb4116b0b4' 'SKIP' '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe' 'fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f' diff --git a/python-setuptools/PKGBUILD b/python-setuptools/PKGBUILD index 1f47675..2ce5f82 100644 --- a/python-setuptools/PKGBUILD +++ b/python-setuptools/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=python-setuptools -pkgver=67.2.0 -_commit=f75c6289666ae845b80f1666ea68ec0f28afcc73 +pkgver=67.3.0 +_commit=bd37bfc622a6f2220c2e4e30b18f2cd2904b7da6 pkgrel=01 epoch=1 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages" @@ -90,7 +90,7 @@ check() { ( # cd setuptools-$pkgver cd setuptools - # 1: subtle difference introduced by devendoring + # 1,4: subtle difference introduced by devendoring # rest: skipping broken tests using "setuptools_sdist", "setuptools_wheel" (or "venv" which uses the latter) # and fails with pip # 2: pip failures related to devendoring, @@ -98,7 +98,9 @@ check() { ( PYTHONPATH="$PWD"/build/lib python -m pytest \ --deselect setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg \ --deselect setuptools/tests/test_virtualenv.py \ - --deselect setuptools/tests/test_editable_install.py::test_editable_with_prefix + --deselect setuptools/tests/test_editable_install.py::test_editable_with_prefix \ + --deselect setuptools/_normalization.py::setuptools._normalization.safe_version + )} package() { @@ -115,6 +117,4 @@ sha256sums=(SKIP 06e2f68aebedbaeb0b0fe923eae686568910cc3355b33bf619db9266eef83efb # system-validate-pyproject.patch a2bc8b9d470c13b4cb682ab3943e80ab2841aae98f7c3d9ba1f089408f96aa91) # add-dependency.patch -# 1c812f993e76980d4839bd2d7ee0e43051ec6e59f07a2e107d82d8eb2650c9be python-setuptools-1:67.2.0-01-any.pkg.tar.lz - - +## cc214eb002ecf4fdd6e0de15119300c89cf7beac9774b08e3ad3af9638dd8f81 python-setuptools-1:67.3.0-01-any.pkg.tar.lz diff --git a/python-setuptools/PKGBUILD-arch b/python-setuptools/PKGBUILD-arch index 9ad4dee..cd5488a 100644 --- a/python-setuptools/PKGBUILD-arch +++ b/python-setuptools/PKGBUILD-arch @@ -3,8 +3,8 @@ # Contributor: Eli Schwartz pkgname=python-setuptools -pkgver=67.2.0 -_commit=f75c6289666ae845b80f1666ea68ec0f28afcc73 +pkgver=67.3.0 +_commit=bd37bfc622a6f2220c2e4e30b18f2cd2904b7da6 pkgrel=1 epoch=1 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages" @@ -82,13 +82,14 @@ check() { ( export PYTHONDONTWRITEBYTECODE=1 cd setuptools - # 1: subtle difference introduced by devendoring + # 1,4: subtle difference introduced by devendoring # 2: pip failures related to devendoring, # 3: TODO PYTHONPATH="$PWD"/build/lib python -m pytest \ --deselect setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg \ --deselect setuptools/tests/test_virtualenv.py \ - --deselect setuptools/tests/test_editable_install.py::test_editable_with_prefix + --deselect setuptools/tests/test_editable_install.py::test_editable_with_prefix \ + --deselect setuptools/_normalization.py::setuptools._normalization.safe_version )} package() { diff --git a/sane/PKGBUILD b/sane/PKGBUILD index 5e24972..8300ff1 100644 --- a/sane/PKGBUILD +++ b/sane/PKGBUILD @@ -8,7 +8,7 @@ _name=backends pkgname=sane pkgver=1.2.1 -pkgrel=02 +pkgrel=03 pkgdesc="Scanner Access Now Easy w/o systemd or avahi" arch=(x86_64) url="http://www.sane-project.org/" @@ -27,6 +27,9 @@ source=(https://gitlab.com/sane-project/$_name/-/archive/$pkgver/$_name-$pkgver. prepare() { cd $_name-$pkgver + # copy translation files so they become reproducible: https://gitlab.com/sane-project/backends/-/issues/647 + cp -v po/en{_GB,@quot}.po + cp -v po/en{_GB,@boldquot}.po # create version files, so that autotools macros can use them: # https://gitlab.com/sane-project/backends/-/issues/440 printf "%s\n" "$pkgver" > .tarball-version @@ -91,7 +94,7 @@ package() { cd "$pkgdir" # trick extract_function_variable() in makepkg into not detecting the # backup array modification and adding remaining configuration files - [[ /usr/bin/true ]] && backup=( ${backup[@]} $(find "etc/${pkgname}.d/" -type f) ) + [[ /usr/bin/true ]] && backup=( ${backup[@]} $(find "etc/${pkgname}.d/" -type f | sort) ) } @@ -103,6 +106,6 @@ sha256sums=(11be4ef05a61277d18698c2c9d86495dff97557bc8da7af44e3f6ef5154e9ea8 # 0e98982ff1550b16b098f7563569c203aab5f7b4172717bec0d42eab15fb875b # 66-saned.rules ac9183a0f4379106550c972374b8e36277d8e7f480ca931f0af87550892942e7) # sane.sysusers -## 95e6dc6a128cbe5f6f505913a1db505ba881039799b4f689f2f89772d80ad095 sane-1.2.1-02-x86_64.pkg.tar.lz +## 0f510a2544745974408340b90b57dfc540e48c6efde65cddf4aa0279316ed224 sane-1.2.1-03-x86_64.pkg.tar.lz diff --git a/sane/PKGBUILD-arch b/sane/PKGBUILD-arch index b3b9d46..0f325d9 100644 --- a/sane/PKGBUILD-arch +++ b/sane/PKGBUILD-arch @@ -7,7 +7,7 @@ _name=backends pkgname=sane pkgver=1.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="Scanner Access Now Easy" arch=(x86_64) url="http://www.sane-project.org/" @@ -58,6 +58,9 @@ b2sums=('b12a629bab6e79d9027d9e90cfa5851ee172a7a1eb6303666c294e2a3d881e2afbef9a3 prepare() { cd $_name-$pkgver + # copy translation files so they become reproducible: https://gitlab.com/sane-project/backends/-/issues/647 + cp -v po/en{_GB,@quot}.po + cp -v po/en{_GB,@boldquot}.po # create version files, so that autotools macros can use them: # https://gitlab.com/sane-project/backends/-/issues/440 printf "%s\n" "$pkgver" > .tarball-version @@ -132,5 +135,5 @@ package() { cd "$pkgdir" # trick extract_function_variable() in makepkg into not detecting the # backup array modification and adding remaining configuration files - [[ /usr/bin/true ]] && backup=( ${backup[@]} $(find "etc/${pkgname}.d/" -type f) ) + [[ /usr/bin/true ]] && backup=( ${backup[@]} $(find "etc/${pkgname}.d/" -type f | sort) ) }