diff --git a/archlinux-keyring/PKGBUILD b/archlinux-keyring/PKGBUILD index bd78d54..ec4a50e 100644 --- a/archlinux-keyring/PKGBUILD +++ b/archlinux-keyring/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=archlinux-keyring -_tag='548f1786ede03b578e02ccdbc3c5823699f8152c' # git rev-parse ${pkgver} -pkgver=20240208 +_tag='0717024a39e47722c6bf2929a6d3ab1e2f132b9d' # git rev-parse ${pkgver} +pkgver=20240313 pkgrel=01 pkgdesc='Arch Linux PGP keyring' url='https://gitlab.archlinux.org/archlinux/archlinux-keyring/' @@ -55,5 +55,5 @@ validpgpkeys=('02FD1C7A934E614545849F19A6234074498E9CEE' # Christian Hesse pkgname=archlinux-keyring -_tag='548f1786ede03b578e02ccdbc3c5823699f8152c' # git rev-parse ${pkgver} -pkgver=20240208 +_tag='0717024a39e47722c6bf2929a6d3ab1e2f132b9d' # git rev-parse ${pkgver} +pkgver=20240313 pkgrel=1 pkgdesc='Arch Linux PGP keyring' arch=('any') diff --git a/audit/PKGBUILD b/audit/PKGBUILD index 1dd301e..015215b 100644 --- a/audit/PKGBUILD +++ b/audit/PKGBUILD @@ -8,8 +8,8 @@ pkgbase=audit _name=audit-userspace pkgname=('audit' 'python-audit') -pkgver=4.0 -pkgrel=01 +pkgver=4.0.1 +pkgrel=02 pkgdesc="Userspace components of the audit framework w/o systemd" url='https://people.redhat.com/sgrubb/audit' makedepends=(apparmor glibc krb5 libcap-ng libldap linux-api-headers python swig) @@ -42,6 +42,7 @@ build() { --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc + --runstatedir=/run --enable-gssapi-krb5=yes --enable-systemd=no --enable-zos-remote @@ -79,8 +80,6 @@ package_audit() { make DESTDIR="$pkgdir" install -C $_name-$pkgver - # add log dir - install -vdm 755 "$pkgdir/var/log/$pkgname/" # add rules.d dir to satisfy augenrules install -vdm 755 "$pkgdir/etc/audit/rules.d/" # add config dir for audisp @@ -118,8 +117,9 @@ arch=(x86_64) license=(GPL-2.0-or-later LGPL-2.0-or-later) -sha256sums=(992a6c6c7f300327dc70e863f7ed282f26fd488780834c28aa11bfba52403b12 # audit-userspace-v4.0.tar.gz +sha256sums=(f964610dc0c1e68075d5ae4b14d6280d1164b6eca3a4a13721d1a711681403d9 # audit-userspace-v4.0.1.tar.gz 0ed3ff18f966f57e62d181705cad44ec0873a50d151dad46ca18a82edaa5589c) # audit.tmpfiles -## c3220bbad0d3ba7716a372307a1f9393d12dd09d616ea9fb5fa84c4943d63426 audit-4.0-01-x86_64.pkg.tar.lz -## eb9d15562cea0f1d78a2e15bbfff7da75443c26c49ed946b27b0fe49650a9f67 python-audit-4.0-01-x86_64.pkg.tar.lz + +## 7a532bd07cf6f559cdc3cb3f79ab72501477e3dbacb3bdc43d10d7f085a11726 audit-4.0.1-02-x86_64.pkg.tar.lz +## 0390b13574961229d75e6d5e67f4aede9761244332c37806348723fd43ad17bb python-audit-4.0.1-02-x86_64.pkg.tar.lz diff --git a/audit/PKGBUILD-arch b/audit/PKGBUILD-arch index 137ac60..960c34f 100644 --- a/audit/PKGBUILD-arch +++ b/audit/PKGBUILD-arch @@ -13,8 +13,8 @@ pkgname=( audit python-audit ) -pkgver=4.0 -pkgrel=1 +pkgver=4.0.1 +pkgrel=2 pkgdesc='Userspace components of the audit framework' url='https://people.redhat.com/sgrubb/audit' arch=(x86_64) @@ -38,12 +38,12 @@ source=( $pkgbase.tmpfiles $pkgbase-4.0-executable_paths.patch ) -sha512sums=('f001e3f466e012dc9c41e8aefd19ffac0db73c8510cd20467e2eb78dcf7a0fdde64279ec2ff0c370ecba692cda2ae228543b8e7ecdae06863ef37f6fa3a7c7c3' +sha512sums=('297664a55ab44b40c9280202c19612cfbfdacc209c4d226461ea5faa638e35617cb516e53d1f0bc3748cdd038d9524f3e5ebe11c8de4a5511ab4f12b7d06478c' '1750741755f58d0ae19ed2c30e136d05560dc12ec613a502bad12f47c6b70432d30b3a16f3f1574c8433ad2701428d1c1d567a4d3b55be19abac300310c831d9' - '5c1b524bf86234eac690cbe073e5b5459d3f74ec58ef57d50250261b0b1ca4656f295f410bf0727242ed852e725e6acd4438a4a02993c21a6fc80c132eb745b1') -b2sums=('c8ab1b241134dfc16f4a440358203b095b376a5f2042c6434a22d4127b3ae0751759b2f457bab50b81969368daa218bedbcd4cce815aec5fe6d13a62e9363d57' + '78d0289c5ea37bf28fecf43db7d83f1f754f2ac58a70667c8d720b0e5be51afca35f86861ba1abdea4833a4be8fbcfc05801240a2493904ab8ea4d2be5ca32e7') +b2sums=('3fc22fdfa98cddb9325cc68389d013886b579a75339aa43f812017612c9b0f02d27bab76b92324b6c419ea917a5cd3235e91a1ffcb0925d41cb7268d622d58fa' '549ebbbc9e43277d44d0dc5bfd8ca2926628322d898479171b2707dd004968d036ef792b442548af90ad56dea868a72c88b5cf3bb93ea70cb8bbed82747ad9b5' - '36e9c74eeccda534a019f780d7aa5337fc24118129c2766203a8bb028a81ba2bdf057cbc78194bcaeeda28c7ae9ef4ef8bb9cd34a37e47655a4ed2b64381935d') + '4cfeb5d47218e77d693d2645de49c9867abe10bf185b1315d526d0410e93a8c5967cdff107eefbefcd4760c6ccbdd010bd47e2ef1cb8b3970f86910f1ba50e3f') _pick() { local p="$1" f d; shift @@ -70,6 +70,7 @@ build() { --enable-zos-remote --libexecdir=/usr/lib/audit --prefix=/usr + --runstatedir=/run --sbindir=/usr/bin --sysconfdir=/etc --with-apparmor=yes @@ -115,8 +116,6 @@ package_audit() { install -vDm 644 $_name-$pkgver/{{README,SECURITY}.md,ChangeLog} -t "$pkgdir/usr/share/doc/$pkgname/" - # add log dir - install -vdm 755 "$pkgdir/var/log/$pkgname/" # add rules.d dir to satisfy augenrules install -vdm 755 "$pkgdir/etc/audit/rules.d/" # add config dir for audisp diff --git a/efibootmgr/PKGBUILD b/efibootmgr/PKGBUILD index d0d5fbb..a7a9f39 100644 --- a/efibootmgr/PKGBUILD +++ b/efibootmgr/PKGBUILD @@ -8,7 +8,7 @@ pkgname=efibootmgr _commit=712aeb81311de28a3fcfea7465dcb93743f07a53 # refs/tags/18 pkgver=18 -pkgrel=02 +pkgrel=03 pkgdesc="Linux user-space application to modify the EFI Boot Manager" url="https://github.com/rhboot/efibootmgr" depends=(glibc popt) @@ -20,7 +20,7 @@ build() { } package() { - depends+=(libefiboot.so libefivar.so) + depends+=(efivar libefiboot.so libefivar.so) make DESTDIR="$pkgdir" libdir=/usr/lib sbindir=/usr/bin EFIDIR=arch install -C $pkgname install -vDm 644 $pkgname/{AUTHORS,README,README.md,TODO} -t "$pkgdir/usr/share/doc/$pkgname/" @@ -30,13 +30,12 @@ package() { arch=(x86_64) -license=(GPL2) +license=(GPL-2.0-or-later) validpgpkeys=(B00B48BC731AA8840FED9FB0EED266B70F4FEF10 # Peter Jones 039A9CEA19DE9508C36875AA2532F9176A95A442) # Robbie Harwood (work) sha256sums=(SKIP) -## f7751f0332a0c1c9de088149dade13ab3d0741a212d65428be331ea2e0a0ee17 efibootmgr-18-02-x86_64.pkg.tar.lz - +## a1af89eefe5d4cb8eb113fdcf734f7f271854cf2628f5dbba14a4e475a0ba379 efibootmgr-18-03-x86_64.pkg.tar.lz diff --git a/efibootmgr/PKGBUILD-arch b/efibootmgr/PKGBUILD-arch index b69843c..f7184bb 100644 --- a/efibootmgr/PKGBUILD-arch +++ b/efibootmgr/PKGBUILD-arch @@ -6,13 +6,19 @@ pkgname=efibootmgr _commit=712aeb81311de28a3fcfea7465dcb93743f07a53 # refs/tags/18 pkgver=18 -pkgrel=2 +pkgrel=3 pkgdesc="Linux user-space application to modify the EFI Boot Manager" arch=(x86_64) url="https://github.com/rhboot/efibootmgr" -license=(GPL2) -depends=(glibc popt) -makedepends=(efivar git) +license=(GPL-2.0-or-later) +depends=( + glibc + popt +) +makedepends=( + efivar + git +) source=($pkgname::git+$url#tag=$_commit?signed) sha512sums=('SKIP') validpgpkeys=( @@ -25,7 +31,9 @@ build() { } package() { - depends+=(libefiboot.so libefivar.so) + depends+=( + efivar libefiboot.so libefivar.so + ) make DESTDIR="$pkgdir" libdir=/usr/lib sbindir=/usr/bin EFIDIR=arch install -C $pkgname install -vDm 644 $pkgname/{AUTHORS,README,README.md,TODO} -t "$pkgdir/usr/share/doc/$pkgname/" diff --git a/expat/PKGBUILD b/expat/PKGBUILD index 5c45dee..053d5c7 100644 --- a/expat/PKGBUILD +++ b/expat/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=expat -pkgver=2.6.1 +pkgver=2.6.2 pkgrel=01 pkgdesc='An XML parser library' url="https://libexpat.github.io/" @@ -44,7 +44,8 @@ license=(MIT) validpgpkeys=(3176EF7DB2367F1FCA4F306B1F9B0E909AF37285) # Sebastian Pipping -sha256sums=(4677d957c0c6cb2a3321101944574c24113b637c7ab1cf0659a27c5babc201fd # expat-2.6.1.tar.bz2 - 7d1bb6287172b2a16dea6bde897628a075028e805128368ce1f3a17e579826e3) # expat-2.6.1.tar.bz2.asc +sha256sums=(9c7c1b5dcbc3c237c500a8fb1493e14d9582146dd9b42aa8d3ffb856a3b927e0 # expat-2.6.2.tar.bz2 + ebedb658c5663588f34729634f0729932d73c10ae6d758149cec2eef993d6dfb) # expat-2.6.2.tar.bz2.asc + +## 484e832ce365226b014b9920bf7b6e443e51ca6161cbd87ac77a57c130ecc486 expat-2.6.2-01-x86_64.pkg.tar.lz -## f474eebfd41e1ff0baa02c8a384766e3f3646a07d53ceb6dac7def778fadc9ed expat-2.6.1-01-x86_64.pkg.tar.lz diff --git a/expat/PKGBUILD-arch b/expat/PKGBUILD-arch index 1ee4ce0..71cd74d 100644 --- a/expat/PKGBUILD-arch +++ b/expat/PKGBUILD-arch @@ -4,7 +4,7 @@ # Contributor: Judd Vinet pkgname=expat -pkgver=2.6.1 +pkgver=2.6.2 pkgrel=1 pkgdesc="An XML parser library" arch=(x86_64) @@ -14,9 +14,9 @@ depends=(glibc) makedepends=(cmake) provides=(libexpat.so) source=(https://github.com/libexpat/libexpat/releases/download/R_${pkgver//./_}/$pkgname-$pkgver.tar.bz2{,.asc}) -sha512sums=('11029a25cc88e5428c04c1ee9d3e8833f3d1c0a957350b0038eadb786821d2dd4c57c34fe67b45389c43d558ee53d4b95dcf1e5116aaf9ca16b12c1af6fbb7f0' +sha512sums=('15811413e92a632272188781cc3f2a9e52ed62f6edfad9b2eeeca0946e53132b6c9ca6dc460eda766d6a4e68e5920128335d705f9556b5aa3f77593658780470' 'SKIP') -b2sums=('b10658e793cd080c90f4be48c5c3c877d6463aa226bd77e48622d4ccc8e27367d4abf2f07a43dc4507494e9ce1d449a1c3a9d8a2b5c85e45e6c0e0062ea21bde' +b2sums=('9b518cf768e53b177fd933d37686a76c4a1bd1e2829cf414f8f9c054901f61d6445232eb4d4502e888507efa12a48d8ace206fbabac5d2ca5365f0437e971fd8' 'SKIP') validpgpkeys=(3176EF7DB2367F1FCA4F306B1F9B0E909AF37285) # Sebastian Pipping diff --git a/gnupg/PKGBUILD b/gnupg/PKGBUILD index 7075a82..5df39c9 100644 --- a/gnupg/PKGBUILD +++ b/gnupg/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=gnupg -pkgver=2.4.4 +pkgver=2.4.5 pkgrel=01 pkgdesc='Complete and free implementation of the OpenPGP standard w/o systemd' url='https://www.gnupg.org/' @@ -90,11 +90,11 @@ validpgpkeys=(5B80C5754298F0CB55D8ED6ABCEF7E294B092E28 # Andre Heinecke (Release AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD # Niibe Yutaka (GnuPG Release Key) 02F38DFF731FF97CB039A1DA549E695E905BA208) # GnuPG.com (Release Signing Key 2021) -sha256sums=(67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6 # gnupg-2.4.4.tar.bz2 - 4666212de8f98fe9307c37516113b6f8fb6e489ed0b522726e58eb08821cabe7 # gnupg-2.4.4.tar.bz2.sig +sha256sums=(f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277 # gnupg-2.4.5.tar.bz2 + 00641fd6da5ea9bfc8350e43148340dc2a4ab0d2fd7dbeebc1a9e2a32ffd2bba # gnupg-2.4.5.tar.bz2.sig 243c3a79295519b3931f9d846cf2af5caa064a78de812ee336dc786c1567b4d0 # gnupg-2.4-avoid_beta_warning.patch 6ade15b536c50a88efc2d9dc958433b0ccfaf2908025b7672753e6bfce51c3c6 # gnupg-2.4-drop_import_clean.patch ef2267eecd9eb59bbbbdb97d55cbfe10236b4979a125c6683a840830bc202905) # gnupg-2.4-revert_default_rfc4880bis.patch +## 2d3a6d32294072de57e4945138037dabe26395b56c7e018995127a6e02e6f3c0 gnupg-2.4.5-01-x86_64.pkg.tar.lz -## 2697791a1b4bbeb1bc92fd3ea0086457204e23d47199f00da53c9d011b555769 gnupg-2.4.4-01-x86_64.pkg.tar.lz diff --git a/gnupg/PKGBUILD-arch b/gnupg/PKGBUILD-arch index f3993e1..c256f26 100644 --- a/gnupg/PKGBUILD-arch +++ b/gnupg/PKGBUILD-arch @@ -7,7 +7,7 @@ # Contributor: Judd Vinet pkgname=gnupg -pkgver=2.4.4 +pkgver=2.4.5 pkgrel=1 pkgdesc='Complete and free implementation of the OpenPGP standard' arch=(x86_64) @@ -60,7 +60,7 @@ source=( $pkgname-2.4-keep-systemd-support.patch $pkgname-2.4-keyboxd-systemd-support.patch ) -sha256sums=('67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6' +sha256sums=('f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277' 'SKIP' '80a3a80f9f1f337da555a6838483e1baca44cde8a8a3d8c4ba7743626304b981' '8374255ce93a3c343019ab425963bcbc41982ea89e669d1ad1df0aa7be810de1' @@ -85,7 +85,7 @@ sha256sums=('67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6' 'ef2267eecd9eb59bbbbdb97d55cbfe10236b4979a125c6683a840830bc202905' '677ca409e8ece61e64a94102a2b71ec119941b5ae0f0ed4f1c4f2c0c2bdd158a' 'e0aff9f80abb6059e41cb3bb7cc86b7aa3fc1c27626676385c5479d69ef830a1') -b2sums=('02661e89f0358be09fa3e71e7235b764a7dbda62a48a0c8c7a4e6c9919c3b37d54ead50b930af58f8f2fdb87861b849d3f3751e95cbedf46bdfd76caa90c4db4' +b2sums=('a8b80cd4dfbb377066efb5c9f1b6cdc6d0cd1b18358c962781b5c06de1545117b13038a4655ae627c36bfd2e5fee127692df8729d6b23e1b31051ab6d897b733' 'SKIP' '7a3af856305eb4b00929aaf029dd4e5c84376df4f30add76976b9b058addf6fc4d8c39335fc83d11493ea9d8a40f0510dbac8572b99a8c8b9b3a4eca8e585774' 'ee51a4702715f5ec2629ff42eeba8630010da8a67545d1e53961e710de5faf197708e55d2d55796917a134ca2a76b1d6c88a8f7756d0706e0cbc33b605f52d86' diff --git a/iproute2/PKGBUILD b/iproute2/PKGBUILD index abf8e3a..dbe4993 100644 --- a/iproute2/PKGBUILD +++ b/iproute2/PKGBUILD @@ -7,7 +7,7 @@ ## rebuild after any libbpf upgrade ## pkgname=iproute2 -pkgver=6.7.0 +pkgver=6.8.0 pkgrel=01 pkgdesc='IP Routing Utilities' url='https://git.kernel.org/pub/scm/network/iproute2/iproute2.git' @@ -77,14 +77,13 @@ license=('GPL2') validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger # https://mirrors.edge.kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -# a70179085fa1b96d3c33b040c809b75e2b57563adc505a4ad05e2609df373463 iproute2-6.5.0.tar.xz -# 71a43ebd4bbe023ac7e8dbf23b4d6a84439aac77d41e852c52b713ab675a22e4 iproute2-6.5.0.tar.sign +# 03a6cca3d71a908d1f15f7b495be2b8fe851f941458dc4664900d7f45fcf68ce iproute2-6.8.0.tar.xz -sha256sums=(ff942dd9828d7d1f867f61fe72ce433078c31e5d8e4a78e20f02cb5892e8841d # iproute2-6.7.0.tar.xz - 69dbd4bbcf27265d0fdbabac1068ce22841fbaeae903daa4bc8bbafaa59dd0ed # iproute2-6.7.0.tar.sign - 7d71be96fc067c0b6fff55e67c26c39b349ac4f7f3203ec730227b1e9b5e4884 # sha256sums +sha256sums=(03a6cca3d71a908d1f15f7b495be2b8fe851f941458dc4664900d7f45fcf68ce # iproute2-6.8.0.tar.xz + c4bfe16e16fe98de2eeb3fb9592ca485dbfbb2fe45f6978942bef3be3d7143ff # iproute2-6.8.0.tar.sign + cfa016ef326b969dd3bcfa92954a3dd9d1f520d51ab3c89697cacc5a9b39ff6f # sha256sums 758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d # 0001-make-iproute2-fhs-compliant.patch 611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6) # 0002-bdb-5-3.patch -## 5ce5ef8cb16352079441dc452725f0ac5bf0bb74dc8fbfa75254598263ad95a0 iproute2-6.7.0-01-x86_64.pkg.tar.lz +## 63f01ff98d363b9ebf594d67a5d6be64e1744d35a0e869175b2eb873b39bd126 iproute2-6.8.0-01-x86_64.pkg.tar.lz diff --git a/iproute2/PKGBUILD-arch b/iproute2/PKGBUILD-arch index 5c0644c..1ea5fd5 100644 --- a/iproute2/PKGBUILD-arch +++ b/iproute2/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: Judd Vinet pkgname=iproute2 -pkgver=6.7.0 +pkgver=6.8.0 pkgrel=1 pkgdesc='IP Routing Utilities' arch=('x86_64') @@ -21,7 +21,7 @@ validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign} '0001-make-iproute2-fhs-compliant.patch' '0002-bdb-5-3.patch') -sha256sums=('ff942dd9828d7d1f867f61fe72ce433078c31e5d8e4a78e20f02cb5892e8841d' +sha256sums=('03a6cca3d71a908d1f15f7b495be2b8fe851f941458dc4664900d7f45fcf68ce' 'SKIP' '758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d' '611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6') diff --git a/libunistring/PKGBUILD b/libunistring/PKGBUILD index 153f787..aee4801 100644 --- a/libunistring/PKGBUILD +++ b/libunistring/PKGBUILD @@ -6,11 +6,10 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libunistring -pkgver=1.1 -pkgrel=02 +pkgver=1.2 +pkgrel=01 pkgdesc='Library for manipulating Unicode strings and C strings' url='https://www.gnu.org/software/libunistring/' -arch=(x86_64) depends=(glibc) makedepends=(gcc) provides=('libunistring.so') @@ -36,14 +35,18 @@ package() { make -C $pkgname-$pkgver DESTDIR="$pkgdir" install } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(GPL) validpgpkeys=(462225C3B46F34879FC8496CD605848ED7E69871 # Daiki Ueno 9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D) # Bruno Haible (Open Source Development) -sha256sums=(827c1eb9cb6e7c738b171745dac0888aa58c5924df2e59239318383de0729b98 # libunistring-1.1.tar.xz - dadae6c38f85f9e8776231436c601c386924ceb44d511456c61c9be73608933d) # libunistring-1.1.tar.xz.sig +sha256sums=(632bd65ed74a881ca8a0309a1001c428bd1cbd5cd7ddbf8cedcd2e65f4dcdc44 # libunistring-1.2.tar.xz + 91da3f033231a635dae9e0161c834b74e890e1eba19d4e5972b26c5c312ac2cb) # libunistring-1.2.tar.xz.sig + +## 501ca8f454adf7b4da856367d8f18ca2caf1f881730f052fa899ce54b3530c7e libunistring-1.2-01-x86_64.pkg.tar.lz diff --git a/libunistring/PKGBUILD-arch b/libunistring/PKGBUILD-arch index f9ef79c..7611757 100644 --- a/libunistring/PKGBUILD-arch +++ b/libunistring/PKGBUILD-arch @@ -6,8 +6,8 @@ # Contributor: Patrick McCarty pkgname=libunistring -pkgver=1.1 -pkgrel=2 +pkgver=1.2 +pkgrel=1 pkgdesc='Library for manipulating Unicode strings and C strings' url='https://www.gnu.org/software/libunistring/' arch=(x86_64) @@ -17,9 +17,9 @@ provides=('libunistring.so') source=(https://ftp.gnu.org/gnu/$pkgname/${pkgname}-${pkgver}.tar.xz{,.sig}) validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno '9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development) -sha256sums=('827c1eb9cb6e7c738b171745dac0888aa58c5924df2e59239318383de0729b98' +sha256sums=('632bd65ed74a881ca8a0309a1001c428bd1cbd5cd7ddbf8cedcd2e65f4dcdc44' 'SKIP') -b2sums=('721adc90884006480055b95d0fa06cd862417aa02b467f1e14688292ad9c11f1e33520b14ed5dc2d2724c6df8713d3af1e8032014259d8355156cb72edfcb983' +b2sums=('606c6fdd93f05b01e9b08b3bd30283afcbf9a3425abf900e7672f1d6eb91b51009913d4f5e45a4c1c1b82a84b4870d3eaced9ca76fd570936ad5c39c94038fc7' 'SKIP') build() { diff --git a/libunistring/deps b/libunistring/deps index b28b04f..139597f 100644 --- a/libunistring/deps +++ b/libunistring/deps @@ -1,3 +1,2 @@ - diff --git a/mkinitcpio/PKGBUILD b/mkinitcpio/PKGBUILD index 6cc0145..7e4604d 100644 --- a/mkinitcpio/PKGBUILD +++ b/mkinitcpio/PKGBUILD @@ -6,12 +6,9 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=mkinitcpio -pkgver=38 -pkgrel=04 +pkgver=38.1 +pkgrel=01 pkgdesc="Modular initramfs image creation utility w/o systemd zstd " -#url='https://github.com/archlinux/mkinitcpio' -#url='https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio' -url="https://sources.archlinux.org/other" makedepends=('binutils' 'asciidoc' 'sed') install=mkinitcpio.install depends=('awk' 'mkinitcpio-busybox>=1.35.0' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils' @@ -26,15 +23,18 @@ optdepends=('zstd: Use zstd compression for the initramfs image' provides=("mkinitcpio=$pkgver-$pkgrel" 'initramfs') #backup=('etc/mkinitcpio.conf') +#url='https://github.com/archlinux/mkinitcpio' +#url='https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio' +url="https://sources.archlinux.org/other" source=("$url/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} - "$pkgname-fix-path.patch::https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/commit/aced07e06b9b274439eeb90e235edf42780b4a7a.patch" +# "$pkgname-fix-path.patch::https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/commit/aced07e06b9b274439eeb90e235edf42780b4a7a.patch" nosystemd.patch mkinitcpio.conf) prepare() { cd "${pkgname}-${pkgver}" patch -Np1 -i ../nosystemd.patch - patch -Np1 < "$srcdir/mkinitcpio-fix-path.patch" +# patch -Np1 < "$srcdir/mkinitcpio-fix-path.patch" } check() { @@ -62,11 +62,21 @@ license=(GPL) validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini 'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud -sha256sums=(c64ff852c63d3ee668950e0a4e10a2eae020e079025fa9ad23261e3221cddc05 # mkinitcpio-38.tar.gz - 9086ddcbfe139e2956f12f9070e515fcf7e97fd23479ee35b71cf12163edb33b # mkinitcpio-38.tar.gz.sig - 207972bfc62cb7bf0547fd075b55c49b9f190afc76e8f4dded1b1c79fd886d0d # mkinitcpio-fix-path.patch +sha512sums=('e727509badc528f45f2b193b3f49c202df41d4e75067bebd44c22ebc59f635d4a9596bc671d609d8941644f3a246267f7a199946730ba474040a1f24b94f663c' + 'SKIP' + 'SKIP' + 'SKIP') +b2sums=('625455bb1140688bcdf04c946eb6fa1da53deaa221b2c8090c173aef1d7fc617227aa0674344f3c18d5b9ab77a093725856f4f0cd3b8a33462a2ac742f0dbf11' + 'SKIP' + 'SKIP' + 'SKIP') + + +sha256sums=(5c63525097a3c17bfb654dacea71ed7681c3102a3684d18c319d06e57007e1cd # mkinitcpio-38.1.tar.gz + e43a102a6f2e17834e351b6206b5d45c83340b09f379c05ebc89c16cc8600d06 # mkinitcpio-38.1.tar.gz.sig +# 207972bfc62cb7bf0547fd075b55c49b9f190afc76e8f4dded1b1c79fd886d0d # mkinitcpio-fix-path.patch c4afeb6b3300c4d50c3f01233705b542f59d6e95a7670f7efde097ea209ef5bd # nosystemd.patch - 005d909551dec1dbb417457f0277076c5087902e9256eb5f1a77af3798c7c3de) # mkinitcpio.conf + 3fd3810547c39a8cb55a8ec729e8e8500c365dd345e242e6fda568c346947436) # mkinitcpio.conf -## 5a5f4de431cbff7f9c2e24b78ec285e9cfcbf5a43f3ec2739d3b04d06a3dc0ab mkinitcpio-38-04-x86_64.pkg.tar.lz +## c2909e0e2ad7d2401ffbbe1ac838b2d9c0de0c93abec246a380a60408c3c8eb2 mkinitcpio-38.1-01-x86_64.pkg.tar.lz diff --git a/mkinitcpio/PKGBUILD-arch b/mkinitcpio/PKGBUILD-arch index fdea895..e8dceea 100644 --- a/mkinitcpio/PKGBUILD-arch +++ b/mkinitcpio/PKGBUILD-arch @@ -4,8 +4,8 @@ # Contributor: Thomas Bächler pkgname=mkinitcpio -pkgver=38 -pkgrel=4 +pkgver=38.1 +pkgrel=1 pkgdesc="Modular initramfs image creation utility" arch=('any') url='https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio' @@ -27,24 +27,15 @@ optdepends=('gzip: Use gzip compression for the initramfs image' 'mkinitcpio-nfs-utils: Support for root filesystem on NFS') provides=('initramfs') backup=('etc/mkinitcpio.conf') -source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} - "$pkgname-fix-path.patch::https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/commit/aced07e06b9b274439eeb90e235edf42780b4a7a.patch") +source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) install=mkinitcpio.install -sha512sums=('ad1a4895e5cc3a01637f71d96ddb79d7f45708ec7305ffdb874403a1eb3c1743d121f28d93273b91792298eb21bcc0c5d9ef1ab3a3773083d60da5bdaee59d6e' - 'SKIP' - 'b1387deab0199fdb4e4a417b009467cb6f95b2a3f8074858f8a85b46492ebaf420ac028f13d81acb5a675382cccb896cac62f42e26edd82dc1c3a7f48d4d822b') -b2sums=('4bc50da7196a69dc0ab7e7de345684baebbb655f9a07def9ac36a7f1c9aec752cf41c62134d6bbf240d8f49c6492a211f152bab062ec09457791d7ab030f1bc5' - 'SKIP' - '4530828b559c08aa14f3663b8a078c71bb739adcbd1dfbf21947cfe837ec51fc8ed7e7586c53a4e0ee4b7d86784acab5edf916c387e7385a78fe98c825177fa9') +sha512sums=('e727509badc528f45f2b193b3f49c202df41d4e75067bebd44c22ebc59f635d4a9596bc671d609d8941644f3a246267f7a199946730ba474040a1f24b94f663c' + 'SKIP') +b2sums=('625455bb1140688bcdf04c946eb6fa1da53deaa221b2c8090c173aef1d7fc617227aa0674344f3c18d5b9ab77a093725856f4f0cd3b8a33462a2ac742f0dbf11' + 'SKIP') validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini 'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud - -prepare() { - cd "${pkgname}-${pkgver}" - patch -Np1 < "$srcdir/mkinitcpio-fix-path.patch" -} - check() { make -C "$pkgname-$pkgver" check } diff --git a/mkinitcpio/mkinitcpio.conf b/mkinitcpio/mkinitcpio.conf index 8d9ff4f..6ec1230 100644 --- a/mkinitcpio/mkinitcpio.conf +++ b/mkinitcpio/mkinitcpio.conf @@ -49,13 +49,12 @@ FILES=() # ## NOTE: If you have /usr on a separate partition, you MUST include the # usr and fsck hooks. -# HOOKS=(base udev autodetect modconf kms keyboard keymap consolefont block filesystems fsck) +HOOKS=(base udev autodetect microcode modconf kms keyboard keymap consolefont block filesystems fsck) # COMPRESSION # Use this to compress the initramfs image. By default, zstd compression ## joborun linux wants to revert this default behavior and adds its own mkinitcpio.conf file # is used. Use 'cat' to create an uncompressed image. -#COMPRESSION="zstd" #COMPRESSION="gzip" #COMPRESSION="bzip2" #COMPRESSION="lzma" @@ -65,7 +64,7 @@ COMPRESSION="xz" # COMPRESSION_OPTIONS # Additional options for the compressor -COMPRESSION_OPTIONS=( -T0 ) +COMPRESSION_OPTIONS=( -T2 -7 ) # MODULES_DECOMPRESS # Decompress kernel modules during initramfs creation. # Enable to speedup boot process, disable to save RAM diff --git a/mkinitcpio/mkinitcpio.conf-arch b/mkinitcpio/mkinitcpio.conf-arch new file mode 100644 index 0000000..fc54be6 --- /dev/null +++ b/mkinitcpio/mkinitcpio.conf-arch @@ -0,0 +1,76 @@ +# vim:set ft=sh +# MODULES +# The following modules are loaded before any boot hooks are +# run. Advanced users may wish to specify all system modules +# in this array. For instance: +# MODULES=(usbhid xhci_hcd) +MODULES=() + +# BINARIES +# This setting includes any additional binaries a given user may +# wish into the CPIO image. This is run last, so it may be used to +# override the actual binaries included by a given hook +# BINARIES are dependency parsed, so you may safely ignore libraries +BINARIES=() + +# FILES +# This setting is similar to BINARIES above, however, files are added +# as-is and are not parsed in any way. This is useful for config files. +FILES=() + +# HOOKS +# This is the most important setting in this file. The HOOKS control the +# modules and scripts added to the image, and what happens at boot time. +# Order is important, and it is recommended that you do not change the +# order in which HOOKS are added. Run 'mkinitcpio -H ' for +# help on a given hook. +# 'base' is _required_ unless you know precisely what you are doing. +# 'udev' is _required_ in order to automatically load modules +# 'filesystems' is _required_ unless you specify your fs modules in MODULES +# Examples: +## This setup specifies all modules in the MODULES setting above. +## No RAID, lvm2, or encrypted root is needed. +# HOOKS=(base) +# +## This setup will autodetect all modules for your system and should +## work as a sane default +# HOOKS=(base udev autodetect modconf block filesystems fsck) +# +## This setup will generate a 'full' image which supports most systems. +## No autodetection is done. +# HOOKS=(base udev modconf block filesystems fsck) +# +## This setup assembles a mdadm array with an encrypted root file system. +## Note: See 'mkinitcpio -H mdadm_udev' for more information on RAID devices. +# HOOKS=(base udev modconf keyboard keymap consolefont block mdadm_udev encrypt filesystems fsck) +# +## This setup loads an lvm2 volume group. +# HOOKS=(base udev modconf block lvm2 filesystems fsck) +# +## This will create a systemd based initramfs which loads an encrypted root filesystem. +# HOOKS=(base systemd autodetect modconf kms keyboard sd-vconsole sd-encrypt block filesystems fsck) +# +## NOTE: If you have /usr on a separate partition, you MUST include the +# usr and fsck hooks. +HOOKS=(base udev autodetect microcode modconf kms keyboard keymap consolefont block filesystems fsck) + +# COMPRESSION +# Use this to compress the initramfs image. By default, zstd compression +# is used. Use 'cat' to create an uncompressed image. +#COMPRESSION="zstd" +#COMPRESSION="gzip" +#COMPRESSION="bzip2" +#COMPRESSION="lzma" +#COMPRESSION="xz" +#COMPRESSION="lzop" +#COMPRESSION="lz4" + +# COMPRESSION_OPTIONS +# Additional options for the compressor +#COMPRESSION_OPTIONS=() + +# MODULES_DECOMPRESS +# Decompress kernel modules during initramfs creation. +# Enable to speedup boot process, disable to save RAM +# during early userspace. Switch (yes/no). +#MODULES_DECOMPRESS="yes" diff --git a/openssh/PKGBUILD b/openssh/PKGBUILD index fdcf98a..ed8ae25 100644 --- a/openssh/PKGBUILD +++ b/openssh/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=openssh -pkgver=9.6p1 -pkgrel=03 +pkgver=9.7p1 +pkgrel=01 pkgdesc="SSH protocol implementation for remote login, command execution and file transfer w/o systemd" url='https://www.openssh.com/portable.html' depends=(glibc) @@ -151,12 +151,11 @@ license=(BSD-2-Clause validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA') # "Damien Miller " -sha256sums=(910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c # openssh-9.6p1.tar.gz - 9b1e931cbc811f02e91f7eacd55f8211cc45dade11975462f4b0dcdad29927aa # openssh-9.6p1.tar.gz.asc +sha256sums=(490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd # openssh-9.7p1.tar.gz + 9cee21fd45be07747fa82cd799e4cd8d14203165834d6fc7ccbcf60718901489 # openssh-9.7p1.tar.gz.asc 78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30 # 99-archlinux.conf 975904668c3c98fff5dbf840717ae959593fa05e90e215e67bf7ee24369d6369 # openssh.tmpfiles 64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846) # sshd.pam -## 9d5c4c2a14bdaa5067102b014012240a8fbc14e124d2493f8bd4381f1d0f4508 openssh-9.6p1-03-x86_64.pkg.tar.lz - +## f38d780b51389905a0411bb5d345021d58f7ba4d1e2f094623ec49ffdd2c4987 openssh-9.7p1-01-x86_64.pkg.tar.lz diff --git a/openssh/PKGBUILD-arch b/openssh/PKGBUILD-arch index 8a7caf9..f8515cf 100644 --- a/openssh/PKGBUILD-arch +++ b/openssh/PKGBUILD-arch @@ -6,8 +6,8 @@ # Contributor: judd pkgname=openssh -pkgver=9.6p1 -pkgrel=3 +pkgver=9.7p1 +pkgrel=1 pkgdesc="SSH protocol implementation for remote login, command execution and file transfer" arch=(x86_64) url='https://www.openssh.com/portable.html' @@ -51,7 +51,7 @@ source=( ssh-agent.service sshd.pam ) -sha256sums=('910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c' +sha256sums=('490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd' 'SKIP' '78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30' '975904668c3c98fff5dbf840717ae959593fa05e90e215e67bf7ee24369d6369' @@ -59,7 +59,7 @@ sha256sums=('910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c' 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7' 'b3b1e4f7af169cd5fccdcdf9538ef37fc919c79a9905f797925153a94e723998' '633e24cbfcb045ba777d3e06d5f85dfaa06d44f4727d38c7fb2187c57498221d') -b2sums=('dd7f6747fe89f7b386be4faaf7fc43398a9bf439e45608ae61c2126cf8743c64ef7b5af45c75e9007b0bda525f8809261ca0f2fc47ce60177ba769a5324719dd' +b2sums=('520859fcbdf678808fc8515b64585ab9a90a8055fa869df6fbba3083cb7f73ddb81ed9ea981e131520736a8aed838f85ae68ca63406a410df61039913c5cb48b' 'SKIP' '1ff8cd4ae22efed2b4260f1e518de919c4b290be4e0b5edbc8e2225ffe63788678d1961e6f863b85974c4697428ee827bcbabad371cfc91cc8b36eae9402eb97' '43bf32158d6b14cf298e5e92a54d93577d6a45b32b3c0fad7a3722e55a53e446fd30df10002bc945c71528904bb397aaadc4f439dd81e5a87263a31b1daa7fc2' diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD index 7968297..ab6e64c 100644 --- a/pacman/PKGBUILD +++ b/pacman/PKGBUILD @@ -6,58 +6,53 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=pacman -pkgver=6.0.2 -pkgrel=016 +pkgver=6.1.0 +pkgrel=01 pkgdesc="A library-based package manager with dependency support modified for joborun from arch" url="https://www.archlinux.org/pacman/" groups=(base jobbot) depends=('bash' 'glibc' 'libarchive' 'curl' 'gpgme' 'pacman-mirrorlist' 'jobo-mirror' 'gawk' 'coreutils' 'gnupg' 'grep' 'archlinux-keyring' 'obarun-keyring' 'joborun-keyring' 'lzip') - # NOTE: Joborun linux is switching default pkg compression to lzip at level -5 # which matches current xz compression ratio but at a fraction of RAM use # and relatively even speed. So lzip becomes a standard system dependency # as it will also be used by pacman during installation. Gradually all # pkgs will be offered as *.pkg.tar.lz For a while there will be mixed. -makedepends=('meson' 'asciidoc' 'doxygen') +makedepends=('meson' 'asciidoc' 'doxygen' 'gettext') checkdepends=('python' 'fakechroot') optdepends=('perl-locale-gettext: translation support in makepkg-template') provides=('libalpm.so') backup=(etc/pacman.conf etc/makepkg.conf) #options=('strip' 'debug') -options=(strip) -source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig} - pacman-always-create-directories-from-debugedit.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/efd0c24c07b86be014a4edb5a8ece021b87e3900.patch - pacman-always-create-directories-from-debugedit-fixup.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/86981383a2f4380bda26311831be94cdc743649b.patch - pacman-fix-unique-source-paths.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/478af273dfe24ded197ec54ae977ddc3719d74a0.patch - pacman-strip-include-o-files-similar-to-kernel-modules.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/de11824527ec4e2561e161ac40a5714ec943543c.patch - pacman-fix-compatibility-with-bash-5.2-patsub_replacement.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/0e938f188692c710be36f9dd9ea7b94381aed1b4.patch - pacman-fix-order-of-fakechroot-fakeroot-nesting.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/05f283b5ad8f5b8f995076e93a27c8772076f872.patch - pacman-change-default-checksum-from-md5-to-sha256.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/aa3a1bc3b50d797fb75278f79a83cd7dde50c66e.patch - pacman-sort-debuginfod-repro.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/843bf21e794c79c5b3bcf8a57e45ef9c62312fee.patch - pacman-split-off-strip-debug.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/7a4fff3310ba2eadd3d5428cbb92e58eb2ee853b.patch - pacman-ignore-a-files.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/00d2b1f90261bf77eaaf262d2504af016562f2ac.patch - pacman-early-err-git.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/3aa096a74f717d31650e0eb3cf34e9a5ebadc313.patch - pacman-fix-gnupg-binary-data.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/86ec26b2d33372a4b3bda48f22c4a9f226c3ccce.patch - pacman-fix-gnupg-newsig-check.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/16a064701a30d7e1175e1185cc6da44238302fab.patch - pacman-check-pipes-gnupg.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/f8c2e59ec57c86827b1f1b1c2f6760dc3e59fe40.patch +options=('strip') +source=(https://gitlab.archlinux.org/pacman/pacman/-/releases/v$pkgver/downloads/pacman-$pkgver.tar.xz{,.sig} + revertme-makepkg-remove-libdepends-and-libprovides.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/354a300cd26bb1c7e6551473596be5ecced921de.patch pacman.conf makepkg.conf) +## install="pacman.install" prepare() { - cd "${pkgname}-${pkgver}" - # we backport way too often in pacman - # lets at least make it more convenient - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - msg2 "Applying patch $src..." - patch -Np1 < "../$src" - done + cd "$pkgname-$pkgver" + + # handle patches + local -a patches + patches=($(printf '%s\n' "${source[@]}" | grep '.patch')) + patches=("${patches[@]%%::*}") + patches=("${patches[@]##*/}") + + if (( ${#patches[@]} != 0 )); then + for patch in "${patches[@]}"; do + if [[ $patch =~ revertme-* ]]; then + msg2 "Reverting patch $patch..." + patch -RNp1 < "../$patch" + else + msg2 "Applying patch $patch..." + patch -Np1 < "../$patch" + fi + done + fi } build() { @@ -65,7 +60,7 @@ build() { meson --prefix=/usr \ --buildtype=plain \ - -Ddoc=disabled \ + -Ddoc=enabled \ -Ddoxygen=enabled \ -Dscriptlet-shell=/usr/bin/bash \ -Dldconfig=/usr/bin/ldconfig \ @@ -76,7 +71,6 @@ build() { check() { cd "$pkgname-$pkgver" - meson test -C build } @@ -89,16 +83,15 @@ package() { install -dm755 "$pkgdir/etc" install -m644 "$srcdir/pacman.conf" "$pkgdir/etc" install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc" -# rm -rf $pkgdir/usr/share/libalpm/hooks -# # local wantsdir="$pkgdir/usr/lib/systemd/system/sockets.target.wants" -# install -dm755 "$wantsdir" -# -# local unit -# for unit in dirmngr gpg-agent gpg-agent-{browser,extra,ssh} keyboxd; do -# ln -s "../${unit}@.socket" "$wantsdir/${unit}@etc-pacman.d-gnupg.socket" -# done + local wantsdir="$pkgdir/usr/lib/pacman/sockets.target.wants" + install -dm755 "$wantsdir" + + local unit + for unit in dirmngr gpg-agent gpg-agent-{browser,extra,ssh} keyboxd; do + ln -s "../${unit}@.socket" "$wantsdir/${unit}@etc-pacman.d-gnupg.socket" + done } @@ -111,22 +104,11 @@ license=('GPL-2.0-or-later') validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) -sha256sums=(7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5 # pacman-6.0.2.tar.xz - e3b75fafa8f177752800b31b9d59c454694647ae39b02a8009384a6821ee3be3 # pacman-6.0.2.tar.xz.sig - 6fed94326b9ecfbb438ab17a4576b5e9d52ecc0f4574f29d46adfde3886dee03 # pacman-always-create-directories-from-debugedit.patch - d2bc104788290e3de829a232590b66ad745cf5b4762a01acc1191ebf70fef114 # pacman-always-create-directories-from-debugedit-fixup.patch - f3d4f39ef24e312f610cbb3439fb02bc6b8829e37bcf1a50ae50cd0a69bde5d0 # pacman-fix-unique-source-paths.patch - d87d0c9957c613fda272553bee58140349d151ae399f346ddaf6d75ee5916312 # pacman-strip-include-o-files-similar-to-kernel-modules.patch - 8641d514ef4cae9e4d1867aadf4b9c850a9e8dc9792c6c559f9d2a0e1713a5a1 # pacman-fix-compatibility-with-bash-5.2-patsub_replacement.patch - b11f62d4bd9557e9d3e7456bc95f63e9eabab5ecee1368f4a14a84bc94b1c8d1 # pacman-fix-order-of-fakechroot-fakeroot-nesting.patch - cf749ad981e8f3dedd89c05a5e69a9c91d1e58ef9407e8f8e04ba9c183939623 # pacman-change-default-checksum-from-md5-to-sha256.patch - 17e7af22533984924aaf1cf36c74aa26b46b04ad140cd76b65521be906bd3ff7 # pacman-sort-debuginfod-repro.patch - 94d1f3575d0c3faf8bf11fee8e5ef36c8b339ebfd24868931903ba179ffecf4e # pacman-split-off-strip-debug.patch - 468837eed9a4ffd3778f159a7e62f89a38a4244f822a3a5b014daa69e3c65d28 # pacman-ignore-a-files.patch - 0ac6a34e6fc126a243a642e509f459f6cde20af213ab949791a5cc325cf031f9 # pacman-early-err-git.patch - d08d4a56dc3a977fdfd4591c30733fa28976710ffba53786541d98717892dc24 # pacman-fix-gnupg-binary-data.patch - 4a3cdfba490121a20f3648791cd47ba323f3d3d56bf7ced21b9badb1f22d6abc # pacman-fix-gnupg-newsig-check.patch - 94c273f07e4e28125b6002567c62e1f6c65f543597de6a8bd79e8c5bf6e4a125 # pacman-check-pipes-gnupg.patch - 488ae68d6c75c81a829dbb1e75ba7349cf341bea5da07c2896e529cdb09f612e # pacman.conf - e3eca3bbddf18a3d3278b876a40bc37b58175fd410cfa7fd328d48e8fdb1e17f) # makepkg.conf +sha256sums=(5a60ac6e6bf995ba6140c7d038c34448df1f3daa4ae7141d2cad88eeb5f1f9d9 # pacman-6.1.0.tar.xz + d12ce27098e2426f8e482b4334e9d3dbe7f57524a536a289990f8b99e5e3a8aa # pacman-6.1.0.tar.xz.sig + b3bce9d662e189e8e49013b818f255d08494a57e13fc264625f852f087d3def2 # revertme-makepkg-remove-libdepends-and-libprovides.patch + 56afa185068a3941e5ff49836d69b1e5d8191521cc7e54b01feb0edac6d8e736 # pacman.conf + 3e5a8edab365c52b2e957681b8a567b9600afd1c24d037f538369c4935b52d5b) # makepkg.conf + +## 4cba0a76e6ad69dfd23fa1cf65a488aa3426da11e1567f887e4e23ade733a27f pacman-6.1.0-01-x86_64.pkg.tar.lz diff --git a/pacman/PKGBUILD-arch b/pacman/PKGBUILD-arch index d0a8261..7eea2be 100644 --- a/pacman/PKGBUILD-arch +++ b/pacman/PKGBUILD-arch @@ -2,8 +2,8 @@ # Maintainer: Morten Linderud pkgname=pacman -pkgver=6.0.2 -pkgrel=9 +pkgver=6.1.0 +pkgrel=1 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') url="https://www.archlinux.org/pacman/" @@ -19,54 +19,36 @@ backup=(etc/pacman.conf options=('strip') validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) -source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig} - pacman-always-create-directories-from-debugedit.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/efd0c24c07b86be014a4edb5a8ece021b87e3900.patch - pacman-always-create-directories-from-debugedit-fixup.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/86981383a2f4380bda26311831be94cdc743649b.patch - pacman-fix-unique-source-paths.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/478af273dfe24ded197ec54ae977ddc3719d74a0.patch - pacman-strip-include-o-files-similar-to-kernel-modules.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/de11824527ec4e2561e161ac40a5714ec943543c.patch - pacman-fix-compatibility-with-bash-5.2-patsub_replacement.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/0e938f188692c710be36f9dd9ea7b94381aed1b4.patch - pacman-fix-order-of-fakechroot-fakeroot-nesting.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/05f283b5ad8f5b8f995076e93a27c8772076f872.patch - pacman-change-default-checksum-from-md5-to-sha256.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/aa3a1bc3b50d797fb75278f79a83cd7dde50c66e.patch - pacman-sort-debuginfod-repro.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/843bf21e794c79c5b3bcf8a57e45ef9c62312fee.patch - pacman-split-off-strip-debug.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/7a4fff3310ba2eadd3d5428cbb92e58eb2ee853b.patch - pacman-ignore-a-files.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/00d2b1f90261bf77eaaf262d2504af016562f2ac.patch - pacman-early-err-git.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/3aa096a74f717d31650e0eb3cf34e9a5ebadc313.patch - pacman-fix-gnupg-binary-data.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/86ec26b2d33372a4b3bda48f22c4a9f226c3ccce.patch - pacman-fix-gnupg-newsig-check.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/16a064701a30d7e1175e1185cc6da44238302fab.patch - pacman-check-pipes-gnupg.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/f8c2e59ec57c86827b1f1b1c2f6760dc3e59fe40.patch +source=(https://gitlab.archlinux.org/pacman/pacman/-/releases/v$pkgver/downloads/pacman-$pkgver.tar.xz{,.sig} + revertme-makepkg-remove-libdepends-and-libprovides.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/354a300cd26bb1c7e6551473596be5ecced921de.patch pacman.conf makepkg.conf) -sha256sums=('7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5' +sha256sums=('5a60ac6e6bf995ba6140c7d038c34448df1f3daa4ae7141d2cad88eeb5f1f9d9' 'SKIP' - '6fed94326b9ecfbb438ab17a4576b5e9d52ecc0f4574f29d46adfde3886dee03' - 'd2bc104788290e3de829a232590b66ad745cf5b4762a01acc1191ebf70fef114' - 'f3d4f39ef24e312f610cbb3439fb02bc6b8829e37bcf1a50ae50cd0a69bde5d0' - 'd87d0c9957c613fda272553bee58140349d151ae399f346ddaf6d75ee5916312' - '8641d514ef4cae9e4d1867aadf4b9c850a9e8dc9792c6c559f9d2a0e1713a5a1' - 'b11f62d4bd9557e9d3e7456bc95f63e9eabab5ecee1368f4a14a84bc94b1c8d1' - 'cf749ad981e8f3dedd89c05a5e69a9c91d1e58ef9407e8f8e04ba9c183939623' - '17e7af22533984924aaf1cf36c74aa26b46b04ad140cd76b65521be906bd3ff7' - '94d1f3575d0c3faf8bf11fee8e5ef36c8b339ebfd24868931903ba179ffecf4e' - '96efb79a96abf8cdcecb9f8dc461552549cf46159f44bb4160eb073e1ea5000a' - '0ac6a34e6fc126a243a642e509f459f6cde20af213ab949791a5cc325cf031f9' - '6e81b34e6a5f312d48ce3aaca0f02ddd10b7a43325cb32acf7666b6b7ac41552' - '250598a27a3077ec1dfe97a30af8bb0daf449d3ab456ed6a0c7a5bea0eb58f51' - '94c273f07e4e28125b6002567c62e1f6c65f543597de6a8bd79e8c5bf6e4a125' + 'b3bce9d662e189e8e49013b818f255d08494a57e13fc264625f852f087d3def2' '656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a' - 'f2791b51588104ec6dbaafa389451056f3c61fa6c19510dcce3a9a6cc19cba29') + '2465d495cb275dce434eb3bfe4d293a223e301b968c14861aea42bc7c60404ef') prepare() { - cd "${pkgname}-${pkgver}" - # we backport way too often in pacman - # lets at least make it more convenient - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - msg2 "Applying patch $src..." - patch -Np1 < "../$src" - done + cd "$pkgname-$pkgver" + + # handle patches + local -a patches + patches=($(printf '%s\n' "${source[@]}" | grep '.patch')) + patches=("${patches[@]%%::*}") + patches=("${patches[@]##*/}") + + if (( ${#patches[@]} != 0 )); then + for patch in "${patches[@]}"; do + if [[ $patch =~ revertme-* ]]; then + msg2 "Reverting patch $patch..." + patch -RNp1 < "../$patch" + else + msg2 "Applying patch $patch..." + patch -Np1 < "../$patch" + fi + done + fi } build() { diff --git a/pacman/makepkg.conf b/pacman/makepkg.conf index a8847ce..d091483 100644 --- a/pacman/makepkg.conf +++ b/pacman/makepkg.conf @@ -69,7 +69,7 @@ DEBUG_RUSTFLAGS="-C debuginfo=2" #-- check: Run the check() function if present in the PKGBUILD #-- sign: Generate PGP signature file # -BUILDENV=(!distcc color !ccache check !sign) +BUILDENV=(!distcc !color !ccache check !sign) # #-- If using DistCC, your MAKEFLAGS will also need modification. In addition, #-- specify a space-delimited list of hosts running in the DistCC cluster. @@ -83,7 +83,7 @@ BUILDENV=(!distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto) +# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto !autodeps) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -155,9 +155,6 @@ COMPRESSLZ=(lzip -6 -c -f -vv) # EXTENSION DEFAULTS ######################################################################### # -# WARNING: Do NOT modify these variables unless you know what you are -# doing. -# PKGEXT='.pkg.tar.lz' SRCEXT='.src.tar.gz' diff --git a/pacman/makepkg.conf-arch-recent b/pacman/makepkg.conf-arch-recent new file mode 100644 index 0000000..ac4c95f --- /dev/null +++ b/pacman/makepkg.conf-arch-recent @@ -0,0 +1,167 @@ +#!/hint/bash +# shellcheck disable=2034 + +# +# /etc/makepkg.conf +# + +######################################################################### +# SOURCE ACQUISITION +######################################################################### +# +#-- The download utilities that makepkg should use to acquire sources +# Format: 'protocol::agent' +DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u' + 'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' + 'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'rsync::/usr/bin/rsync --no-motd -z %u %o' + 'scp::/usr/bin/scp -C %u %o') + +# Other common tools: +# /usr/bin/snarf +# /usr/bin/lftpget -c +# /usr/bin/wget + +#-- The package required by makepkg to download VCS sources +# Format: 'protocol::package' +VCSCLIENTS=('bzr::breezy' + 'fossil::fossil' + 'git::git' + 'hg::mercurial' + 'svn::subversion') + +######################################################################### +# ARCHITECTURE, COMPILE FLAGS +######################################################################### +# +CARCH="x86_64" +CHOST="x86_64-pc-linux-gnu" + +#-- Compiler and Linker Flags +#CPPFLAGS="" +CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \ + -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \ + -fstack-clash-protection -fcf-protection \ + -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" +CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" +LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \ + -Wl,-z,pack-relative-relocs" +LTOFLAGS="-flto=auto" +RUSTFLAGS="-Cforce-frame-pointers=yes" +#-- Make Flags: change this for DistCC/SMP systems +#MAKEFLAGS="-j2" +#-- Debugging flags +DEBUG_CFLAGS="-g" +DEBUG_CXXFLAGS="$DEBUG_CFLAGS" +DEBUG_RUSTFLAGS="-C debuginfo=2" + +######################################################################### +# BUILD ENVIRONMENT +######################################################################### +# +# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign) +# A negated environment option will do the opposite of the comments below. +# +#-- distcc: Use the Distributed C/C++/ObjC compiler +#-- color: Colorize output messages +#-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD +#-- sign: Generate PGP signature file +# +BUILDENV=(!distcc color !ccache check !sign) +# +#-- If using DistCC, your MAKEFLAGS will also need modification. In addition, +#-- specify a space-delimited list of hosts running in the DistCC cluster. +#DISTCC_HOSTS="" +# +#-- Specify a directory for package building. +#BUILDDIR=/tmp/makepkg + +######################################################################### +# GLOBAL PACKAGE OPTIONS +# These are default values for the options=() settings +######################################################################### +# +# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto !autodeps) +# A negated option will do the opposite of the comments below. +# +#-- strip: Strip symbols from binaries/libraries +#-- docs: Save doc directories specified by DOC_DIRS +#-- libtool: Leave libtool (.la) files in packages +#-- staticlibs: Leave static library (.a) files in packages +#-- emptydirs: Leave empty directories in packages +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS +#-- debug: Add debugging flags as specified in DEBUG_* variables +#-- lto: Add compile flags for building with link time optimization +#-- autodeps: Automatically add depends/provides +# +OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug lto) + +#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2 +INTEGRITY_CHECK=(sha256) +#-- Options to be used when stripping binaries. See `man strip' for details. +STRIP_BINARIES="--strip-all" +#-- Options to be used when stripping shared libraries. See `man strip' for details. +STRIP_SHARED="--strip-unneeded" +#-- Options to be used when stripping static libraries. See `man strip' for details. +STRIP_STATIC="--strip-debug" +#-- Manual (man and info) directories to compress (if zipman is specified) +MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) +#-- Doc directories to remove (if !docs is specified) +DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +#-- Files to be removed from all packages (if purge is specified) +PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) +#-- Directory to store source code in for debug packages +DBGSRCDIR="/usr/src/debug" +#-- Prefix and directories for library autodeps +LIB_DIRS=('lib:usr/lib' 'lib32:usr/lib32') + +######################################################################### +# PACKAGE OUTPUT +######################################################################### +# +# Default: put built package and cached source in build directory +# +#-- Destination: specify a fixed directory where all packages will be placed +#PKGDEST=/home/packages +#-- Source cache: specify a fixed directory where source files will be cached +#SRCDEST=/home/sources +#-- Source packages: specify a fixed directory where all src packages will be placed +#SRCPKGDEST=/home/srcpackages +#-- Log files: specify a fixed directory where all log files will be placed +#LOGDEST=/home/makepkglogs +#-- Packager: name/email of the person or organization building packages +#PACKAGER="John Doe " +#-- Specify a key to use for package signing +#GPGKEY="" + +######################################################################### +# COMPRESSION DEFAULTS +######################################################################### +# +COMPRESSGZ=(gzip -c -f -n) +COMPRESSBZ2=(bzip2 -c -f) +COMPRESSXZ=(xz -c -z -) +COMPRESSZST=(zstd -c -T0 --ultra -20 -) +COMPRESSLRZ=(lrzip -q) +COMPRESSLZO=(lzop -q) +COMPRESSZ=(compress -c -f) +COMPRESSLZ4=(lz4 -q) +COMPRESSLZ=(lzip -c -f) + +######################################################################### +# EXTENSION DEFAULTS +######################################################################### +# +PKGEXT='.pkg.tar.zst' +SRCEXT='.src.tar.gz' + +######################################################################### +# OTHER +######################################################################### +# +#-- Command used to run pacman as root, instead of trying sudo and su +#PACMAN_AUTH=() +# vim: set ft=sh ts=2 sw=2 et: diff --git a/pacman/pacman.conf b/pacman/pacman.conf index 35bbd2a..f2b5b24 100644 --- a/pacman/pacman.conf +++ b/pacman/pacman.conf @@ -2,7 +2,7 @@ # /etc/pacman.conf # # See the pacman.conf(5) manpage for option and repository directives -# + # # GENERAL OPTIONS # @@ -43,6 +43,8 @@ ILoveCandy # After you install all 3 keyrings you can switch Siglevel to Required for Obarun and Archlinux # We have not begun signing packages yet, it will be done late in the beta phase # We turn it to never for now to avoid pacman problems with properly installing keys. +# SigLevel = Required DatabaseOptional if you have all +# current Arch Obarun and other keyrings properly configured SigLevel = Never #LocalFileSigLevel = Optional #RemoteFileSigLevel = Required @@ -107,6 +109,7 @@ Include = /etc/pacman.d/mirrorlist-jobo ##[obcore-testing] ##Server = https://cloud.server.obarun.org/$repo/os/$arch/ +# If you need the obarun-keyring get it here #[obcore] #Server = https://cloud.server.obarun.org/$repo/os/$arch/ diff --git a/pacman/pacman.conf-arch-recent b/pacman/pacman.conf-arch-recent new file mode 100644 index 0000000..4cfecc5 --- /dev/null +++ b/pacman/pacman.conf-arch-recent @@ -0,0 +1,97 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ +HoldPkg = pacman glibc +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#NoProgressBar +CheckSpace +#VerbosePkgLists +#ParallelDownloads = 5 + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[core-testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +#[extra-testing] +#Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs diff --git a/pacman/revertme-makepkg-remove-libdepends-and-libprovides.patch b/pacman/revertme-makepkg-remove-libdepends-and-libprovides.patch new file mode 100644 index 0000000..fa67ba5 --- /dev/null +++ b/pacman/revertme-makepkg-remove-libdepends-and-libprovides.patch @@ -0,0 +1,179 @@ +From 354a300cd26bb1c7e6551473596be5ecced921de Mon Sep 17 00:00:00 2001 +From: Allan McRae +Date: Sun, 12 Dec 2021 12:24:04 +1000 +Subject: [PATCH] makepkg: remove libdepends and libprovides + +This will be replaced by a better system + +Signed-off-by: Allan McRae +--- + doc/PKGBUILD.5.asciidoc | 9 --- + scripts/makepkg.sh.in | 118 ---------------------------------------- + 2 files changed, 127 deletions(-) + +diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc +index dee15f5e4..4ca8eb3b9 100644 +--- a/doc/PKGBUILD.5.asciidoc ++++ b/doc/PKGBUILD.5.asciidoc +@@ -187,11 +187,6 @@ contain whitespace characters. + than or equal to), `<=` (less than or equal to), `=` (equal to), `>` + (greater than), or `<` (less than). + + +-If the dependency name appears to be a library (ends with .so), makepkg will +-try to find a binary that depends on the library in the built package and +-append the version needed by the binary. Appending the version yourself +-disables automatic detection. +-+ + Additional architecture-specific depends can be added by appending an + underscore and the architecture name e.g., 'depends_x86_64=()'. + +@@ -245,10 +240,6 @@ example, dcron can provide 'cron=2.0' to satisfy the 'cron>=2.0' dependency of + other packages. Provisions involving the `>` and `<` operators are invalid as + only specific versions of a package may be provided. + + +-If the provision name appears to be a library (ends with .so), makepkg will +-try to find the library in the built package and append the correct +-version. Appending the version yourself disables automatic detection. +-+ + Additional architecture-specific provides can be added by appending an + underscore and the architecture name e.g., 'provides_x86_64=()'. + +diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in +index 3c7977db2..639ea84ac 100644 +--- a/scripts/makepkg.sh.in ++++ b/scripts/makepkg.sh.in +@@ -463,121 +463,6 @@ run_package() { + run_function_safe "package${1:+_$1}" + } + +-find_libdepends() { +- local d sodepends +- +- sodepends=0 +- for d in "${depends[@]}"; do +- if [[ $d = *.so ]]; then +- sodepends=1 +- break +- fi +- done +- +- if (( sodepends == 0 )); then +- (( ${#depends[@]} )) && printf '%s\n' "${depends[@]}" +- return 0 +- fi +- +- local libdeps filename soarch sofile soname soversion +- declare -A libdeps +- +- while IFS= read -rd '' filename; do +- # get architecture of the file; if soarch is empty it's not an ELF binary +- soarch=$(LC_ALL=C readelf -h "$filename" 2>/dev/null | sed -n 's/.*Class.*ELF\(32\|64\)/\1/p') +- [[ -n "$soarch" ]] || continue +- +- # process all libraries needed by the binary +- for sofile in $(LC_ALL=C readelf -d "$filename" 2>/dev/null | sed -nr 's/.*Shared library: \[(.*)\].*/\1/p') +- do +- # extract the library name: libfoo.so +- soname="${sofile%.so?(+(.+([0-9])))}".so +- # extract the major version: 1 +- soversion="${sofile##*\.so\.}" +- +- if [[ ${libdeps[$soname]} ]]; then +- if [[ ${libdeps[$soname]} != *${soversion}-${soarch}* ]]; then +- libdeps[$soname]+=" ${soversion}-${soarch}" +- fi +- else +- libdeps[$soname]="${soversion}-${soarch}" +- fi +- done +- done < <(find "$pkgdir" -type f -perm -u+x -print0) +- +- local libdepends v +- for d in "${depends[@]}"; do +- case "$d" in +- *.so) +- if [[ ${libdeps[$d]} ]]; then +- for v in ${libdeps[$d]}; do +- libdepends+=("$d=$v") +- done +- else +- warning "$(gettext "Library listed in %s is not required by any files: %s")" "'depends'" "$d" +- libdepends+=("$d") +- fi +- ;; +- *) +- libdepends+=("$d") +- ;; +- esac +- done +- +- (( ${#libdepends[@]} )) && printf '%s\n' "${libdepends[@]}" +-} +- +- +-find_libprovides() { +- local p versioned_provides libprovides missing +- for p in "${provides[@]}"; do +- missing=0 +- versioned_provides=() +- case "$p" in +- *.so) +- mapfile -t filename < <(find "$pkgdir" -type f -name $p\* | LC_ALL=C sort) +- if [[ $filename ]]; then +- # packages may provide multiple versions of the same library +- for fn in "${filename[@]}"; do +- # check if we really have a shared object +- if LC_ALL=C readelf -h "$fn" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then +- # get the string binaries link to (e.g. libfoo.so.1.2 -> libfoo.so.1) +- local sofile=$(LC_ALL=C readelf -d "$fn" 2>/dev/null | sed -n 's/.*Library soname: \[\(.*\)\].*/\1/p') +- if [[ -z "$sofile" ]]; then +- warning "$(gettext "Library listed in %s is not versioned: %s")" "'provides'" "$p" +- continue +- fi +- +- # get the library architecture (32 or 64 bit) +- local soarch=$(LC_ALL=C readelf -h "$fn" | sed -n 's/.*Class.*ELF\(32\|64\)/\1/p') +- +- # extract the library major version +- local soversion="${sofile##*\.so\.}" +- +- versioned_provides+=("${p}=${soversion}-${soarch}") +- else +- warning "$(gettext "Library listed in %s is not a shared object: %s")" "'provides'" "$p" +- fi +- done +- else +- missing=1 +- fi +- ;; +- esac +- +- if (( missing )); then +- warning "$(gettext "Cannot find library listed in %s: %s")" "'provides'" "$p" +- fi +- if (( ${#versioned_provides[@]} > 0 )); then +- libprovides+=("${versioned_provides[@]}") +- else +- libprovides+=("$p") +- fi +- done +- +- (( ${#libprovides[@]} )) && printf '%s\n' "${libprovides[@]}" +-} +- + write_kv_pair() { + local key="$1" + shift +@@ -617,9 +502,6 @@ write_pkginfo() { + write_kv_pair "size" "$size" + write_kv_pair "arch" "$pkgarch" + +- mapfile -t provides < <(find_libprovides) +- mapfile -t depends < <(find_libdepends) +- + write_kv_pair "license" "${license[@]}" + write_kv_pair "replaces" "${replaces[@]}" + write_kv_pair "group" "${groups[@]}" +-- +GitLab + diff --git a/pcre2/PKGBUILD b/pcre2/PKGBUILD index d2d4306..17498a0 100644 --- a/pcre2/PKGBUILD +++ b/pcre2/PKGBUILD @@ -6,16 +6,17 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=pcre2 -pkgver=10.42 -pkgrel=02 +pkgver=10.43 +pkgrel=01 pkgdesc='A library that implements Perl 5-style regular expressions. 2nd version' -arch=('x86_64') -url='https://www.pcre.org/' -depends=('readline' 'zlib' 'bzip2' 'bash') +url='https://github.com/PCRE2Project/pcre2' +depends=('bzip2' 'glibc' 'readline' 'zlib') +optdepends=('sh: for pcre2-config') provides=(libpcre2-{8,16,32,posix}.so) options=(staticlibs) #options=(debug staticlibs) ### uncomment this to have the corresponding debug pkg produced -source=("https://github.com/PhilipHazel/pcre2/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"{,.sig}) +#source=("https://github.com/PhilipHazel/pcre2/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"{,.sig}) +source=("$url/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"{,.sig}) build() { cd $pkgname-$pkgver @@ -47,13 +48,15 @@ package() { install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- -license=('BSD') +arch=(x86_64) + +license=('BSD-3-Clause') validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel -sha256sums=(8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840 # pcre2-10.42.tar.bz2 - a782dfc68ca6b0a15eaf6d4704a21cbe686037133a7e93beba1635caca4dab7c) # pcre2-10.42.tar.bz2.sig - +sha256sums=(e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb # pcre2-10.43.tar.bz2 + fe7a0bcafa5f4ee6d38b0a8c76a13c994e7effa19ef985bdf2c557e7362ab411) # pcre2-10.43.tar.bz2.sig +## b04f0dd9dacca2c261f88a211ab30e62ab28bbb470de73b3e0e69eef550b6b39 pcre2-10.43-01-x86_64.pkg.tar.lz diff --git a/pcre2/PKGBUILD-arch b/pcre2/PKGBUILD-arch index 6979a2a..1117f01 100644 --- a/pcre2/PKGBUILD-arch +++ b/pcre2/PKGBUILD-arch @@ -6,18 +6,21 @@ # Contributor: John Proctor pkgname=pcre2 -pkgver=10.42 -pkgrel=2 +pkgver=10.43 +pkgrel=1 pkgdesc='A library that implements Perl 5-style regular expressions. 2nd version' arch=('x86_64') -url='https://www.pcre.org/' -license=('BSD') -depends=('readline' 'zlib' 'bzip2' 'bash') +url='https://github.com/PCRE2Project/pcre2' +license=('BSD-3-Clause') +depends=('bzip2' 'glibc' 'readline' 'zlib') +optdepends=('sh: for pcre2-config') provides=(libpcre2-{8,16,32,posix}.so) options=(staticlibs) -source=("https://github.com/PhilipHazel/pcre2/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"{,.sig}) -sha512sums=('72fbde87fecec3aa4b47225dd919ea1d55e97f2cbcf02aba26e5a0d3b1ffb58c25a80a9ef069eb99f9cf4e41ba9604ad06a7ec159870e1e875d86820e12256d3' +source=("$url/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"{,.sig}) +sha512sums=('8ac1520c32e9e5672404aaf6104e23c9ee5c3c28ad28ff101435599d813cbb20e0491a3fd34e012b4411b3e0366a4c6dfa3f02d093acaa6ff0ab25478bb7ade9' 'SKIP') +b2sums=('f87f9f36dd6a806cdba1f077f51b53da2583f1898f83e41d594622b28ac8efbc1b2d122b752a9d6cd461fe0e3c7c85ee93358443df518a336da4ee9d72cca808' + 'SKIP') validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel build() { diff --git a/shadow/0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch b/shadow/0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch index 5cbc983..47816ab 100644 --- a/shadow/0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch +++ b/shadow/0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch @@ -1,4 +1,4 @@ -From 65491334d3fda509306bb72335e6dc56888c9724 Mon Sep 17 00:00:00 2001 +From 6b04a147cafc68d46e8ad097975fbd4dfaf1a1ed Mon Sep 17 00:00:00 2001 From: David Runge Date: Sat, 5 Nov 2022 23:40:18 +0100 Subject: [PATCH 1/3] Disable replaced tools, their man pages and PAM @@ -57,7 +57,7 @@ index b8e4321f..73d4554f 100644 passwd diff --git a/man/Makefile.am b/man/Makefile.am -index 89d97937..d2741036 100644 +index cffef699..f57e476d 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -8,10 +8,8 @@ endif @@ -652,7 +652,7 @@ index c36ed2c7..26696b67 100644 man8/userdel.8 \ man8/usermod.8 diff --git a/src/Makefile.am b/src/Makefile.am -index fcfee9d2..0bab08a8 100644 +index b6cb09ef..bfe73b09 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ EXTRA_DIST = \ diff --git a/shadow/0002-Adapt-login.defs-for-PAM-and-util-linux.patch b/shadow/0002-Adapt-login.defs-for-PAM-and-util-linux.patch index ccf2409..f4b24d1 100644 --- a/shadow/0002-Adapt-login.defs-for-PAM-and-util-linux.patch +++ b/shadow/0002-Adapt-login.defs-for-PAM-and-util-linux.patch @@ -1,4 +1,4 @@ -From bb10dbe53f1c8613a9586d5255b878f3fc954ef1 Mon Sep 17 00:00:00 2001 +From f65ece73bcd44caaf8ff62c0f427f960be1f40f2 Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 31 Oct 2022 09:45:13 +0100 Subject: [PATCH 2/3] Adapt login.defs for PAM and util-linux @@ -65,12 +65,12 @@ from util-linux: man/login.defs.5.xml: Remove unavailable options from man 5 login.defs. --- - etc/login.defs | 228 +------------------------------------------ - man/login.defs.5.xml | 150 +--------------------------- - 2 files changed, 8 insertions(+), 370 deletions(-) + etc/login.defs | 223 +------------------------------------------ + man/login.defs.5.xml | 148 +--------------------------- + 2 files changed, 8 insertions(+), 363 deletions(-) diff --git a/etc/login.defs b/etc/login.defs -index 114dbcd9..797ca6b3 100644 +index 33622c29..797ca6b3 100644 --- a/etc/login.defs +++ b/etc/login.defs @@ -3,6 +3,8 @@ @@ -245,7 +245,7 @@ index 114dbcd9..797ca6b3 100644 # Default initial "umask" value used by login(1) on non-PAM enabled systems. # Default "umask" value for pam_umask(8) on PAM enabled systems. # UMASK is also used by useradd(8) and newusers(8) to set the mode for new -@@ -211,27 +91,12 @@ UMASK 022 +@@ -211,22 +91,12 @@ UMASK 022 # # PASS_MAX_DAYS Maximum number of days a password may be used. # PASS_MIN_DAYS Minimum number of days allowed between password changes. @@ -264,16 +264,11 @@ index 114dbcd9..797ca6b3 100644 -# will be able to "su" to uid 0. -# -SU_WHEEL_ONLY no -- --# --# If compiled with cracklib support, sets the path to the dictionaries --# --CRACKLIB_DICTPATH /var/cache/cracklib/cracklib_dict - # # Min/max values for automatic uid selection in useradd(8) # -@@ -268,28 +133,6 @@ LOGIN_RETRIES 5 +@@ -263,28 +133,6 @@ LOGIN_RETRIES 5 # LOGIN_TIMEOUT 60 @@ -302,7 +297,7 @@ index 114dbcd9..797ca6b3 100644 # # Which fields may be changed by regular users using chfn(1) - use # any combination of letters "frwh" (full name, room number, work -@@ -298,38 +141,13 @@ CHFN_AUTH yes +@@ -293,38 +141,13 @@ CHFN_AUTH yes # CHFN_RESTRICT rwh @@ -341,7 +336,7 @@ index 114dbcd9..797ca6b3 100644 # # Note: If you use PAM, it is recommended to use a value consistent with # the PAM modules configuration. -@@ -353,21 +171,6 @@ CHFN_RESTRICT rwh +@@ -348,21 +171,6 @@ CHFN_RESTRICT rwh #SHA_CRYPT_MIN_ROUNDS 5000 #SHA_CRYPT_MAX_ROUNDS 5000 @@ -363,7 +358,7 @@ index 114dbcd9..797ca6b3 100644 # # Only works if ENCRYPT_METHOD is set to YESCRYPT. # -@@ -381,17 +184,6 @@ CHFN_RESTRICT rwh +@@ -376,17 +184,6 @@ CHFN_RESTRICT rwh # #YESCRYPT_COST_FACTOR 5 @@ -381,7 +376,7 @@ index 114dbcd9..797ca6b3 100644 # # Should login be allowed if we can't cd to the home directory? # Default is no. -@@ -406,12 +198,6 @@ DEFAULT_HOME yes +@@ -401,12 +198,6 @@ DEFAULT_HOME yes # NONEXISTENT /nonexistent @@ -394,7 +389,7 @@ index 114dbcd9..797ca6b3 100644 # # If defined, this command is run when removing a user. # It should remove any at/cron/print jobs etc. owned by -@@ -459,14 +245,6 @@ USERGROUPS_ENAB yes +@@ -454,14 +245,6 @@ USERGROUPS_ENAB yes # #GRANT_AUX_GROUP_SUBIDS yes @@ -410,13 +405,14 @@ index 114dbcd9..797ca6b3 100644 # Select the HMAC cryptography algorithm. # Used in pam_timestamp module to calculate the keyed-hash message diff --git a/man/login.defs.5.xml b/man/login.defs.5.xml -index ab62fa86..d82c47f1 100644 +index 05ef5125..1ddf537e 100644 --- a/man/login.defs.5.xml +++ b/man/login.defs.5.xml -@@ -7,69 +7,38 @@ +@@ -7,70 +7,38 @@ --> - - @@ -483,10 +479,11 @@ index ab62fa86..d82c47f1 100644 -@@ -145,47 +114,25 @@ +@@ -147,48 +115,25 @@ The following configuration items are provided: +- &BCRYPT_MIN_ROUNDS; - &CHFN_AUTH; &CHFN_RESTRICT; - &CHSH_AUTH; @@ -531,7 +528,7 @@ index ab62fa86..d82c47f1 100644 &PASS_MAX_DAYS; &PASS_MIN_DAYS; &PASS_WARN_AGE; -@@ -195,25 +142,16 @@ +@@ -198,25 +143,16 @@ time of account creation. Any changes to these settings won't affect existing accounts. @@ -557,35 +554,16 @@ index ab62fa86..d82c47f1 100644 &UMASK; &USERDEL_CMD; &USERGROUPS_ENAB; -@@ -239,9 +177,7 @@ - chfn - - -- CHFN_AUTH - CHFN_RESTRICT -- LOGIN_STRING - - - -@@ -249,7 +185,7 @@ - chgpasswd - +@@ -255,7 +191,7 @@ + BCRYPT_MAX_ROUNDS + BCRYPT_MIN_ROUNDS - ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB + ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS - -@@ -259,8 +195,6 @@ - chpasswd - - -- ENCRYPT_METHOD -- MD5_CRYPT_ENAB - SHA_CRYPT_MAX_ROUNDS - SHA_CRYPT_MIN_ROUNDS - -@@ -270,7 +204,7 @@ + YESCRYPT_COST_FACTOR +@@ -280,7 +216,7 @@ chsh @@ -594,16 +572,16 @@ index ab62fa86..d82c47f1 100644 -@@ -280,7 +214,7 @@ - gpasswd - +@@ -292,7 +228,7 @@ + BCRYPT_MAX_ROUNDS + BCRYPT_MIN_ROUNDS - ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB + ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS - -@@ -339,35 +273,6 @@ + YESCRYPT_COST_FACTOR +@@ -352,35 +288,6 @@ LASTLOG_UID_MAX @@ -639,8 +617,8 @@ index ab62fa86..d82c47f1 100644 newgrp / sg -@@ -382,7 +287,7 @@ - +@@ -397,7 +304,7 @@ + BCRYPT_MIN_ROUNDS ENCRYPT_METHOD GID_MAX GID_MIN - MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB @@ -648,17 +626,17 @@ index ab62fa86..d82c47f1 100644 HOME_MODE PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE SHA_CRYPT_MAX_ROUNDS -@@ -399,8 +304,7 @@ - passwd - +@@ -417,8 +324,7 @@ + BCRYPT_MAX_ROUNDS + BCRYPT_MIN_ROUNDS - ENCRYPT_METHOD MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB - PASS_ALWAYS_WARN PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN + ENCRYPT_METHOD SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS - -@@ -432,32 +336,6 @@ + YESCRYPT_COST_FACTOR +@@ -451,32 +357,6 @@ @@ -679,19 +657,19 @@ index ab62fa86..d82c47f1 100644 - - - -- +- - sulogin - - - ENV_HZ -- ENV_TZ +- ENV_TZ - - - useradd -@@ -486,24 +364,6 @@ +@@ -505,24 +385,6 @@ diff --git a/shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch b/shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch index 2fa32ec..ebac05a 100644 --- a/shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch +++ b/shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch @@ -1,4 +1,4 @@ -From 5aaec6a5be50c77eb7feb5217f2d26b2fafd3a01 Mon Sep 17 00:00:00 2001 +From 3e0544295a2c0d69fc8cc509b5ec0ce254a5d642 Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 31 Oct 2022 10:10:22 +0100 Subject: [PATCH 3/3] Add Arch Linux defaults for login.defs diff --git a/shadow/PKGBUILD b/shadow/PKGBUILD index a3315c7..82eb8ba 100644 --- a/shadow/PKGBUILD +++ b/shadow/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=shadow -pkgver=4.14.6 +pkgver=4.15.0 pkgrel=01 pkgdesc="Password and account management tool suite with support for shadow files and PAM w/o systemd" url="https://github.com/shadow-maint/shadow" @@ -63,6 +63,7 @@ build() { --with-fcaps # use capabilities instead of setuid for setuidmap and setgidmap --with-group-name-max-length=32 --with-yescrypt + --without-bcrypt --with-libpam # PAM integration for chpasswd, groupmems, newusers, passwd --without-libbsd # shadow can use internal implementation for getting passphrase --without-nscd # we do not ship nscd anymore @@ -114,14 +115,14 @@ license=(BSD-3-Clause) validpgpkeys=(66D0387DB85D320F8408166DB175CFA98F192AF2 # Serge Hallyn A9348594CE31283A826FBDD8D57633D441E25BB5) # Alejandro Colomar -sha256sums=(17bdd568e7683e5df4e2de6cf69b0905d8a3a028c1689eb189005fea268e0ad6 # shadow-4.14.6.tar.xz - d5c8f322fcde2b84b51ae142ca179d3656d1482b52ef305b76d40c3cc73ce7af # shadow-4.14.6.tar.xz.asc - 0910a752e58576af274bb41e2fa9278001abefb8ee9f746ac6e0ef2f178c7189 # 0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch - bde9ba1ce9e8e5eab2875112436026e32ccaf444cc1fe0b1d3d71d9b9d751f2a # 0002-Adapt-login.defs-for-PAM-and-util-linux.patch - da402a6ba555d1e36abd0e2271f965d31fe6677a64cc2657272518e2c249f91f # 0003-Add-Arch-Linux-defaults-for-login.defs.patch +sha256sums=(e2e22c1b2a6241c9ed828387f1065b7eaa2e87c3d221550d1575cf6a35247c0d # shadow-4.15.0.tar.xz + b4135ed20a19596263668d0e5bf45c8e54ed26d6556ee231fdfba499e8114e47 # shadow-4.15.0.tar.xz.asc + 22192c082687e81aacae4c89c1cd6762715c883dcbfe231796d2834195176ea3 # 0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch + b572f6dae60b5aec57fbaa8c2448daebe9aea6750119b6799d7c1daa253f11f3 # 0002-Adapt-login.defs-for-PAM-and-util-linux.patch + 50ac294e96dfed938fb4711c8cfc1ac00559eaf4c29b3b2c1c2d46255440077b # 0003-Add-Arch-Linux-defaults-for-login.defs.patch 29448220f2ecfeab0a1a7aae296f07ca522d0a75a5b20df30f83950f9d54531f # shadow.sysusers c2faa81b894de452e6cd23660ad7e30a4e03d6a4eacb94ff209c6e578df05e61 # shadow.tmpfiles 2d4b7b85ea1d5cddf93c2d636a11b0e76c1f484474449bdb018e3af0fcbd93c3) # useradd.defaults -## 6fdfd4f85d39ff692bf4bf4fdd5cb81aa8eacddabe1ee2e4beff0ef6503d0f74 shadow-4.14.6-01-x86_64.pkg.tar.lz +## 4820ee284eb933c4684f02bcab3dabb83faf4a3e4ed0128231595ed7ec3b712e shadow-4.15.0-01-x86_64.pkg.tar.lz diff --git a/shadow/PKGBUILD-arch b/shadow/PKGBUILD-arch index c9c9679..3827d34 100644 --- a/shadow/PKGBUILD-arch +++ b/shadow/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: Aaron Griffin pkgname=shadow -pkgver=4.14.6 +pkgver=4.15.0 pkgrel=1 pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=(x86_64) @@ -42,21 +42,21 @@ source=( shadow.{sysusers,tmpfiles} useradd.defaults ) -sha512sums=('994a81afbafb19622a1d0f84527f96a84b0955c4ffa5e826682ead82af7940b8e3a091514bd2075622ebdf7638643c9c6b6b7ac3e48d985278db896249d70ae6' +sha512sums=('88d72fb706f6792b460c14a9b1b42fe0b5962834ec3793f296cbc138807736b5ad73d3f802cda74db740a71545eb1c8ec47447c2250299eb730ed2b2674e2249' 'SKIP' - '3c1d20025c238c1f06960b845854fff6074ad33f9894bacc4943dd320d5e8ec1a7614252d497b6fc8459792d06c00a69f4c50cdcbb8b40e3e59059bdb52b2209' - '330e22f2dfbe444b42b40c52be352d62cd0b656dc760bea6e40ab0bb8ab210695185a376483c128cf1a889df413de8b990e3ceebf5f2e16b48fb083bcab2a240' - '54fa3355b67c87d47190ca8bf24557a930fd439e1e197e66989a48d9a819c0bbe8da645be4365142ba3f599ce240d4a092f9df7268dfc41bea92ae0dac378809' + '0e1d95b28650d9bcb35a8e5cd2fe528376a58bc1293ac7bf827ea38cd9fd5797dab3c418e15e387414685d1cd22cbf59c93cdced8a15fe79e44055a92b733ff5' + '45344a1baa74d5305bc26c4d9153bee0a61a22bcd1ab81f5bb61be56f59583ddfbc8906ee756e4bf7053ee1ce7aa57699a1751160b8067a4a8d656f694e69003' + '2d930e62d5a50f32d580d09c9b2564f456b34a56f12a6720592fcd28aab0faee3d52330b63dc9f4a9ca1d8594d1fceb6dc4f6961e04f4c3f9e937ca45f97cc95' 'e4edf705dd04e088c6b561713eaa1afeb92f42ac13722bff037aede6ac5ad7d4d00828cfb677f7b1ff048db8b6788238c1ab6a71dfcfd3e02ef6cb78ae09a621' '2c8689b52029f6aa27d75b8b05b0b36e2fc322cab40fdfbb50cdbe331f61bc84e8db20f012cf9af3de8c4e7fdb10c2d5a4925ca1ba3b70eb5627772b94da84b3' '5afac4a96b599b0b8ed7be751e7160037c3beb191629928c6520bfd3f2adcd1c55c31029c92c2ff8543e6cd9e37e2cd515ba4e1789c6d66f9c93b4e7f209ee7a' '97a6a57c07502e02669dc1a91bffc447dba7d98d208b798d80e07de0d2fdf9d23264453978d2d3d1ba6652ca1f2e22cdadc4309c7b311e83fa71b00ad144f877' '706ba6e7fa8298475f2605a28daffef421c9fa8d269cbd5cbcf7f7cb795b40a24d52c20e8d0b73e29e6cd35cd7226b3e9738dc513703e87dde04c1d24087a69c') -b2sums=('e910131eab6527c1222afadf02ebd7bd6a3460baf95c23cc9eefa7aa21ddb70c02e58e4f58db2cb24fa8e2996c82b11664420545a8b1af573e4e6a25ceb3f921' +b2sums=('1a7594c6f93d1c8cad8caa574cdcda60a48d7c001c9ad48e540b26763d9a1cd7fba9501a0a451a5a64889dd6c0cbcf4d026fc72a7ee5a3ee682931bfe7e1b391' 'SKIP' - '565f625b3794aabd68fcb7e72a50a48109674b6650073c5f757b7722f51d4b42dc60ad290b9e24bbd2de41528751c6fa3d1d3b6e69c34576d3568b4f4f625bf6' - '0ea92cade7824c40542dbf1e1c964dc729c92beaa25632f5ee60f89ec9d2ba0c699149af064c057ed68242f85b835d6f9f4d185838fa91efbcbb97c6175883de' - '9ac5719a6f0fc0cae436dda9e8dd3eb8ced4702ee3812db777198e61232d575dbb6be46ef3bbacf39b9c3938dfe0a6e4d00ce0e44fcf3769ec93e68e7365f3fd' + '42474c557f9dff0a28b7e56b6feb2cfc88a81ba159afda407b718828277cb82195a94b871129781c898544297c91a92e5848f9c2a2736fabad03cdddfdf2a3dc' + '9986adb40974fb4bbbc5a64fa0ff5edbdaf5c2850f1643ffd3bb44e1dc0772c691ae19b2ac7fc3c019aae951c7b380948548205ab912e89a7d194c9eaf393e80' + '14a428c9ca883be5f0c6d9de7e89d4d02593fdf0ff23d172c02ffe9abd3ebb37c7aca58a407be2ffcacd890cce81289b04ad04bc0e4052fb58b0799faa090ae1' '5cfc936555aa2b2e15f8830ff83764dad6e11a80e2a102c5f2bd3b7c83db22a5457a3afdd182e3648c9d7d5bca90fa550f59576d0ac47a11a31dfb636cb18f2b' 'a69191ab966f146c35e7e911e7e57c29fffd54436ea014aa8ffe0dd46aaf57c635d0a652b35916745c75d82b3fca7234366ea5f810b622e94730b45ec86f122c' '511c4ad9f3be530dc17dd68f2a3387d748dcdb84192d35f296b88f82442224477e2a74b1841ec3f107b39a5c41c2d961480e396a48d0578f8fd5f65dbe8d9f04' @@ -96,6 +96,7 @@ build() { --with-group-name-max-length=32 --with-libpam # PAM integration for chpasswd, groupmems, newusers, passwd --with-yescrypt + --without-bcrypt --without-libbsd # shadow can use internal implementation for getting passphrase --without-nscd # we do not ship nscd anymore --without-selinux diff --git a/sqlite/PKGBUILD b/sqlite/PKGBUILD index 4787b83..96152e3 100644 --- a/sqlite/PKGBUILD +++ b/sqlite/PKGBUILD @@ -7,10 +7,10 @@ pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl' 'sqlite-analyzer' 'lemon' 'sqlite-doc') -_srcver=3450100 +_srcver=3450200 _docver=${_srcver} -#_docver=3440000 -pkgver=3.45.1 +#_docver=3450200 +pkgver=3.45.2 pkgrel=01 pkgdesc="A C library that implements an SQL database engine" url="https://www.sqlite.org/" @@ -164,14 +164,14 @@ arch=(x86_64) license=('LicenseRef-Sqlite') -sha256sums=(7f7b14a68edbcd4a57df3a8c4dbd56d2d3546a6e7cdd50de40ceb03af33d34ba # sqlite-src-3450100.zip - bbe376fdd36884a00f4dd93bcd6e80470d66408d4957cb23ba22931fa579206a # sqlite-doc-3450100.zip +sha256sums=(4a45a3577cc8af683c4bd4c6e81a7c782c5b7d5daa06175ea2cb971ca71691b1 # sqlite-src-3450200.zip + 645fd1078a4a03cfe83bfccc380685cc5dcf7dd132a23f78fad4f660e40cf2c7 # sqlite-doc-3450200.zip 55746d93b0df4b349c4aa4f09535746dac3530f9fd6de241c9f38e2c92e8ee97 # sqlite-lemon-system-template.patch 4e57d9ac979f1c9872e69799c2597eeef4c6ce7224f3ede0bf9dc8d217b1e65d) # license.txt -## 62839925f5867790f979a2437987fb4c8871c6b8a11e5ee8cfdd41872747e627 lemon-3.45.1-01-x86_64.pkg.tar.lz -## 361c1263fcc3a92e4a111e56593055ba75e0b4dc2d7a2692a711e7767feccb33 sqlite-3.45.1-01-x86_64.pkg.tar.lz -## 69018cf8a0f2aa32ad18b81b5b124c6506385c0c162cb1fdcfd1a78c8821ff2f sqlite-analyzer-3.45.1-01-x86_64.pkg.tar.lz -## e00b51c9d225049bb71b934a8db2ed77a2522bb551b27607a68ae79015f3afd8 sqlite-doc-3.45.1-01-x86_64.pkg.tar.lz -## 6b87321552178f8e21e866c52858eb7f66f45ff738daff8aa7287c2c3bcc4b06 sqlite-tcl-3.45.1-01-x86_64.pkg.tar.lz +## a71536921bb8b5360ed765644f0046aaa1dd4580ec2955ecde0aef5d7248a1a2 lemon-3.45.2-01-x86_64.pkg.tar.lz +## 4e90d9598fcb264eb13ffd0161436271f218bdf81de94a682cb7849ac91dfa2b sqlite-3.45.2-01-x86_64.pkg.tar.lz +## 03f570cc36d3563630ef0580d6785cbb12ac8fc610b520c482fd7d21a2661fa5 sqlite-analyzer-3.45.2-01-x86_64.pkg.tar.lz +## 1fa74e64577d1bde29abe663fe46890acb9f85e91b6c9ca85a58534295ae32cc sqlite-doc-3.45.2-01-x86_64.pkg.tar.lz +## 9af0085d671c67390dc8aaa0813003a4a44d42beff76e0aed32710a0d09c5c80 sqlite-tcl-3.45.2-01-x86_64.pkg.tar.lz diff --git a/sqlite/PKGBUILD-arch b/sqlite/PKGBUILD-arch index 427f207..b8c8f2f 100644 --- a/sqlite/PKGBUILD-arch +++ b/sqlite/PKGBUILD-arch @@ -3,10 +3,10 @@ pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl' 'sqlite-analyzer' 'lemon' 'sqlite-doc') -_srcver=3450100 +_srcver=3450200 _docver=${_srcver} #_docver=3440000 -pkgver=3.45.1 +pkgver=3.45.2 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('x86_64') @@ -19,8 +19,8 @@ source=(https://www.sqlite.org/2024/sqlite-src-${_srcver}.zip sqlite-lemon-system-template.patch license.txt) # upstream now switched to sha3sums - currently not supported by makepkg -sha256sums=('7f7b14a68edbcd4a57df3a8c4dbd56d2d3546a6e7cdd50de40ceb03af33d34ba' - 'bbe376fdd36884a00f4dd93bcd6e80470d66408d4957cb23ba22931fa579206a' +sha256sums=('4a45a3577cc8af683c4bd4c6e81a7c782c5b7d5daa06175ea2cb971ca71691b1' + '645fd1078a4a03cfe83bfccc380685cc5dcf7dd132a23f78fad4f660e40cf2c7' '55746d93b0df4b349c4aa4f09535746dac3530f9fd6de241c9f38e2c92e8ee97' '4e57d9ac979f1c9872e69799c2597eeef4c6ce7224f3ede0bf9dc8d217b1e65d') diff --git a/xz/PKGBUILD b/xz/PKGBUILD index a0da137..644c729 100644 --- a/xz/PKGBUILD +++ b/xz/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=xz -pkgver=5.6.0 +pkgver=5.6.1 pkgrel=01 pkgdesc='Library and command line tools for XZ and LZMA compressed files' depends=('sh') @@ -57,7 +57,9 @@ license=('GPL' 'LGPL' 'custom') validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620' # Lasse Collin '22D465F2B4C173803B20C6DE59FCF207FEA7F445') # Jia Tan -sha256sums=(0f5c81f14171b74fcc9777d302304d964e63ffc2d7b634ef023a7249d9b5d875 # xz-5.6.0.tar.gz - 3c7b8a2b41d35da3da5fe3872aadd3f0cecd9527f9aec84a110e0df94d7f0ea3) # xz-5.6.0.tar.gz.sig +sha256sums=(2398f4a8e53345325f44bdd9f0cc7401bd9025d736c6d43b372f4dea77bf75b8 # xz-5.6.1.tar.gz + 2a0745db95fee581cba776c3f68e75729d8bdc0f3db6e4453d6391894c100dac) # xz-5.6.1.tar.gz.sig + +## 6a238ccd96c10791beae15c674ca93364f31b1ad2dc74f8945520dfec531e75d xz-5.6.1-01-x86_64.pkg.tar.lz + -## 486a4d6620424a1e0795b27fa6f74eca45202267925539c8bd6884781d21b926 xz-5.6.0-01-x86_64.pkg.tar.lz diff --git a/xz/PKGBUILD-arch b/xz/PKGBUILD-arch index 5bf6ccd..5ca3722 100644 --- a/xz/PKGBUILD-arch +++ b/xz/PKGBUILD-arch @@ -2,7 +2,7 @@ # Contributor: François Charette pkgname=xz -pkgver=5.6.0 +pkgver=5.6.1 pkgrel=1 pkgdesc='Library and command line tools for XZ and LZMA compressed files' arch=('x86_64') @@ -13,9 +13,9 @@ provides=('liblzma.so') validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620' # Lasse Collin '22D465F2B4C173803B20C6DE59FCF207FEA7F445') # Jia Tan source=("https://github.com/tukaani-project/xz/releases/download/v${pkgver}/xz-${pkgver}.tar.gz"{,.sig}) -sha256sums=('0f5c81f14171b74fcc9777d302304d964e63ffc2d7b634ef023a7249d9b5d875' +sha256sums=('2398f4a8e53345325f44bdd9f0cc7401bd9025d736c6d43b372f4dea77bf75b8' 'SKIP') -sha512sums=('1ef3cd3607818314e55b28c20263a9088d4b6e5362a45fbd37c17e799e26b4a7579928b99925ffe71e7804b0db2f65936f66a825bac9b23b7b0664f902925de8' +sha512sums=('8af100eb83288f032e4813be2bf8de7d733c8761f77f078776c1391709241ad8fe3192d107664786e2543677915c5eeb3fe7add5c53b48b50c10a9de7c9f4fda' 'SKIP') build() {