diff --git a/git/PKGBUILD b/git/PKGBUILD index 0bb2de3..2342a35 100644 --- a/git/PKGBUILD +++ b/git/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=git -pkgver=2.38.0 +pkgver=2.38.1 pkgrel=01 pkgdesc='the fast distributed version control system w/o systemd' arch=('x86_64') @@ -130,7 +130,8 @@ license=('GPL2') validpgpkeys=('96E07AF25771955980DAD10020D04E5A713660A7') # Junio C Hamano -sha256sums=(923eade26b1814de78d06bda8e0a9f5da8b7c4b304b3f9050ffb464f0310320a # git-2.38.0.tar.xz - c927c1ae1f766a0fd9b19d5cfb1eeb4a04aa7a6cf12718a881f89582644941fa # git-2.38.0.tar.sign - 7630e8245526ad80f703fac9900a1328588c503ce32b37b9f8811674fcda4a45) # git-sysusers.conf - +sha256sums=(97ddf8ea58a2b9e0fbc2508e245028ca75911bd38d1551616b148c1aa5740ad9 # git-2.38.1.tar.xz + ba8ff259cd46f94e73f564d2a8e2f4a4b4545bb55ef7141744793b206eef56f0 # git-2.38.1.tar.sign + 7630e8245526ad80f703fac9900a1328588c503ce32b37b9f8811674fcda4a45) # git-sysusers.conf + + diff --git a/git/PKGBUILD-arch b/git/PKGBUILD-arch index 3d09023..17e0b7d 100644 --- a/git/PKGBUILD-arch +++ b/git/PKGBUILD-arch @@ -2,7 +2,7 @@ # Maintainer: Dan McGee pkgname=git -pkgver=2.38.0 +pkgver=2.38.1 pkgrel=1 pkgdesc='the fast distributed version control system' arch=('x86_64') @@ -31,7 +31,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=('923eade26b1814de78d06bda8e0a9f5da8b7c4b304b3f9050ffb464f0310320a' +sha256sums=('97ddf8ea58a2b9e0fbc2508e245028ca75911bd38d1551616b148c1aa5740ad9' 'SKIP' '14c0b67cfe116b430645c19d8c4759419657e6809dfa28f438c33a005245ad91' 'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203' diff --git a/git/deps b/git/deps index 70770f4..b5b7563 100644 --- a/git/deps +++ b/git/deps @@ -8,4 +8,3 @@ gettext - diff --git a/libpciaccess/PKGBUILD b/libpciaccess/PKGBUILD index 8b4fe0a..dafb94a 100644 --- a/libpciaccess/PKGBUILD +++ b/libpciaccess/PKGBUILD @@ -6,36 +6,43 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libpciaccess -pkgver=0.16 -pkgrel=04 +pkgver=0.17 +pkgrel=01 pkgdesc="X11 PCI access library" arch=(x86_64) url="https://xorg.freedesktop.org/" -depends=('glibc') +depends=('glibc' 'zlib') makedepends=('xorg-util-macros') #options=('debug') ### uncomment this to have the debug pkg produced -source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2{,.sig}) +source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.xz{,.sig}) + +prepare() { + mkdir build +} + +check() { + meson test -C build +} build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc - make + arch-meson "$pkgname"-$pkgver build + ninja -C build } package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}/" + DESTDIR="$pkgdir" ninja -C build install + install -Dm644 "$pkgname"-$pkgver/COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}/" } #---- license gpg-key sha256sums ---- license=('custom') -validpgpkeys=(4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E # Alan Coopersmith - 8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D # "Emil Velikov " - 995ED5C8A6138EB0961F18474C09DD83CAAA50B2) # "Adam Jackson " +validpgpkeys=(4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E) # Alan Coopersmith +# 8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D # "Emil Velikov " +# 995ED5C8A6138EB0961F18474C09DD83CAAA50B2) # "Adam Jackson " + +sha256sums=(74283ba3c974913029e7a547496a29145b07ec51732bbb5b5c58d5025ad95b73 # libpciaccess-0.17.tar.xz + 1aa158e9c6fb9108a2c38122861fe51288a8e8d733cc87e1b5ca665d23801f29) # libpciaccess-0.17.tar.xz.sig -sha256sums=(214c9d0d884fdd7375ec8da8dcb91a8d3169f263294c9a90c575bf1938b9f489 # libpciaccess-0.16.tar.bz2 - a370329b40179e301f9b868eb852928474a2de260666b2c6511fdcfa1c13fe81) # libpciaccess-0.16.tar.bz2.sig diff --git a/libpciaccess/PKGBUILD-arch b/libpciaccess/PKGBUILD-arch index 4864baf..b395d92 100644 --- a/libpciaccess/PKGBUILD-arch +++ b/libpciaccess/PKGBUILD-arch @@ -1,31 +1,38 @@ +# Maintainer: Andreas Radke # Contributor: Jan de Groot # Contributor: Alexander Baldeck pkgname=libpciaccess -pkgver=0.16 -pkgrel=4 +pkgver=0.17 +pkgrel=1 pkgdesc="X11 PCI access library" arch=(x86_64) license=('custom') url="https://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-util-macros') +depends=('glibc' 'zlib') +makedepends=('xorg-util-macros' 'meson') options=('debug') -source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2{,.sig}) -sha512sums=('2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1' +source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.xz{,.sig}) +sha512sums=('8484605c66ef18c8d8a3e029a6d33e26fcaa450c1263790d89ac8b0a160ffb2dfceaa6140ac9ad7d8087283ecbec8ac801f757e44890d547c3cbecd2c922ca47' 'SKIP') validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith -validpgpkeys+=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # "Emil Velikov " -validpgpkeys+=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # "Adam Jackson " +#validpgpkeys+=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # "Emil Velikov " +#validpgpkeys+=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # "Adam Jackson " + +prepare() { + mkdir build +} build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc - make + arch-meson "$pkgname"-$pkgver build + ninja -C build +} + +check() { + meson test -C build } package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}/" + DESTDIR="$pkgdir" ninja -C build install + install -Dm644 "$pkgname"-$pkgver/COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/libpciaccess/deps b/libpciaccess/deps index 37342ab..2d096c9 100644 --- a/libpciaccess/deps +++ b/libpciaccess/deps @@ -1 +1,4 @@ xorg-util-macros + + +meson diff --git a/python-setuptools/PKGBUILD b/python-setuptools/PKGBUILD index bedfe7e..1c50865 100644 --- a/python-setuptools/PKGBUILD +++ b/python-setuptools/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=python-setuptools -pkgver=63.4.1 +pkgver=63.4.2 pkgrel=01 epoch=1 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages" @@ -101,7 +101,5 @@ package() { license=('PSF') -sha256sums=(7d6a33596703cef53830bc751043a1e1e8be0264c4a3a937829adff7d9a3de95 # python-setuptools-63.4.1.tar.gz - 3fffbffa0d0116ab64cb1e0e9b33ea28c60147c8f4fdbcfe71fac2adcfedd14a) # system-validate-pyproject.patch - - +sha256sums=(72b3d8769f8db3cbcbd3f70ec5731e4088f852980cc4317253a7533bc8e25d87 # python-setuptools-63.4.2.tar.gz + 06e2f68aebedbaeb0b0fe923eae686568910cc3355b33bf619db9266eef83efb) # system-validate-pyproject.patch diff --git a/python-setuptools/PKGBUILD-arch b/python-setuptools/PKGBUILD-arch index 0c48636..d410653 100644 --- a/python-setuptools/PKGBUILD-arch +++ b/python-setuptools/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: Eli Schwartz pkgname=python-setuptools -pkgver=63.4.1 +pkgver=63.4.2 pkgrel=1 epoch=1 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages" @@ -21,8 +21,8 @@ provides=('python-distribute') replaces=('python-distribute') source=("$pkgname-$pkgver.tar.gz::https://github.com/pypa/setuptools/archive/v$pkgver.tar.gz" system-validate-pyproject.patch) -sha512sums=('a516d99214582b6f501e7bb066a888e6c338ecf2f8c107882191577cd02b13aacd2601fbeb20be9c809cad0cfcce33184c93e1ca7fcef24cd102b6f62842b0f1' - '50495062093b1b6902484c384abe073896e4f45c5768741582e178014367f186831711a72a8a987e7bacafe96d871161fc07c686dd92c6886de19302f6a10b56') +sha512sums=('9c1fa30752a425bfdcaeff4e0ec6b7af2f916dc3f6189ad6827488bead96833af36331f96d93921c65ff88ceb0711f7e9038d3c3dcbcdfb294a31a3f78c8c29b' + '390fea2c575a0042054f51d33e629b04a48f832f0a4a2dd07d34e23cdf330c382dba0f54bfb7c8a6a253bb248a4940f2a789672f715e4dc2aeb395fa185cae7a') export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 diff --git a/python-setuptools/system-validate-pyproject.patch b/python-setuptools/system-validate-pyproject.patch index 342a68d..541f990 100644 --- a/python-setuptools/system-validate-pyproject.patch +++ b/python-setuptools/system-validate-pyproject.patch @@ -26,6 +26,6 @@ index d4024956..2c3bd6bf 100644 - except validator.ValidationError as ex: + return validator(config) + except validate_pyproject.errors.ValidationError as ex: - _logger.error(f"configuration error: {ex.summary}") # type: ignore - _logger.debug(ex.details) # type: ignore - error = ValueError(f"invalid pyproject.toml config: {ex.name}") # type: ignore + summary = f"configuration error: {ex.summary}" + if ex.name.strip("`") != "project": + # Probably it is just a field missing/misnamed, not worthy the verbosity... diff --git a/samba/PKGBUILD b/samba/PKGBUILD index 65a577a..de44603 100644 --- a/samba/PKGBUILD +++ b/samba/PKGBUILD @@ -7,8 +7,8 @@ pkgbase=samba pkgname=('smbclient' 'samba') -pkgver=4.17.0 -pkgrel=02 +pkgver=4.17.1 +pkgrel=01 arch=(x86_64) url="https://www.samba.org" makedepends=('python' 'python-markdown' 'python-dnspython' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' @@ -23,15 +23,14 @@ source=(https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar{.gz,.asc samba.logrotate samba.pam samba.sysconfig - samba.tmpfiles - samba-4.17.0-15195.patch) + samba.tmpfiles) ### UNINSTALL dmapi package before building!!! -prepare() { - cd samba-${pkgver} - patch -Np1 -i ${srcdir}/samba-4.17.0-15195.patch -} +#prepare() { +# cd samba-${pkgver} +# patch -Np1 -i ${srcdir}/samba-4.17.0-15195.patch +#} build() { # Use samba-pkg as a staging directory for the split packages @@ -200,12 +199,11 @@ license=('GPL3') validpgpkeys=('81F5E2832BD2545A1897B713AA99442FB680B620') #Samba Distribution Verification Key -sha256sums=(04868ecda82fcbeda7b8bf519a2461a64d55c6e70efc6f6053b2fbba55f1823a # samba-4.17.0.tar.gz - db1554a07ba58c7754431a8bb63f84230ad5884ecdc00a29042daf3f582e6d86 # samba-4.17.0.tar.asc - 0b570570ea49f82e6f9da47b1cce3b441859f52de105b54d4d79b873b924623f # samba.logrotate - 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5 # samba.pam - f2d11032015ef917f4af50f3933d432fa744b5f846ab4d980247e329e52d34bc # samba.sysconfig - 5398a42ccb36ac3b87cfa42c8050b535efc2ca38ab3b9354a52f4e0fe71b5800 # samba.tmpfiles - 3d57f68f01179dab162cd5e46c6e8e6bbb8a1e9bf59d196f74c1101d733cfb12) # samba-4.17.0-15195.patch +sha256sums=(1b939d03f8ca57194c413ed863014a3850c9ce9f9e31c2a7df706806fba77c01 # samba-4.17.1.tar.gz + c4b3ec76d23064b27e30966408a766439eef9cad54ec5f32d253348c4d5a53f7 # samba-4.17.1.tar.asc 0b570570ea49f82e6f9da47b1cce3b441859f52de105b54d4d79b873b924623f # samba.logrotate + 0b570570ea49f82e6f9da47b1cce3b441859f52de105b54d4d79b873b924623f # samba.logrotate + 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5 # samba.pam + f2d11032015ef917f4af50f3933d432fa744b5f846ab4d980247e329e52d34bc # samba.sysconfig + 5398a42ccb36ac3b87cfa42c8050b535efc2ca38ab3b9354a52f4e0fe71b5800) # samba.tmpfiles diff --git a/samba/PKGBUILD-arch b/samba/PKGBUILD-arch index b6d7fec..8b47013 100644 --- a/samba/PKGBUILD-arch +++ b/samba/PKGBUILD-arch @@ -10,8 +10,8 @@ pkgbase=samba pkgname=('smbclient' 'samba') -pkgver=4.17.0 -pkgrel=2 +pkgver=4.17.1 +pkgrel=1 arch=(x86_64) url="https://www.samba.org" license=('GPL3') @@ -28,22 +28,15 @@ optdepends=( source=(https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar{.gz,.asc} samba.logrotate samba.pam - samba.conf - samba-4.17.0-15195.patch) + samba.conf) validpgpkeys=('81F5E2832BD2545A1897B713AA99442FB680B620') #Samba Distribution Verification Key -sha512sums=('7c590ca2c3e05a52f67c190643819668fd4aeefb251d36c2a9a9b17ce078c0ea2375c4b8bde8a4fabe517465c90ab3a33fd72cf447358c9af89bf7492f7cdaa1' +sha512sums=('b62605caed837e6638f3f87ce73d21976125ec890deca38bde41d3f8e299cc8da268f1b0884845ac947e5cbd29eb1300e36e638d08c38f127d3058dfef9547f8' 'SKIP' '2ba0691ded467e4d6e40821f6de58c00f8962209efe2e60284c0c87756ab471c22c3d63b77d506e48c90ed0d852a2a24e41be1d499cf74a73cb99da0b503c858' '1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67' - 'e46ee848baabb261e7468ecee43aba4d001a24f86f5322ae522abdb75030fd0ebd9063b9df0be3576c4d1654d81331f5e389aee16ec2fa138259ae4728e94efc' - 'd1e9c930de56016dc3cc4c2c2c56d85b100dc06d54bc7045fa4eba13a8c7fa4864c51cc784b002b51fdffa91d817dd3a86d1e3a3afd89fc0866c2676060e5581') + 'e46ee848baabb261e7468ecee43aba4d001a24f86f5322ae522abdb75030fd0ebd9063b9df0be3576c4d1654d81331f5e389aee16ec2fa138259ae4728e94efc') ### UNINSTALL dmapi package before building!!! -prepare() { - cd samba-${pkgver} - patch -Np1 -i ${srcdir}/samba-4.17.0-15195.patch -} - build() { # Use samba-pkg as a staging directory for the split packages # (This is so RPATHS and symlinks are generated correctly via