From 24504ae3de50d2d898cea316be663658394dada3 Mon Sep 17 00:00:00 2001 From: joborun Date: Wed, 24 Jan 2024 20:37:50 +0200 Subject: [PATCH] upg acl cryptsetup --- acl/NOTE | 1 + acl/PKGBUILD | 51 ++++++++++++++++++++----------- acl/PKGBUILD-arch | 7 +++-- acl/PKGBUILD.tarball | 53 +++++++++++++++++++++++++++++++++ acl/clean | 2 +- acl/deps | 4 +++ cryptsetup/PKGBUILD | 25 +++++++++------- cryptsetup/PKGBUILD-arch | 8 ++--- cryptsetup/deps | 1 - cryptsetup/install-sd-encrypt | 1 + cryptsetup/install-sd-encrypt.0 | 14 ++++----- 11 files changed, 122 insertions(+), 45 deletions(-) create mode 100644 acl/NOTE create mode 100644 acl/PKGBUILD.tarball diff --git a/acl/NOTE b/acl/NOTE new file mode 100644 index 0000000..1b39c83 --- /dev/null +++ b/acl/NOTE @@ -0,0 +1 @@ +since savannah hungary mirror is not carrying current source we build from git diff --git a/acl/PKGBUILD b/acl/PKGBUILD index 027d4f5..e7aa626 100644 --- a/acl/PKGBUILD +++ b/acl/PKGBUILD @@ -6,22 +6,29 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=acl -pkgver=2.3.1 -pkgrel=03 +pkgver=2.3.2 +#pkgver=2.3.2.r0.g214c7d1 +pkgrel=01 pkgdesc='Access control list utilities, libraries and headers' -arch=('x86_64') url='https://savannah.nongnu.org/projects/acl' -#depends=('attr' 'libattr.so') -makedepends=('attr') +depends=('glibc' 'attr') +makedepends=('git' 'attr') +provides=("acl=$pkgver" 'xfsacl' 'libacl.so') +conflicts=('acl-git' 'xfsacl') replaces=('xfsacl') -provides=('xfsacl' 'libacl.so') -# options=('debug') -conflicts=('xfsacl') -source=("https://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) +#source=("https://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) +_commit=cefe1c17f20448b7a0ca53ac9cf8a46d444a8cca # tags/v2.3.2 +source=("git+https://git.savannah.gnu.org/git/acl.git#commit=$_commit") +#pkgver() { +# cd "acl" +# +# git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' +3} build() { - cd $pkgname-$pkgver + cd $pkgname + ./autogen.sh ./configure \ --libdir=/usr/lib \ --libexecdir=/usr/lib \ @@ -30,13 +37,21 @@ build() { make } -package() { - cd $pkgname-$pkgver +check() { + cd "acl" - make DESTDIR="${pkgdir}" install + make check } -#---- license gpg-key sha256sums ---- +package() { + cd $pkgname + + make DESTDIR="$pkgdir" install +} + +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('LGPL') @@ -44,9 +59,11 @@ validpgpkeys=('600CD204FBCEA418BD2CA74F154343260542DF34' # Brandon Philips '259B3792B3D6D319212CC4DCD5BF9FEB0313653A') # Andreas Gruenbacher -sha256sums=(760c61c68901b37fdd5eefeeaf4c0c7a26bdfdd8ac747a1edff1ce0e243c11af # acl-2.3.1.tar.gz - ecf0fa46c83d1794eaddba7b5e284bca3f8928b55da24b03142277439239913c) # acl-2.3.1.tar.gz.sig +sha256sums=(SKIP) -## e73a54762e62ece17b64388b6e58e2bf327179d9f23821a6f10d729ca1dda8f8 acl-2.3.1-03-x86_64.pkg.tar.lz +# European gnu-savannah mirror has not synced to carry 2.3.2 tar.ball so we built from git +#sha256sums=(5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c # acl-2.3.2.tar.gz +# ecf0fa46c83d1794eaddba7b5e284bca3f8928b55da24b03142277439239913c) # acl-2.3.1.tar.gz.sig +## 30812c65ffd6019f6abfd529b8bc79af2d5a5db9592b1003453f1a78adb5be0e acl-2.3.2-01-x86_64.pkg.tar.lz diff --git a/acl/PKGBUILD-arch b/acl/PKGBUILD-arch index 748e794..70f5735 100644 --- a/acl/PKGBUILD-arch +++ b/acl/PKGBUILD-arch @@ -1,12 +1,13 @@ # Maintainer: Thomas Bächler pkgname=acl -pkgver=2.3.1 -pkgrel=3 +pkgver=2.3.2 +pkgrel=1 pkgdesc='Access control list utilities, libraries and headers' arch=('x86_64') url='https://savannah.nongnu.org/projects/acl' license=('LGPL') +depends=('glibc') makedepends=('attr') replaces=('xfsacl') provides=('xfsacl' 'libacl.so') @@ -15,7 +16,7 @@ validpgpkeys=('600CD204FBCEA418BD2CA74F154343260542DF34' # Brandon Philips '259B3792B3D6D319212CC4DCD5BF9FEB0313653A') # Andreas Gruenbacher source=("https://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) -sha256sums=('760c61c68901b37fdd5eefeeaf4c0c7a26bdfdd8ac747a1edff1ce0e243c11af' +sha256sums=('5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c' 'SKIP') build() { diff --git a/acl/PKGBUILD.tarball b/acl/PKGBUILD.tarball new file mode 100644 index 0000000..2d69afe --- /dev/null +++ b/acl/PKGBUILD.tarball @@ -0,0 +1,53 @@ +#!/usr/bin/bash +# JOBoRun : Jwm OpenBox Obarun RUNit +# Maintainer : Joe Bo Run +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname" +# Website : https://pozol.eu +#-----------------------------------------| DESCRIPTION |--------------------------------------- + +pkgname=acl +pkgver=2.3.2 +pkgrel=01 +pkgdesc='Access control list utilities, libraries and headers' +url='https://savannah.nongnu.org/projects/acl' +depends=('glibc') +makedepends=('attr') +replaces=('xfsacl') +provides=('xfsacl' 'libacl.so') +# options=('debug') +conflicts=('xfsacl') +#source=("https://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) +source=("http://download.savannah.nongnu.org/releases/acl/acl-2.3.2.tar.xz"{,.sig}) + +build() { + cd $pkgname-$pkgver + + ./configure \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --prefix=/usr + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package() { + cd $pkgname-$pkgver + + make DESTDIR="${pkgdir}" install +} + +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) + +license=('LGPL') + +validpgpkeys=('600CD204FBCEA418BD2CA74F154343260542DF34' # Brandon Philips + 'B902B5271325F892AC251AD441633B9FE837F581' # Frysinger + '259B3792B3D6D319212CC4DCD5BF9FEB0313653A') # Andreas Gruenbacher + +sha256sums=(5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c # acl-2.3.2.tar.gz + ecf0fa46c83d1794eaddba7b5e284bca3f8928b55da24b03142277439239913c) # acl-2.3.1.tar.gz.sig + +## +## diff --git a/acl/clean b/acl/clean index 0dbeffa..1680cfb 100644 --- a/acl/clean +++ b/acl/clean @@ -1 +1 @@ -rm -rf {src,pkg,*gz*} +rm -rf {src,pkg,acl*tar.gz*,acl} diff --git a/acl/deps b/acl/deps index 139597f..352e243 100644 --- a/acl/deps +++ b/acl/deps @@ -1,2 +1,6 @@ +gettext +autoconf +automake +git diff --git a/cryptsetup/PKGBUILD b/cryptsetup/PKGBUILD index a0804ce..ae39650 100644 --- a/cryptsetup/PKGBUILD +++ b/cryptsetup/PKGBUILD @@ -6,9 +6,9 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=cryptsetup -pkgver=2.6.1 -pkgrel=03 -pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' +pkgver=2.7.0 +pkgrel=01 +pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt w/o systemd' url='https://gitlab.com/cryptsetup/cryptsetup/' depends=('device-mapper' 'libdevmapper.so' 'openssl' 'popt' 'util-linux-libs' 'libuuid.so' 'json-c' 'libjson-c.so' 'argon2' 'libargon2.so') @@ -18,8 +18,9 @@ provides=('libcryptsetup.so') options=('!emptydirs') source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/${pkgname}-${pkgver}.tar."{xz,sign} 'hooks-encrypt' - 'install-encrypt' - 'install-sd-encrypt') + 'install-encrypt') +# systemd-crap +# 'install-sd-encrypt') build() { cd "${srcdir}"/$pkgname-${pkgver} @@ -44,7 +45,7 @@ package() { # install hook install -D -m0644 "${srcdir}"/hooks-encrypt "${pkgdir}"/usr/lib/initcpio/hooks/encrypt install -D -m0644 "${srcdir}"/install-encrypt "${pkgdir}"/usr/lib/initcpio/install/encrypt - install -D -m0644 "${srcdir}"/install-sd-encrypt "${pkgdir}"/usr/lib/initcpio/install/sd-encrypt +# install -D -m0644 "${srcdir}"/install-sd-encrypt "${pkgdir}"/usr/lib/initcpio/install/sd-encrypt } #---- arch license gpg-key & sha256sums ---- @@ -55,10 +56,12 @@ license=('GPL') validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz -sha256sums=(410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693 # cryptsetup-2.6.1.tar.xz - 13847ffd76ccf3e8f359992f20f72213d4df7ddc955f40cc97923d393f76d6e8 # cryptsetup-2.6.1.tar.sign +sha256sums=(94003a00cd5a81944f45e8dc529e0cfd2a6ff629bd2cd21cf5e574e465daf795 # cryptsetup-2.7.0.tar.xz + ae18d1ebe90f38d93cee9af7a05acacb61ed60adffc9180c76c61afba445497f # cryptsetup-2.7.0.tar.sign 839e961e053512293052250b424f38c347cb46c14cbd51d7e2705b3f5378ec02 # hooks-encrypt - 2b71c6c56ef81e5bf4f49dcc08dbd1651b46bda51a8f75a0a342b344b2d0eccd # install-encrypt - ec983a55b09dd512ab5b2f329fe611cb10478e4cc1cd3bb65848cf234dcfebd8) # install-sd-encrypt + 2b71c6c56ef81e5bf4f49dcc08dbd1651b46bda51a8f75a0a342b344b2d0eccd) # install-encrypt +# systemd-crap +# 90cb28135734c5888a65dc35b345552f31328f04d6a8c3c312c41194f06026c9) # install-sd-encrypt + + ## 14f004a0f21ecf8a01a56ef964f2fa9a750bd5223b8b2ff43d808736b886d22d cryptsetup-2.7.0-01-x86_64.pkg.tar.lz -## 7298a88b3bc180a556311c39fe51ede4e35f4182307bc10810e211079b2e3887 cryptsetup-2.6.1-03-x86_64.pkg.tar.lz diff --git a/cryptsetup/PKGBUILD-arch b/cryptsetup/PKGBUILD-arch index a4f1b7d..de260ac 100644 --- a/cryptsetup/PKGBUILD-arch +++ b/cryptsetup/PKGBUILD-arch @@ -2,8 +2,8 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=2.6.1 -pkgrel=3 +pkgver=2.7.0 +pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) license=('GPL') @@ -18,11 +18,11 @@ source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/${pkgna 'hooks-encrypt' 'install-encrypt' 'install-sd-encrypt') -sha256sums=('410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693' +sha256sums=('94003a00cd5a81944f45e8dc529e0cfd2a6ff629bd2cd21cf5e574e465daf795' 'SKIP' '839e961e053512293052250b424f38c347cb46c14cbd51d7e2705b3f5378ec02' '2b71c6c56ef81e5bf4f49dcc08dbd1651b46bda51a8f75a0a342b344b2d0eccd' - 'ec983a55b09dd512ab5b2f329fe611cb10478e4cc1cd3bb65848cf234dcfebd8') + '90cb28135734c5888a65dc35b345552f31328f04d6a8c3c312c41194f06026c9') build() { cd "${srcdir}"/$pkgname-${pkgver} diff --git a/cryptsetup/deps b/cryptsetup/deps index 4004952..de67d4f 100644 --- a/cryptsetup/deps +++ b/cryptsetup/deps @@ -1,6 +1,5 @@ device-mapper popt - argon2 asciidoctor diff --git a/cryptsetup/install-sd-encrypt b/cryptsetup/install-sd-encrypt index ca68f53..8d1105e 100644 --- a/cryptsetup/install-sd-encrypt +++ b/cryptsetup/install-sd-encrypt @@ -27,6 +27,7 @@ build() { map add_binary \ '/usr/lib/systemd/system-generators/systemd-cryptsetup-generator' \ '/usr/lib/systemd/systemd-cryptsetup' \ + '/usr/lib/systemd/systemd-makefs' \ '/usr/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so' \ '/usr/lib/cryptsetup/libcryptsetup-token-systemd-pkcs11.so' \ '/usr/lib/cryptsetup/libcryptsetup-token-systemd-tpm2.so' diff --git a/cryptsetup/install-sd-encrypt.0 b/cryptsetup/install-sd-encrypt.0 index f2df320..ca68f53 100644 --- a/cryptsetup/install-sd-encrypt.0 +++ b/cryptsetup/install-sd-encrypt.0 @@ -38,14 +38,12 @@ build() { add_binary '/usr/lib/ossl-modules/legacy.so' # add libraries dlopen()ed by systemd-cryptsetup - for LIB in fido2 tss2-{{esys,rc,mu},tcti-'*'}; do - for FILE in $(find /usr/lib/ -maxdepth 1 -name "lib${LIB}.so*"); do - if [[ -L "${FILE}" ]]; then - add_symlink "${FILE}" - else - add_binary "${FILE}" - fi - done + for FILE in $(find /usr/lib/ -maxdepth 1 -name "libfido2.so*"); do + if [[ -L "${FILE}" ]]; then + add_symlink "${FILE}" + else + add_binary "${FILE}" + fi done # add mkswap for creating swap space on the fly (see 'swap' in crypttab(5))