diff --git a/iana-etc/PKGBUILD b/iana-etc/PKGBUILD index 85be010..9dc9826 100644 --- a/iana-etc/PKGBUILD +++ b/iana-etc/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=iana-etc -pkgver=20231228 -_protocols=protocol-numbers-20231107 +pkgver=20240222 +_protocols=protocol-numbers-20240108 _ports=service-names-port-numbers-${pkgver} pkgrel=01 pkgdesc='/etc/protocols and /etc/services provided by IANA' @@ -55,9 +55,8 @@ arch=('any') license=('custom:none') -sha256sums=(a71aa521b91c6ef986261420d1019170a2ebe568db1e272a83f8a70c474756d3 # service-names-port-numbers-20231228.xml - 01aee83ab0efd18d9c92b9497c8eaec454471a9613dbb66b1e859313ea75e68d # protocol-numbers-20231117.xml +sha256sums=(929d5704a023365a2e2e6660eee8cc496a2d9f2c84d9f8999fec181411dd2aea # service-names-port-numbers-20240222.xml + e64103b5e38f4ad69067f17269bc70b524f7cbf54ec97b7f0292c92f82ced2bd # protocol-numbers-20240108.xml dd37e92942d5a4024f1c77df49d61ca77fc6284691814903a741785df61f78cb) # LICENSE -## 2cf328ecaa97017f94fb7ace45f0f05a829fec8a1b868b516ca7c9d3f34ff63e iana-etc-20231228-01-any.pkg.tar.lz - +## c9312b086cf78a81b2bb3757965da101095d85a48b421e2e01db0ff8c6dbd3e4 iana-etc-20240222-01-any.pkg.tar.lz diff --git a/iana-etc/PKGBUILD-arch b/iana-etc/PKGBUILD-arch index 102efd6..d1f9d67 100644 --- a/iana-etc/PKGBUILD-arch +++ b/iana-etc/PKGBUILD-arch @@ -3,9 +3,9 @@ # Maintainer: Jelle van der Waa pkgname=iana-etc -pkgver=20231228 +pkgver=20240222 _ports=service-names-port-numbers-${pkgver} -_protocols=protocol-numbers-20231107 +_protocols=protocol-numbers-20240108 pkgrel=1 pkgdesc='/etc/protocols and /etc/services provided by IANA' url='https://www.iana.org/protocols' @@ -15,8 +15,8 @@ backup=('etc/'{protocols,services}) source=("https://sources.archlinux.org/other/packages/iana-etc/${_ports}.xml" "https://sources.archlinux.org/other/packages/iana-etc/${_protocols}.xml" 'LICENSE') -sha256sums=('a71aa521b91c6ef986261420d1019170a2ebe568db1e272a83f8a70c474756d3' - '01aee83ab0efd18d9c92b9497c8eaec454471a9613dbb66b1e859313ea75e68d' +sha256sums=('929d5704a023365a2e2e6660eee8cc496a2d9f2c84d9f8999fec181411dd2aea' + 'e64103b5e38f4ad69067f17269bc70b524f7cbf54ec97b7f0292c92f82ced2bd' 'dd37e92942d5a4024f1c77df49d61ca77fc6284691814903a741785df61f78cb') # Original but unversioned IANA files: diff --git a/mdadm/PKGBUILD b/mdadm/PKGBUILD index 33b0a6d..b00de26 100644 --- a/mdadm/PKGBUILD +++ b/mdadm/PKGBUILD @@ -6,24 +6,23 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=mdadm -pkgver=4.2 -pkgrel=03 +pkgver=4.3 +pkgrel=02 pkgdesc='A tool for managing/monitoring Linux md device arrays, also known as Software RAID w/o systemd' url='https://git.kernel.org/pub/scm/utils/mdadm' makedepends=('git') depends=('glibc') +conflicts=('mkinitcpio<38') replaces=('raidtools') backup=('etc/mdadm.conf') optdepends=('bash: mdcheck') source=("git+https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git#tag=${pkgname}-${pkgver}?signed" - 'disable-werror.patch' - 'mdadm.conf' - 'mdadm_udev_install') + 'mdadm.conf') -prepare() { - cd mdadm - patch -Np0 -i ${srcdir}/disable-werror.patch -} +#prepare() { +# cd mdadm +# patch -Np0 -i ${srcdir}/disable-werror.patch +#} build() { cd mdadm @@ -36,23 +35,20 @@ package() { make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR="$pkgdir" UDEVDIR=/usr/lib/udev install install -D -m644 ../mdadm.conf "$pkgdir"/etc/mdadm.conf - install -D -m644 ../mdadm_udev_install "$pkgdir"/usr/lib/initcpio/install/mdadm_udev install -D -m755 misc/mdcheck "$pkgdir"/usr/share/mdadm/mdcheck - ln -s mdadm_udev "$pkgdir"/usr/lib/initcpio/install/mdadm } #---- arch license gpg-key & sha256sums ---- arch=(x86_64) -license=('GPL') +license=('GPL-2.0-or-later') -validpgpkeys=('6A86B80E1D22F21D0B26BA75397D82E0531A9C91') # Jes Sorensen +validpgpkeys=(6A86B80E1D22F21D0B26BA75397D82E0531A9C91 # Jes Sorensen + EED84966493AEEAF4B466F696F9E3E9D4EDEBB11) # Mariusz Tkaczyk sha256sums=(SKIP - 85c98b8fe880bdd365fc0e400af10c2e5d0c439d338e055f66c16162f9282846 # disable-werror.patch - 4ce1e90690282f98e4828e11576fbd61be65e97a2cdae6c7eac7035ea5ee53e5 # mdadm.conf - b6782029bdae2d7f87ea0e332bb90f72a7792e933580e37602e81e2f1bb82a9c) # mdadm_udev_install + d2d64fc4ab823b347f7fea7fa0326aa7edb6dcdf6e987a53856b07178ad0886e) # mdadm.conf -## d998cf2f785e6f50536dc26814f437991227c010039e85d22ae10f2271cf9a1e mdadm-4.2-03-x86_64.pkg.tar.lz +## a72b6f42dd245fb619a86456ba0cada3602be8d611300e439983268d25fe909f mdadm-4.3-02-x86_64.pkg.tar.lz diff --git a/mdadm/PKGBUILD-arch b/mdadm/PKGBUILD-arch index 98d2e14..5ecdf1e 100644 --- a/mdadm/PKGBUILD-arch +++ b/mdadm/PKGBUILD-arch @@ -2,30 +2,25 @@ # Contributor: Judd Vinet pkgname=mdadm -pkgver=4.2 +pkgver=4.3 pkgrel=2 pkgdesc='A tool for managing/monitoring Linux md device arrays, also known as Software RAID' arch=('x86_64') -license=('GPL') +license=('GPL-2.0-or-later') url='https://git.kernel.org/pub/scm/utils/mdadm' makedepends=('git') depends=('glibc' 'systemd') +conflicts=('mkinitcpio<38') optdepends=('bash: mdcheck') replaces=('raidtools') backup=('etc/mdadm.conf') -validpgpkeys=('6A86B80E1D22F21D0B26BA75397D82E0531A9C91') # Jes Sorensen +validpgpkeys=('6A86B80E1D22F21D0B26BA75397D82E0531A9C91' # Jes Sorensen + 'EED84966493AEEAF4B466F696F9E3E9D4EDEBB11' # Mariusz Tkaczyk + ) source=("git+https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git#tag=${pkgname}-${pkgver}?signed" - 'disable-werror.patch' - 'mdadm.conf' - 'mdadm_udev_install') + 'mdadm.conf') sha256sums=('SKIP' - '85c98b8fe880bdd365fc0e400af10c2e5d0c439d338e055f66c16162f9282846' - '4ce1e90690282f98e4828e11576fbd61be65e97a2cdae6c7eac7035ea5ee53e5' - 'b6782029bdae2d7f87ea0e332bb90f72a7792e933580e37602e81e2f1bb82a9c') -prepare() { - cd mdadm - patch -Np0 -i ${srcdir}/disable-werror.patch -} + '4ce1e90690282f98e4828e11576fbd61be65e97a2cdae6c7eac7035ea5ee53e5') build() { cd mdadm @@ -39,7 +34,5 @@ package() { make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR="$pkgdir" UDEVDIR=/usr/lib/udev install make SYSTEMD_DIR="$pkgdir"/usr/lib/systemd/system install-systemd install -D -m644 ../mdadm.conf "$pkgdir"/etc/mdadm.conf - install -D -m644 ../mdadm_udev_install "$pkgdir"/usr/lib/initcpio/install/mdadm_udev install -D -m755 misc/mdcheck "$pkgdir"/usr/share/mdadm/mdcheck - ln -s mdadm_udev "$pkgdir"/usr/lib/initcpio/install/mdadm } diff --git a/mdadm/deps b/mdadm/deps index 5664e30..f4099d9 100644 --- a/mdadm/deps +++ b/mdadm/deps @@ -1 +1,3 @@ git + + diff --git a/mdadm/key b/mdadm/key index ca5d07b..48a80d0 100644 --- a/mdadm/key +++ b/mdadm/key @@ -1 +1,3 @@ gpg -v --recv-key 397D82E0531A9C91 +gpg -v --recv-key 6F9E3E9D4EDEBB11 + diff --git a/mdadm/mdadm.conf b/mdadm/mdadm.conf index 36eaa0c..cc4960a 100644 --- a/mdadm/mdadm.conf +++ b/mdadm/mdadm.conf @@ -60,7 +60,7 @@ DEVICE partitions # When used in --follow (aka --monitor) mode, mdadm needs a # mail address and/or a program. To start mdadm's monitor mode, enable -# mdadm.service in systemd. +# mdadm.service. # # If the lines are not found, mdadm will exit quietly #MAILADDR root@mydomain.tld diff --git a/mkinitcpio/PKGBUILD b/mkinitcpio/PKGBUILD index 63ca33c..6cc0145 100644 --- a/mkinitcpio/PKGBUILD +++ b/mkinitcpio/PKGBUILD @@ -7,7 +7,7 @@ pkgname=mkinitcpio pkgver=38 -pkgrel=01 +pkgrel=04 pkgdesc="Modular initramfs image creation utility w/o systemd zstd " #url='https://github.com/archlinux/mkinitcpio' #url='https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio' @@ -17,7 +17,7 @@ install=mkinitcpio.install depends=('awk' 'mkinitcpio-busybox>=1.35.0' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils' 'bash' 'binutils' 'diffutils' 'findutils' 'grep' 'filesystem' 'gzip') checkdepends=('bats' 'bats-assert' 'lzop') -conflicts=('systemd>0' 'cryptsetup<2.7.0-2' 'mdadm<4.3-2' 'lvm2<2.03.23-2') +conflicts=('systemd>0' 'cryptsetup<2.7.0-3' 'mdadm<4.3-2' 'lvm2<2.03.23-3') optdepends=('zstd: Use zstd compression for the initramfs image' 'bzip2: Use bzip2 compression for the initramfs image' 'lzop: Use lzo compression for the initramfs image' @@ -27,12 +27,14 @@ provides=("mkinitcpio=$pkgver-$pkgrel" 'initramfs') #backup=('etc/mkinitcpio.conf') source=("$url/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} + "$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" } check() { @@ -62,7 +64,9 @@ validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolin sha256sums=(c64ff852c63d3ee668950e0a4e10a2eae020e079025fa9ad23261e3221cddc05 # mkinitcpio-38.tar.gz 9086ddcbfe139e2956f12f9070e515fcf7e97fd23479ee35b71cf12163edb33b # mkinitcpio-38.tar.gz.sig + 207972bfc62cb7bf0547fd075b55c49b9f190afc76e8f4dded1b1c79fd886d0d # mkinitcpio-fix-path.patch c4afeb6b3300c4d50c3f01233705b542f59d6e95a7670f7efde097ea209ef5bd # nosystemd.patch 005d909551dec1dbb417457f0277076c5087902e9256eb5f1a77af3798c7c3de) # mkinitcpio.conf -## bf779f7e9d8eb6e19ccf4b67f808a751abf98a71dd4fb0a7dc03f5c30fc497c7 mkinitcpio-38-01-x86_64.pkg.tar.lz +## 5a5f4de431cbff7f9c2e24b78ec285e9cfcbf5a43f3ec2739d3b04d06a3dc0ab mkinitcpio-38-04-x86_64.pkg.tar.lz + diff --git a/mkinitcpio/PKGBUILD-arch b/mkinitcpio/PKGBUILD-arch index cf912ce..fdea895 100644 --- a/mkinitcpio/PKGBUILD-arch +++ b/mkinitcpio/PKGBUILD-arch @@ -5,7 +5,7 @@ pkgname=mkinitcpio pkgver=38 -pkgrel=1 +pkgrel=4 pkgdesc="Modular initramfs image creation utility" arch=('any') url='https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio' @@ -15,9 +15,9 @@ depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarch checkdepends=('bats' 'bats-assert' 'lzop') conflicts=( 'systemd<255.4-2' - 'cryptsetup<2.7.0-2' + 'cryptsetup<2.7.0-3' 'mdadm<4.3-2' - 'lvm2<2.03.23-2' + 'lvm2<2.03.23-3' ) optdepends=('gzip: Use gzip compression for the initramfs image' 'xz: Use lzma or xz compression for the initramfs image' @@ -27,15 +27,24 @@ 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}) +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") install=mkinitcpio.install sha512sums=('ad1a4895e5cc3a01637f71d96ddb79d7f45708ec7305ffdb874403a1eb3c1743d121f28d93273b91792298eb21bcc0c5d9ef1ab3a3773083d60da5bdaee59d6e' - 'SKIP') + 'SKIP' + 'b1387deab0199fdb4e4a417b009467cb6f95b2a3f8074858f8a85b46492ebaf420ac028f13d81acb5a675382cccb896cac62f42e26edd82dc1c3a7f48d4d822b') b2sums=('4bc50da7196a69dc0ab7e7de345684baebbb655f9a07def9ac36a7f1c9aec752cf41c62134d6bbf240d8f49c6492a211f152bab062ec09457791d7ab030f1bc5' - 'SKIP') + 'SKIP' + '4530828b559c08aa14f3663b8a078c71bb739adcbd1dfbf21947cfe837ec51fc8ed7e7586c53a4e0ee4b7d86784acab5edf916c387e7385a78fe98c825177fa9') 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-fix-path.patch b/mkinitcpio/mkinitcpio-fix-path.patch new file mode 100644 index 0000000..ad6dd1b --- /dev/null +++ b/mkinitcpio/mkinitcpio-fix-path.patch @@ -0,0 +1,45 @@ +From aced07e06b9b274439eeb90e235edf42780b4a7a Mon Sep 17 00:00:00 2001 +From: Mike Yuan +Date: Tue, 5 Mar 2024 01:42:38 +0800 +Subject: [PATCH] install: correctly read library paths + +Follow-up for 2ed5a05034e70e5c511aa25a5aabef951dd4e912 + +The -d option of 'read' denotes the end of each read +rather than each variable assignment. -d '' results +in nothing being read, and these libraries are not +added to initrd... +--- + install/sd-encrypt | 2 +- + install/systemd | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/install/sd-encrypt b/install/sd-encrypt +index e60d883..a2a9c2c 100644 +--- a/install/sd-encrypt ++++ b/install/sd-encrypt +@@ -39,7 +39,7 @@ build() { + add_binary '/usr/lib/ossl-modules/legacy.so' + + # add libraries dlopen()ed by systemd-cryptsetup +- LC_ALL=C.UTF-8 find /usr/lib/ -maxdepth 1 -name "libfido2.so*" | while read -r -d '' FILE; do ++ LC_ALL=C.UTF-8 find /usr/lib/ -maxdepth 1 -name "libfido2.so*" | while read -r FILE; do + if [[ -L "${FILE}" ]]; then + add_symlink "${FILE}" + else +diff --git a/install/systemd b/install/systemd +index 808750c..34b06ba 100644 +--- a/install/systemd ++++ b/install/systemd +@@ -128,7 +128,7 @@ build() { + # kmod -> systemd-shared + # qrencode -> bsod + for LIB in kmod tss2-{esys,rc,mu,tcti-'*'} qrencode; do +- LC_ALL=C.UTF-8 find /usr/lib/ -maxdepth 1 -name "lib${LIB}.so*" | while read -r -d '' FILE; do ++ LC_ALL=C.UTF-8 find /usr/lib/ -maxdepth 1 -name "lib${LIB}.so*" | while read -r FILE; do + if [[ -L "${FILE}" ]]; then + add_symlink "${FILE}" + else +-- +GitLab +