From d038c9f1a3fcde35666a44862ef211e1a1f92051 Mon Sep 17 00:00:00 2001 From: kth5 Date: Sun, 22 Sep 2024 22:11:42 +0200 Subject: [PATCH] * update tpm2-tss to 4.1.3-1 --- tpm2-tss/.SRCINFO | 38 +++++++ tpm2-tss/.nvchecker.toml | 3 + tpm2-tss/PKGBUILD | 101 ++++++++++++------ ...33275B0123D0A679F51FF48F4F9A45D7FFEE74.asc | 54 ++++++++++ 4 files changed, 161 insertions(+), 35 deletions(-) create mode 100644 tpm2-tss/.SRCINFO create mode 100644 tpm2-tss/.nvchecker.toml create mode 100644 tpm2-tss/keys/pgp/D533275B0123D0A679F51FF48F4F9A45D7FFEE74.asc diff --git a/tpm2-tss/.SRCINFO b/tpm2-tss/.SRCINFO new file mode 100644 index 0000000000..c97385e4d9 --- /dev/null +++ b/tpm2-tss/.SRCINFO @@ -0,0 +1,38 @@ +pkgbase = tpm2-tss + pkgdesc = Implementation of the TCG Trusted Platform Module 2.0 Software Stack (TSS2) + pkgver = 4.1.3 + pkgrel = 1 + url = https://github.com/tpm2-software/tpm2-tss + arch = x86_64 + license = BSD-2-Clause + checkdepends = iproute2 + checkdepends = swtpm + checkdepends = uthash + makedepends = git + makedepends = autoconf-archive + makedepends = cmocka + makedepends = doxygen + makedepends = libtpms + makedepends = systemd + depends = curl + depends = json-c + depends = openssl + depends = libjson-c.so + provides = libtss2-esys.so + provides = libtss2-fapi.so + provides = libtss2-mu.so + provides = libtss2-rc.so + provides = libtss2-sys.so + provides = libtss2-tctildr.so + options = !emptydirs + options = !lto + backup = etc/tpm2-tss/fapi-config.json + backup = etc/tpm2-tss/fapi-profiles/P_ECCP256SHA256.json + backup = etc/tpm2-tss/fapi-profiles/P_RSA2048SHA256.json + source = git+https://github.com/tpm2-software/tpm2-tss?signed#tag=4.1.3 + validpgpkeys = D533275B0123D0A679F51FF48F4F9A45D7FFEE74 + validpgpkeys = D6B4D8BAC7E0CC97DCD4AC7272E88B53F7A95D84 + validpgpkeys = 5B482B8E3E19DA7C978E1D016DE2E9078E1F50C1 + b2sums = 2337287c0c7825b27a4639ed055c9a44eb08432110e032e244cb21f77f087b8bea1740f9e313fc5f0b54f03b1cc3c26287f874fef15710d7dc44dbf1ac1b2cfb + +pkgname = tpm2-tss diff --git a/tpm2-tss/.nvchecker.toml b/tpm2-tss/.nvchecker.toml new file mode 100644 index 0000000000..52d29d0a9b --- /dev/null +++ b/tpm2-tss/.nvchecker.toml @@ -0,0 +1,3 @@ +[tpm2-tss] +source = "git" +git = "https://github.com/tpm2-software/tpm2-tss.git" diff --git a/tpm2-tss/PKGBUILD b/tpm2-tss/PKGBUILD index 13bad914ac..85075ce4c8 100644 --- a/tpm2-tss/PKGBUILD +++ b/tpm2-tss/PKGBUILD @@ -1,54 +1,85 @@ # POWER Maintainer: Alexander Baldeck -# Maintainer: Jonas Witschel +# Maintainer: Tobias Powalowski +# Contributor: Jonas Witschel # Contributor: Bruno Pagani pkgname=tpm2-tss -pkgver=4.0.1 +pkgver=4.1.3 pkgrel=1 pkgdesc='Implementation of the TCG Trusted Platform Module 2.0 Software Stack (TSS2)' arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) url='https://github.com/tpm2-software/tpm2-tss' -license=('BSD') -depends=('curl' 'json-c' 'openssl' 'libjson-c.so') -makedepends=('cmocka' 'doxygen' 'libtpms') -checkdepends=('iproute2' 'swtpm' 'uthash') -provides=('libtss2-esys.so' 'libtss2-fapi.so' 'libtss2-mu.so' 'libtss2-rc.so' 'libtss2-sys.so' 'libtss2-tctildr.so') -backup=('etc/tpm2-tss/fapi-config.json' - 'etc/tpm2-tss/fapi-profiles/P_ECCP256SHA256.json' - 'etc/tpm2-tss/fapi-profiles/P_RSA2048SHA256.json') -options=('!emptydirs' '!lto') -source=("$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"{,.asc} - 'https://raw.githubusercontent.com/tpm2-software/tpm2-tss/e237e4d33cbf280292a480edd8ad061dcd3a37a2/lib/tss2-tcti-libtpms.map' - 'https://github.com/tpm2-software/tpm2-tss/commit/218c0da8.patch') -sha512sums=('ed6ddc52cb0e8c1082a4bb001e1225eb9905fd2380da88db5fd69ff5b5d9d43a93eb67b634e49d53eb5d586832da3aef2c4c7e5f18d51bb730481f8913319d7d' - 'SKIP' - '55be966eb320c96ca49b3aaa0635815076fe1a21149d1a0f95654778c8359bd16f18a10c0cabe955a366d4a14e2645a8150878b601085d987727de40831e50ab' - '5c6f57ddf43b0c767578ecbad1df960ef0d77417eb1db0c9c492636a4b07c0b5b29cc031d5352d83aec4a8e1d67276587db24e7e188dfeecff5d7ed7c55cc30c') -validpgpkeys=('D6B4D8BAC7E0CC97DCD4AC7272E88B53F7A95D84' # Andreas Fuchs - '5B482B8E3E19DA7C978E1D016DE2E9078E1F50C1') # William Roberts (Bill Roberts) +license=('BSD-2-Clause') +depends=( + curl + json-c + openssl + libjson-c.so +) +makedepends=( + git + autoconf-archive + cmocka + doxygen + libtpms + systemd +) +checkdepends=( + iproute2 + swtpm + uthash +) +provides=( + libtss2-esys.so + libtss2-fapi.so + libtss2-mu.so + libtss2-rc.so + libtss2-sys.so + libtss2-tctildr.so +) +backup=( + etc/tpm2-tss/fapi-config.json + etc/tpm2-tss/fapi-profiles/P_ECCP256SHA256.json + etc/tpm2-tss/fapi-profiles/P_RSA2048SHA256.json +) +options=( + !emptydirs + !lto +) +source=( + git+https://github.com/tpm2-software/tpm2-tss?signed#tag=${pkgver} +) +b2sums=('2337287c0c7825b27a4639ed055c9a44eb08432110e032e244cb21f77f087b8bea1740f9e313fc5f0b54f03b1cc3c26287f874fef15710d7dc44dbf1ac1b2cfb') +validpgpkeys=( + 'D533275B0123D0A679F51FF48F4F9A45D7FFEE74' # Andreas Fuchs + '5B482B8E3E19DA7C978E1D016DE2E9078E1F50C1' # William Roberts (Bill Roberts) +) prepare() { - cd "$pkgname-$pkgver" - # Add file missing from release tarball (https://github.com/tpm2-software/tpm2-tss/issues/2313) - cp "$srcdir/tss2-tcti-libtpms.map" lib - patch -p1 -i ../218c0da8.patch # Fix tests + cd "${pkgname}" + ./bootstrap } build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-runstatedir=/run --with-sysusersdir=/usr/lib/sysusers.d \ - --with-tmpfilesdir=/usr/lib/tmpfiles.d --with-udevrulesprefix=60- \ - --enable-unit $( ((CHECKFUNC)) && echo --enable-integration) - make + cd "${pkgname}" + # disable options taken from gentoo ebuild! + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --with-runstatedir=/run --with-sysusersdir=/usr/lib/sysusers.d \ + --with-tmpfilesdir=/usr/lib/tmpfiles.d --with-udevrulesprefix=60- \ + --disable-tcti-libtpms --disable-tcti-spi-ltt2go --disable-tcti-spi-ftdi \ + --disable-tcti-i2c-ftdi --disable-defaultflags --disable-weakcrypto \ + --enable-unit $( ((CHECKFUNC)) && echo --enable-integration) + make } check() { - cd "$pkgname-$pkgver" - make check + cd "${pkgname}" + # lto breaks tests! + make check } package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname" + cd "${pkgname}" + make DESTDIR="${pkgdir}" install + install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" } diff --git a/tpm2-tss/keys/pgp/D533275B0123D0A679F51FF48F4F9A45D7FFEE74.asc b/tpm2-tss/keys/pgp/D533275B0123D0A679F51FF48F4F9A45D7FFEE74.asc new file mode 100644 index 0000000000..51efc9d4c5 --- /dev/null +++ b/tpm2-tss/keys/pgp/D533275B0123D0A679F51FF48F4F9A45D7FFEE74.asc @@ -0,0 +1,54 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: D533 275B 0123 D0A6 79F5 1FF4 8F4F 9A45 D7FF EE74 +Comment: Andreas Fuchs + +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 +lFcjH/3q +=aRV7 +-----END PGP PUBLIC KEY BLOCK-----