From 7d98b246db6aa5ae0ddd1d27913ba976e77e6004 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Tue, 23 Jan 2018 05:39:37 +0100 Subject: pcr/trousers: updated to 0.3.14 --- pcr/trousers/01-tss-user.patch | 36 ++++++++++++++++++++++++++ pcr/trousers/PKGBUILD | 57 ++++++++++++++++++++++++++++-------------- pcr/trousers/sysusers.conf | 1 + pcr/trousers/tmpfiles.conf | 2 ++ pcr/trousers/trousers.install | 21 ---------------- 5 files changed, 77 insertions(+), 40 deletions(-) create mode 100644 pcr/trousers/01-tss-user.patch create mode 100644 pcr/trousers/sysusers.conf create mode 100644 pcr/trousers/tmpfiles.conf delete mode 100644 pcr/trousers/trousers.install (limited to 'pcr/trousers') diff --git a/pcr/trousers/01-tss-user.patch b/pcr/trousers/01-tss-user.patch new file mode 100644 index 000000000..37f74617a --- /dev/null +++ b/pcr/trousers/01-tss-user.patch @@ -0,0 +1,36 @@ +Author: Daniel Baumann +Author: Pierre Chifflier +Description: Avoiding chown/chmod for tss user at build-time. + Note that we do not use NOUSERCHECK or --enable-usercheck=no, + since these are also used in the sources and will change the + binary. + +Index: trousers/dist/Makefile.am +=================================================================== +--- trousers.orig/dist/Makefile.am ++++ trousers/dist/Makefile.am +@@ -3,24 +3,10 @@ EXTRA_DIST = system.data.auth system.dat + + install: install-exec-hook + if test ! -e ${DESTDIR}/@sysconfdir@/tcsd.conf; then mkdir -p ${DESTDIR}/@sysconfdir@ && cp tcsd.conf ${DESTDIR}/@sysconfdir@; fi +-if !NOUSERCHECK +- /bin/chown tss:tss ${DESTDIR}/@sysconfdir@/tcsd.conf || true +- /bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf +-endif + + install-exec-hook: + /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi' +-if !NOUSERCHECK +- /usr/sbin/groupadd tss || true +- /usr/sbin/useradd -r tss -g tss || true +- /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm || true +- /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm +-endif + + uninstall-hook: + rm ${DESTDIR}/@sysconfdir@/tcsd.conf + rmdir ${DESTDIR}/@localstatedir@/lib/tpm +-if !NOUSERCHECK +- /usr/sbin/userdel tss || true +- /usr/sbin/groupdel tss || true +-endif diff --git a/pcr/trousers/PKGBUILD b/pcr/trousers/PKGBUILD index 560cb211c..d46d173d4 100644 --- a/pcr/trousers/PKGBUILD +++ b/pcr/trousers/PKGBUILD @@ -1,30 +1,47 @@ -# Maintainer: mutantmonkey -# Contributor: Robert Buhren -# Contributor: Gavin Lloyd -# Contributor: xav -# Contributor: julian -# Contributor: Silvio Knizek +# Maintainer (AUR): mutantmonkey +# Contributor (AUR): Gerardo Exequiel Pozzi +# Contributor (AUR): Robert Buhren +# Contributor (AUR): Gavin Lloyd +# Contributor (AUR): xav +# Contributor (AUR): julian +# Contributor (AUR): Silvio Knizek + +# parabola changes and rationale: +# - removed "open source" term from pkgdesc pkgname=trousers -pkgver=0.3.13 -pkgrel=2 -pkgdesc="Free TCG Software Stack implementation for use with a TPM" -arch=('i686' 'x86_64') +pkgver=0.3.14 +pkgrel=3 +pkgdesc="Libre TCG Software Stack implementation for use with a TPM" +arch=('i686' 'x86_64' 'armv7h') url="http://sourceforge.net/projects/trousers" license=('CPL') depends=('openssl') -install=${pkgname}.install -source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/0.3.13/${pkgname}-${pkgver}.tar.gz - ${pkgname}.install +options=('libtool') +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz + sysusers.conf + tmpfiles.conf tcsd.service - 70-tpmd.rules) -sha256sums=('bb908e4a3c88a17b247a4fc8e0fff3419d8a13170fe7bdfbe0e2c5c082a276d3' - '18a96f4067968d947d5c4d4572b360de19cc940e082e221768add82a24539b9e' + 70-tpmd.rules + 01-tss-user.patch) +noextract=(${pkgname}-${pkgver}.tar.gz) +sha256sums=('ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47' + '4c2684501e7a67132d4f53466b32fc06bd2a0275d4cf1fbd5479d0cdb2349bc7' + '1afd455b6c17e730b2cc4ec71d5625f0b63fde54f9409ae4762dc6f084c194de' '653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd' - 'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884') + 'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884' + '169cc2cbc3a8bce7fd76e0c96e5b04b5249a0db9e857b274a0c5da461bb604f7') + +prepare() { + mkdir -p ${pkgname}-${pkgver} + bsdtar -x -f ${pkgname}-${pkgver}.tar.gz -C ${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} + patch -p1 -i ${srcdir}/01-tss-user.patch +} build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} + ./bootstrap.sh ./configure --prefix=/usr \ --sysconfdir=/etc \ --libdir=/usr/lib \ @@ -35,10 +52,12 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR=${pkgdir} install install -Dm644 ${srcdir}/tcsd.service ${pkgdir}/usr/lib/systemd/system/tcsd.service install -Dm644 ${srcdir}/70-tpmd.rules ${pkgdir}/usr/lib/udev/rules.d/70-tpmd.rules + install -Dm644 ${srcdir}/sysusers.conf ${pkgdir}/usr/lib/sysusers.d/trousers.conf + install -Dm644 ${srcdir}/tmpfiles.conf ${pkgdir}/usr/lib/tmpfiles.d/trousers.conf } # vim:set ts=2 sw=2 et: diff --git a/pcr/trousers/sysusers.conf b/pcr/trousers/sysusers.conf new file mode 100644 index 000000000..9b5ef17b1 --- /dev/null +++ b/pcr/trousers/sysusers.conf @@ -0,0 +1 @@ +u tss - "TCG Software Stack" /var/lib/tpm diff --git a/pcr/trousers/tmpfiles.conf b/pcr/trousers/tmpfiles.conf new file mode 100644 index 000000000..32d03dd8e --- /dev/null +++ b/pcr/trousers/tmpfiles.conf @@ -0,0 +1,2 @@ +d /var/lib/tpm 0700 tss tss +z /etc/tcsd.conf 0600 tss tss diff --git a/pcr/trousers/trousers.install b/pcr/trousers/trousers.install deleted file mode 100644 index 3725e078b..000000000 --- a/pcr/trousers/trousers.install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - groupadd -r tss - - useradd -r -g tss -d /var/lib/tpm -s /bin/false tss - chown -R tss:tss /var/lib/tpm - chown tss:tss /usr/bin/tcsd - - chown tss:tss /etc/tcsd.conf - chmod 0600 /etc/tcsd.conf - - udevadm trigger --sysname-match="tpm[0-9]*" -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - systemctl stop tcsd - userdel tss -} -- cgit v1.2.2