Date: Monday, February 21, 2022 @ 19:22:55 Author: heftig Revision: 437868
0.20.5-1 Modified: libsecret/trunk/PKGBUILD Deleted: libsecret/trunk/fix-test.diff ---------------+ PKGBUILD | 79 +++++++++++++++++++++++++++++++++++++++----------------- fix-test.diff | 12 -------- 2 files changed, 56 insertions(+), 35 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-02-21 18:00:39 UTC (rev 437867) +++ PKGBUILD 2022-02-21 19:22:55 UTC (rev 437868) @@ -1,48 +1,81 @@ # Maintainer: Jan Alexander Steffens (heftig) <[email protected]> -# Maintainer: Jan de Groot <[email protected]> +# Contributor: Jan de Groot <[email protected]> -pkgname=libsecret -pkgver=0.20.4 +pkgbase=libsecret +pkgname=(libsecret libsecret-docs) +pkgver=0.20.5 pkgrel=1 pkgdesc="Library for storing and retrieving passwords and other secrets" url="https://wiki.gnome.org/Projects/Libsecret"; arch=(x86_64) license=(LGPL) -depends=(glib2 libgcrypt) -checkdepends=(python-dbus dbus-glib python-gobject gjs) -makedepends=(docbook-xsl gobject-introspection vala git gtk-doc meson valgrind) -optdepends=('org.freedesktop.secrets: secret storage backend') -provides=(libsecret-1.so) -_commit=3fe635e64efd4b8dbc9ec3548b0bc8034c7665c4 # tags/0.20.4^0 -source=("git+https://gitlab.gnome.org/GNOME/libsecret.git#commit=$_commit"; - fix-test.diff) -sha256sums=('SKIP' - '760e40ffcd3383149d62f803a900b3af1a838fb084a8403e45d0764696dd2ffe') +depends=(glib2 libgcrypt tpm2-tss) +makedepends=(gobject-introspection vala git meson gi-docgen bash-completion) +checkdepends=(python-dbus python-gobject gjs swtpm tpm2-abrmd) +_commit=d64530ac70d9723945d68ca079293ea0f9df9e9f # tags/0.20.5^0 +source=("git+https://gitlab.gnome.org/GNOME/libsecret.git#commit=$_commit";) +sha256sums=('SKIP') pkgver() { - cd $pkgname - git describe --tags | sed 's/-/+/g' + cd $pkgbase + git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' } prepare() { - cd $pkgname + cd $pkgbase - # Fix compiliation of test-vala-unstable - # https://gitlab.gnome.org/GNOME/libsecret/-/issues/54 - git apply -3 ../fix-test.diff + # Secure memory tests fail in containers + sed -i '/test-secmem/d' egg/meson.build } build() { - arch-meson $pkgname build + arch-meson $pkgbase build -D tpm2=true meson compile -C build } +_check() ( + mkdir -p "${TPM_PATH:=$PWD/tpm}" + export TPM_PATH + + swtpm_setup --create-config-files + swtpm_setup --tpm2 --tpm-state "$TPM_PATH" --createek --allow-signing \ + --decryption --overwrite --display + + swtpm socket --tpm2 --flags startup-clear \ + --server type=unixio,path="$TPM_PATH/socket" \ + --ctrl type=unixio,path="$TPM_PATH/socket.ctrl" & + _p1=$! + + tpm2-abrmd --tcti=swtpm:path="$TPM_PATH/socket" \ + --session --flush-all & + _p2=$! + + trap "kill $_p1 $_p2; wait" EXIT + + export TCTI=tabrmd:bus_type=session + + meson test -C build --print-errorlogs +) + check() { - dbus-run-session meson test -C build --print-errorlogs + dbus-run-session bash -c "$(declare -f _check); _check" } -package() { - DESTDIR="$pkgdir" meson install -C build +package_libsecret() { + optdepends=('org.freedesktop.secrets: secret storage backend') + provides=(libsecret-1.so) + + meson install -C build --destdir "$pkgdir" + + mkdir -p doc/usr/share + mv {"$pkgdir",doc}/usr/share/doc } +package_libsecret-docs() { + pkgdesc+=" (documentation)" + depends=() + + mv doc/* "$pkgdir" +} + # vim:set sw=2 et: Deleted: fix-test.diff =================================================================== --- fix-test.diff 2022-02-21 18:00:39 UTC (rev 437867) +++ fix-test.diff 2022-02-21 19:22:55 UTC (rev 437868) @@ -1,12 +0,0 @@ -diff --git i/libsecret/meson.build w/libsecret/meson.build -index 0c448b9..c0138d2 100644 ---- i/libsecret/meson.build -+++ w/libsecret/meson.build -@@ -185,6 +185,7 @@ pkg.generate(description: 'GObject bindings for Secret Service API (Unstable)', - test_cflags = [ - libsecret_cflags, - '-DSRCDIR="@0@"'.format(meson.source_root()), -+ '-DSECRET_WITH_UNSTABLE', - ] - - mock_service_lib = library('mock-service',
