diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 00000000..b5a9498b --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,21 @@ +pkgbase = trousers + pkgdesc = Open-source TCG Software Stack implementation for use with a TPM + pkgver = 0.3.13 + pkgrel = 2 + url = http://sourceforge.net/projects/trousers + install = trousers.install + arch = i686 + arch = x86_64 + license = CPL + depends = openssl + source = http://downloads.sourceforge.net/project/trousers/trousers/0.3.13/trousers-0.3.13.tar.gz + source = trousers.install + source = tcsd.service + source = 70-tpmd.rules + sha256sums = bb908e4a3c88a17b247a4fc8e0fff3419d8a13170fe7bdfbe0e2c5c082a276d3 + sha256sums = 18a96f4067968d947d5c4d4572b360de19cc940e082e221768add82a24539b9e + sha256sums = 653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd + sha256sums = c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884 + +pkgname = trousers + diff --git a/70-tpmd.rules b/70-tpmd.rules new file mode 100644 index 00000000..448ec09d --- /dev/null +++ b/70-tpmd.rules @@ -0,0 +1 @@ +KERNEL=="tpm[0-9]*", MODE="0600", OWNER="tss", GROUP="tss" diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 00000000..ff7d03b5 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer: mutantmonkey +# Contributor: Robert Buhren +# Contributor: Gavin Lloyd +# Contributor: xav +# Contributor: julian +# Contributor: Silvio Knizek + +pkgname=trousers +pkgver=0.3.10 +pkgrel=3 +pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/trousers" +license=('CPL') +depends=('openssl') +makedepends=('gtk2') +install=${pkgname}.install +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz + ${pkgname}.install + tcsd + tcsd.service + 70-tpmd.rules) +sha256sums=('eb9569de5c66d9698f6c3303de03777b95ec72827f68b7744454bfa9227bc530' + '70ffb97a47b931a73c8a0141af74d8068eff1c173a813cecd50918be2e5b2844' + '22e30fbf8c6634cb86402d804fda1b97a17ae08ddb67461396fe38998cb0e631' + 'd3fe859f70a09097c4e697c7f95d3c907cf60f717fd7994e21c81042f2a47b21' + 'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + --with-openssl=/usr \ + --with-gui=gtk + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -Dm755 ${srcdir}/tcsd ${pkgdir}/etc/rc.d/tcsd + 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 +} + +# vim:set ts=2 sw=2 et: diff --git a/no-werror.patch b/no-werror.patch new file mode 100644 index 00000000..c7c93f49 --- /dev/null +++ b/no-werror.patch @@ -0,0 +1,11 @@ +--- trousers-0.3.8_ORG/configure 2012-01-06 12:32:25.862498967 +0100 ++++ trousers-0.3.8/configure 2012-01-06 13:00:00.224342034 +0100 +@@ -12708,7 +12708,7 @@ + + + if test "x${GCC}" = "xyes"; then +- CFLAGS="$CFLAGS -W -Wall -Werror -Wno-unused-parameter -Wsign-compare" ++ CFLAGS="$CFLAGS -W -Wall -Wno-unused-parameter -Wsign-compare" + fi + + CFLAGS="$CFLAGS -I../include \ diff --git a/tcsd b/tcsd new file mode 100644 index 00000000..bf04c987 --- /dev/null +++ b/tcsd @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +DAEMON='tcsd' +TCSD=/usr/sbin/tcsd +PID=`pidof -o %PPID ${TCSD}` + +case "$1" in + + start) + stat_busy "Starting ${DAEMON}" + if [ -z "$PID" ]; then + $TCSD + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon ${DAEMON} + stat_done + fi + ;; + + stop) + stat_busy "Stopping ${DAEMON}" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon ${DAEMON} + stat_done + fi + ;; + + restart) + $0 stop + $0 start + ;; + + *) + echo "usage: $0 {start|stop|restart}" + +esac +exit 0 diff --git a/tcsd.service b/tcsd.service new file mode 100644 index 00000000..064d52ad --- /dev/null +++ b/tcsd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Manager for Trusted Computing resources +After=sysinit.target + +[Service] +User=tss +ExecStart=/usr/sbin/tcsd -f -c /etc/tcsd.conf + +[Install] +WantedBy=default.target diff --git a/trousers.install b/trousers.install new file mode 100644 index 00000000..9bc65689 --- /dev/null +++ b/trousers.install @@ -0,0 +1,26 @@ +post_install() { + groupadd -r tss + + useradd -r -g tss -d /var/lib/tpm -s /bin/false tss + chown tss:tss /usr/sbin/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() { + /etc/rc.d/tcsd stop &> /dev/null + systemctl stop tcsd +# rm -rf /usr/var/lib/tpm + userdel tss +} + +op=$1 +shift +$op $* diff --git a/tss-user.patch b/tss-user.patch new file mode 100644 index 00000000..5cfdee6a --- /dev/null +++ b/tss-user.patch @@ -0,0 +1,46 @@ +--- trousers-0.3.8_ORG/dist/Makefile.am 2012-01-06 12:32:25.855832307 +0100 ++++ trousers-0.3.8/dist/Makefile.am 2012-01-06 12:46:18.958344853 +0100 +@@ -2,16 +2,9 @@ + fedora/fedora.initrd.tcsd + install: install-exec-hook + if test ! -e ${DESTDIR}/@sysconfdir@/tcsd.conf; then mkdir -p ${DESTDIR}/@sysconfdir@ && cp tcsd.conf ${DESTDIR}/@sysconfdir@; fi +- /bin/chown tss:tss ${DESTDIR}/@sysconfdir@/tcsd.conf || true +- /bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf + + install-exec-hook: +- /usr/sbin/groupadd tss || true +- /usr/sbin/useradd -r tss -g tss || true +- /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi' +- /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm || true +- /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm ++ @echo "rule install-exec-hook skipped" + + uninstall-hook: +- /usr/sbin/userdel tss || true +- /usr/sbin/groupdel tss || true ++ @echo "rule uninstall-hook skipped" +--- trousers-0.3.8_ORG/dist/Makefile.in 2012-01-06 12:32:25.855832307 +0100 ++++ trousers-0.3.8/dist/Makefile.in 2012-01-06 12:42:47.328535153 +0100 +@@ -367,20 +367,11 @@ + + install: install-exec-hook + if test ! -e ${DESTDIR}/@sysconfdir@/tcsd.conf; then mkdir -p ${DESTDIR}/@sysconfdir@ && cp tcsd.conf ${DESTDIR}/@sysconfdir@; fi +- /bin/chown tss:tss ${DESTDIR}/@sysconfdir@/tcsd.conf || true +- /bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf + + install-exec-hook: +- /usr/sbin/groupadd tss || true +- /usr/sbin/useradd -r tss -g tss || true +- /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi' +- /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm || true +- /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm +- ++ @echo "rule install-exec-hook skipped" + uninstall-hook: +- /usr/sbin/userdel tss || true +- /usr/sbin/groupdel tss || true +- ++ @echo "rule uninstall-hook skipped" + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: -- 2.51.2 From 6d95061cc6b271fdd6a09dad513954e505cc6eac Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Wed, 24 Apr 2013 16:28:55 -0400 Subject: [PATCH 02/21] drop sysv initscripts --- PKGBUILD | 5 +---- tcsd | 45 --------------------------------------------- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 tcsd diff --git a/PKGBUILD b/PKGBUILD index ff7d03b5..532ad0b9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=trousers pkgver=0.3.10 -pkgrel=3 +pkgrel=4 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" @@ -17,12 +17,10 @@ makedepends=('gtk2') install=${pkgname}.install source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz ${pkgname}.install - tcsd tcsd.service 70-tpmd.rules) sha256sums=('eb9569de5c66d9698f6c3303de03777b95ec72827f68b7744454bfa9227bc530' '70ffb97a47b931a73c8a0141af74d8068eff1c173a813cecd50918be2e5b2844' - '22e30fbf8c6634cb86402d804fda1b97a17ae08ddb67461396fe38998cb0e631' 'd3fe859f70a09097c4e697c7f95d3c907cf60f717fd7994e21c81042f2a47b21' 'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884') @@ -39,7 +37,6 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - install -Dm755 ${srcdir}/tcsd ${pkgdir}/etc/rc.d/tcsd 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 } diff --git a/tcsd b/tcsd deleted file mode 100644 index bf04c987..00000000 --- a/tcsd +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON='tcsd' -TCSD=/usr/sbin/tcsd -PID=`pidof -o %PPID ${TCSD}` - -case "$1" in - - start) - stat_busy "Starting ${DAEMON}" - if [ -z "$PID" ]; then - $TCSD - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon ${DAEMON} - stat_done - fi - ;; - - stop) - stat_busy "Stopping ${DAEMON}" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ${DAEMON} - stat_done - fi - ;; - - restart) - $0 stop - $0 start - ;; - - *) - echo "usage: $0 {start|stop|restart}" - -esac -exit 0 -- 2.51.2 From 4dd7b3190c74e1ec5d0ec409322ba697574df6a1 Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Tue, 4 Jun 2013 09:40:21 -0700 Subject: [PATCH 03/21] update trousers and spice-vdagent to use /usr/bin --- PKGBUILD | 7 ++++--- tcsd.service | 2 +- trousers.install | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 532ad0b9..2539f350 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=trousers pkgver=0.3.10 -pkgrel=4 +pkgrel=5 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" @@ -20,8 +20,8 @@ source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver} tcsd.service 70-tpmd.rules) sha256sums=('eb9569de5c66d9698f6c3303de03777b95ec72827f68b7744454bfa9227bc530' - '70ffb97a47b931a73c8a0141af74d8068eff1c173a813cecd50918be2e5b2844' - 'd3fe859f70a09097c4e697c7f95d3c907cf60f717fd7994e21c81042f2a47b21' + '1b34445813efc8695714f9a71f8522178baec5052485828af4511b2eaf078b65' + '653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd' 'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884') build() { @@ -29,6 +29,7 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --libdir=/usr/lib \ + --sbindir=/usr/bin \ --with-openssl=/usr \ --with-gui=gtk make diff --git a/tcsd.service b/tcsd.service index 064d52ad..33f4de65 100644 --- a/tcsd.service +++ b/tcsd.service @@ -4,7 +4,7 @@ After=sysinit.target [Service] User=tss -ExecStart=/usr/sbin/tcsd -f -c /etc/tcsd.conf +ExecStart=/usr/bin/tcsd -f -c /etc/tcsd.conf [Install] WantedBy=default.target diff --git a/trousers.install b/trousers.install index 9bc65689..83eeec15 100644 --- a/trousers.install +++ b/trousers.install @@ -2,7 +2,7 @@ post_install() { groupadd -r tss useradd -r -g tss -d /var/lib/tpm -s /bin/false tss - chown tss:tss /usr/sbin/tcsd + chown tss:tss /usr/bin/tcsd chown tss:tss /etc/tcsd.conf chmod 0600 /etc/tcsd.conf -- 2.51.2 From f412225c1c3747737d4b9b4018bc31d0c8e7e57e Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Wed, 14 Aug 2013 23:35:33 -0700 Subject: [PATCH 04/21] update trousers --- PKGBUILD | 7 +++---- trousers.install | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 2539f350..7fcd06b2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,20 +7,19 @@ pkgname=trousers pkgver=0.3.10 -pkgrel=5 +pkgrel=6 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" license=('CPL') depends=('openssl') -makedepends=('gtk2') install=${pkgname}.install source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz ${pkgname}.install tcsd.service 70-tpmd.rules) sha256sums=('eb9569de5c66d9698f6c3303de03777b95ec72827f68b7744454bfa9227bc530' - '1b34445813efc8695714f9a71f8522178baec5052485828af4511b2eaf078b65' + '5276d40a80191b494e8c90a619f37417c551afc58c11b689774a7243891abf4f' '653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd' 'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884') @@ -31,7 +30,7 @@ build() { --libdir=/usr/lib \ --sbindir=/usr/bin \ --with-openssl=/usr \ - --with-gui=gtk + --with-gui=openssl make } diff --git a/trousers.install b/trousers.install index 83eeec15..eddfd28e 100644 --- a/trousers.install +++ b/trousers.install @@ -2,6 +2,7 @@ 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 @@ -17,7 +18,6 @@ post_upgrade() { pre_remove() { /etc/rc.d/tcsd stop &> /dev/null systemctl stop tcsd -# rm -rf /usr/var/lib/tpm userdel tss } -- 2.51.2 From 8fa4eef6332c23e4dd58b945fcb9cee2fc32733d Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Sun, 17 Nov 2013 14:54:36 -0800 Subject: [PATCH 05/21] upgrade trousers --- PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 7fcd06b2..1902b2b4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,19 +6,19 @@ # Contributor: Silvio Knizek pkgname=trousers -pkgver=0.3.10 -pkgrel=6 +pkgver=0.3.11.2 +pkgrel=1 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" license=('CPL') depends=('openssl') install=${pkgname}.install -source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/0.3.11/${pkgname}-${pkgver}.tar.gz ${pkgname}.install tcsd.service 70-tpmd.rules) -sha256sums=('eb9569de5c66d9698f6c3303de03777b95ec72827f68b7744454bfa9227bc530' +sha256sums=('9bdc3001e00e215c09ac50810940c5c32a0fe057952916e5e836c858bf0e870d' '5276d40a80191b494e8c90a619f37417c551afc58c11b689774a7243891abf4f' '653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd' 'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884') -- 2.51.2 From bac7f804fcfafb4256ac21497a7fe84200934ec2 Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Fri, 28 Mar 2014 19:40:31 -0700 Subject: [PATCH 06/21] trousers: remove unneeded lines from .install --- PKGBUILD | 4 ++-- trousers.install | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 1902b2b4..4fad8e7f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=trousers pkgver=0.3.11.2 -pkgrel=1 +pkgrel=2 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" @@ -19,7 +19,7 @@ source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/0.3.11/${ tcsd.service 70-tpmd.rules) sha256sums=('9bdc3001e00e215c09ac50810940c5c32a0fe057952916e5e836c858bf0e870d' - '5276d40a80191b494e8c90a619f37417c551afc58c11b689774a7243891abf4f' + '126504ce095738eed1d08f5ef55fb776b4764f354473f9df33359f36402157c7' '653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd' 'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884') diff --git a/trousers.install b/trousers.install index eddfd28e..bcad3718 100644 --- a/trousers.install +++ b/trousers.install @@ -20,7 +20,3 @@ pre_remove() { systemctl stop tcsd userdel tss } - -op=$1 -shift -$op $* -- 2.51.2 From 206baa79c017be01991a09c51cb4b80f9da1df99 Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Fri, 28 Mar 2014 22:20:40 -0700 Subject: [PATCH 07/21] trousers: remove reference to old initscript --- trousers.install | 1 - 1 file changed, 1 deletion(-) diff --git a/trousers.install b/trousers.install index bcad3718..3725e078 100644 --- a/trousers.install +++ b/trousers.install @@ -16,7 +16,6 @@ post_upgrade() { } pre_remove() { - /etc/rc.d/tcsd stop &> /dev/null systemctl stop tcsd userdel tss } -- 2.51.2 From e7f39d220147996ae06101d6fd455a8f60fc2f3c Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Sat, 7 Jun 2014 14:17:39 -0700 Subject: [PATCH 08/21] update trousers --- PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 4fad8e7f..f1e9fd04 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,20 +6,20 @@ # Contributor: Silvio Knizek pkgname=trousers -pkgver=0.3.11.2 -pkgrel=2 +pkgver=0.3.13 +pkgrel=1 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" license=('CPL') depends=('openssl') install=${pkgname}.install -source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/0.3.11/${pkgname}-${pkgver}.tar.gz +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/0.3.13/${pkgname}-${pkgver}.tar.gz ${pkgname}.install tcsd.service 70-tpmd.rules) -sha256sums=('9bdc3001e00e215c09ac50810940c5c32a0fe057952916e5e836c858bf0e870d' - '126504ce095738eed1d08f5ef55fb776b4764f354473f9df33359f36402157c7' +sha256sums=('51957cc495947ccd75d2b0b306b0e3566548d11a3b49b3dd62cf095993eb4e3d' + '18a96f4067968d947d5c4d4572b360de19cc940e082e221768add82a24539b9e' '653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd' 'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884') -- 2.51.2 From 4a446eba171f4f6aa7783839a298d3ece5e42165 Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Fri, 13 Jun 2014 00:05:45 -0700 Subject: [PATCH 09/21] upgrade trousers Upstream added bootstrap.sh to the source tarballs on June 10. --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index f1e9fd04..14616bb2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=trousers pkgver=0.3.13 -pkgrel=1 +pkgrel=2 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" @@ -18,7 +18,7 @@ source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/0.3.13/${ ${pkgname}.install tcsd.service 70-tpmd.rules) -sha256sums=('51957cc495947ccd75d2b0b306b0e3566548d11a3b49b3dd62cf095993eb4e3d' +sha256sums=('bb908e4a3c88a17b247a4fc8e0fff3419d8a13170fe7bdfbe0e2c5c082a276d3' '18a96f4067968d947d5c4d4572b360de19cc940e082e221768add82a24539b9e' '653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd' 'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884') -- 2.51.2 From b124af03830cb370c40b41d380c4950c9895dcba Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Fri, 19 Jun 2015 19:13:25 -0700 Subject: [PATCH 10/21] set -std=gnu89 in CFLAGS --- .SRCINFO | 2 +- PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b5a9498b..ae04d8ae 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = trousers pkgdesc = Open-source TCG Software Stack implementation for use with a TPM pkgver = 0.3.13 - pkgrel = 2 + pkgrel = 3 url = http://sourceforge.net/projects/trousers install = trousers.install arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 14616bb2..450da8be 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=trousers pkgver=0.3.13 -pkgrel=2 +pkgrel=3 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" @@ -25,7 +25,7 @@ sha256sums=('bb908e4a3c88a17b247a4fc8e0fff3419d8a13170fe7bdfbe0e2c5c082a276d3' build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ + CFLAGS="${CFLAGS} -std=gnu89" ./configure --prefix=/usr \ --sysconfdir=/etc \ --libdir=/usr/lib \ --sbindir=/usr/bin \ -- 2.51.2 From e0d77f2bc5c3dbf0fac0ae725aff43604e68bb3b Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Tue, 18 Aug 2015 09:29:51 -0700 Subject: [PATCH 11/21] upgpkg: trousers 0.3.13-4 add options=('libtool') --- .SRCINFO | 3 ++- PKGBUILD | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ae04d8ae..45470153 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,13 +1,14 @@ pkgbase = trousers pkgdesc = Open-source TCG Software Stack implementation for use with a TPM pkgver = 0.3.13 - pkgrel = 3 + pkgrel = 4 url = http://sourceforge.net/projects/trousers install = trousers.install arch = i686 arch = x86_64 license = CPL depends = openssl + options = libtool source = http://downloads.sourceforge.net/project/trousers/trousers/0.3.13/trousers-0.3.13.tar.gz source = trousers.install source = tcsd.service diff --git a/PKGBUILD b/PKGBUILD index 450da8be..0566dbf2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,12 +7,13 @@ pkgname=trousers pkgver=0.3.13 -pkgrel=3 +pkgrel=4 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" license=('CPL') depends=('openssl') +options=('libtool') install=${pkgname}.install source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/0.3.13/${pkgname}-${pkgver}.tar.gz ${pkgname}.install -- 2.51.2 From 80268ac0965b9cae76963996c5227a1c4c46c1e4 Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Tue, 18 Aug 2015 09:45:35 -0700 Subject: [PATCH 12/21] upgpkg: trousers 0.3.13-5 remove unnecessary patches --- .SRCINFO | 2 +- PKGBUILD | 2 +- no-werror.patch | 11 ----------- tss-user.patch | 46 ---------------------------------------------- 4 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 no-werror.patch delete mode 100644 tss-user.patch diff --git a/.SRCINFO b/.SRCINFO index 45470153..59079d9e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = trousers pkgdesc = Open-source TCG Software Stack implementation for use with a TPM pkgver = 0.3.13 - pkgrel = 4 + pkgrel = 5 url = http://sourceforge.net/projects/trousers install = trousers.install arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 0566dbf2..9f0948f0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=trousers pkgver=0.3.13 -pkgrel=4 +pkgrel=5 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" diff --git a/no-werror.patch b/no-werror.patch deleted file mode 100644 index c7c93f49..00000000 --- a/no-werror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trousers-0.3.8_ORG/configure 2012-01-06 12:32:25.862498967 +0100 -+++ trousers-0.3.8/configure 2012-01-06 13:00:00.224342034 +0100 -@@ -12708,7 +12708,7 @@ - - - if test "x${GCC}" = "xyes"; then -- CFLAGS="$CFLAGS -W -Wall -Werror -Wno-unused-parameter -Wsign-compare" -+ CFLAGS="$CFLAGS -W -Wall -Wno-unused-parameter -Wsign-compare" - fi - - CFLAGS="$CFLAGS -I../include \ diff --git a/tss-user.patch b/tss-user.patch deleted file mode 100644 index 5cfdee6a..00000000 --- a/tss-user.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- trousers-0.3.8_ORG/dist/Makefile.am 2012-01-06 12:32:25.855832307 +0100 -+++ trousers-0.3.8/dist/Makefile.am 2012-01-06 12:46:18.958344853 +0100 -@@ -2,16 +2,9 @@ - fedora/fedora.initrd.tcsd - install: install-exec-hook - if test ! -e ${DESTDIR}/@sysconfdir@/tcsd.conf; then mkdir -p ${DESTDIR}/@sysconfdir@ && cp tcsd.conf ${DESTDIR}/@sysconfdir@; fi -- /bin/chown tss:tss ${DESTDIR}/@sysconfdir@/tcsd.conf || true -- /bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf - - install-exec-hook: -- /usr/sbin/groupadd tss || true -- /usr/sbin/useradd -r tss -g tss || true -- /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi' -- /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm || true -- /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm -+ @echo "rule install-exec-hook skipped" - - uninstall-hook: -- /usr/sbin/userdel tss || true -- /usr/sbin/groupdel tss || true -+ @echo "rule uninstall-hook skipped" ---- trousers-0.3.8_ORG/dist/Makefile.in 2012-01-06 12:32:25.855832307 +0100 -+++ trousers-0.3.8/dist/Makefile.in 2012-01-06 12:42:47.328535153 +0100 -@@ -367,20 +367,11 @@ - - install: install-exec-hook - if test ! -e ${DESTDIR}/@sysconfdir@/tcsd.conf; then mkdir -p ${DESTDIR}/@sysconfdir@ && cp tcsd.conf ${DESTDIR}/@sysconfdir@; fi -- /bin/chown tss:tss ${DESTDIR}/@sysconfdir@/tcsd.conf || true -- /bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf - - install-exec-hook: -- /usr/sbin/groupadd tss || true -- /usr/sbin/useradd -r tss -g tss || true -- /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi' -- /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm || true -- /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm -- -+ @echo "rule install-exec-hook skipped" - uninstall-hook: -- /usr/sbin/userdel tss || true -- /usr/sbin/groupdel tss || true -- -+ @echo "rule uninstall-hook skipped" - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -- 2.51.2 From 51d717b89f1e282b8fc206f2a57e733d3886bb95 Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Sat, 19 Nov 2016 17:22:20 -0800 Subject: [PATCH 13/21] upgpkg: trousers 0.3.14-1 upstream release --- .SRCINFO | 10 ++++++---- PKGBUILD | 16 +++++++++------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 59079d9e..80849cac 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,9 @@ +# Generated by mksrcinfo v8 +# Sun Nov 20 01:22:20 UTC 2016 pkgbase = trousers pkgdesc = Open-source TCG Software Stack implementation for use with a TPM - pkgver = 0.3.13 - pkgrel = 5 + pkgver = 0.3.14 + pkgrel = 1 url = http://sourceforge.net/projects/trousers install = trousers.install arch = i686 @@ -9,11 +11,11 @@ pkgbase = trousers license = CPL depends = openssl options = libtool - source = http://downloads.sourceforge.net/project/trousers/trousers/0.3.13/trousers-0.3.13.tar.gz + source = http://downloads.sourceforge.net/project/trousers/trousers/0.3.14/trousers-0.3.14.tar.gz source = trousers.install source = tcsd.service source = 70-tpmd.rules - sha256sums = bb908e4a3c88a17b247a4fc8e0fff3419d8a13170fe7bdfbe0e2c5c082a276d3 + sha256sums = 95db55beb1556b12be9b4cf3123a3a59c7a70cc890d731fae93e6949305fb63b sha256sums = 18a96f4067968d947d5c4d4572b360de19cc940e082e221768add82a24539b9e sha256sums = 653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd sha256sums = c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884 diff --git a/PKGBUILD b/PKGBUILD index 9f0948f0..76a8f829 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: Silvio Knizek pkgname=trousers -pkgver=0.3.13 -pkgrel=5 +pkgver=0.3.14 +pkgrel=1 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" @@ -15,18 +15,19 @@ license=('CPL') depends=('openssl') options=('libtool') install=${pkgname}.install -source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/0.3.13/${pkgname}-${pkgver}.tar.gz +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz ${pkgname}.install tcsd.service 70-tpmd.rules) -sha256sums=('bb908e4a3c88a17b247a4fc8e0fff3419d8a13170fe7bdfbe0e2c5c082a276d3' +sha256sums=('95db55beb1556b12be9b4cf3123a3a59c7a70cc890d731fae93e6949305fb63b' '18a96f4067968d947d5c4d4572b360de19cc940e082e221768add82a24539b9e' '653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd' 'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884') build() { - cd ${srcdir}/${pkgname}-${pkgver} - CFLAGS="${CFLAGS} -std=gnu89" ./configure --prefix=/usr \ + # the tarball for 0.3.14 doesn't have a parent directory + cd ${srcdir}/ + ./configure --prefix=/usr \ --sysconfdir=/etc \ --libdir=/usr/lib \ --sbindir=/usr/bin \ @@ -36,7 +37,8 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} + # the tarball for 0.3.14 doesn't have a parent directory + cd ${srcdir}/ 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 -- 2.51.2 From af317ed5d0fdfdf18b741e574eb55662e8f84498 Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Sat, 3 Dec 2016 17:02:16 -0800 Subject: [PATCH 14/21] upgpkg: trousers 0.3.14-2 Upstream updated their source files and didn't tell anyone. --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 80849cac..9a43c571 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Nov 20 01:22:20 UTC 2016 +# Sun Dec 4 01:02:16 UTC 2016 pkgbase = trousers pkgdesc = Open-source TCG Software Stack implementation for use with a TPM pkgver = 0.3.14 - pkgrel = 1 + pkgrel = 2 url = http://sourceforge.net/projects/trousers install = trousers.install arch = i686 @@ -15,7 +15,7 @@ pkgbase = trousers source = trousers.install source = tcsd.service source = 70-tpmd.rules - sha256sums = 95db55beb1556b12be9b4cf3123a3a59c7a70cc890d731fae93e6949305fb63b + sha256sums = ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47 sha256sums = 18a96f4067968d947d5c4d4572b360de19cc940e082e221768add82a24539b9e sha256sums = 653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd sha256sums = c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884 diff --git a/PKGBUILD b/PKGBUILD index 76a8f829..f074a545 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=trousers pkgver=0.3.14 -pkgrel=1 +pkgrel=2 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" @@ -19,7 +19,7 @@ source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver} ${pkgname}.install tcsd.service 70-tpmd.rules) -sha256sums=('95db55beb1556b12be9b4cf3123a3a59c7a70cc890d731fae93e6949305fb63b' +sha256sums=('ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47' '18a96f4067968d947d5c4d4572b360de19cc940e082e221768add82a24539b9e' '653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd' 'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884') -- 2.51.2 From 6b66f61478d192f1b46005aeb331a5d271e281f0 Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Sat, 10 Jun 2017 15:14:15 -0700 Subject: [PATCH 15/21] upgpkg: trousers 0.3.14-3 Apply patch from Gerardo Exequiel Pozzi --- .SRCINFO | 14 +++++++++----- 01-tss-user.patch | 36 ++++++++++++++++++++++++++++++++++++ PKGBUILD | 33 +++++++++++++++++++++++---------- sysusers.conf | 1 + tmpfiles.conf | 2 ++ trousers.install | 21 --------------------- 6 files changed, 71 insertions(+), 36 deletions(-) create mode 100644 01-tss-user.patch create mode 100644 sysusers.conf create mode 100644 tmpfiles.conf delete mode 100644 trousers.install diff --git a/.SRCINFO b/.SRCINFO index 9a43c571..6463658b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,24 +1,28 @@ # Generated by mksrcinfo v8 -# Sun Dec 4 01:02:16 UTC 2016 +# Sat Jun 10 22:14:15 UTC 2017 pkgbase = trousers pkgdesc = Open-source TCG Software Stack implementation for use with a TPM pkgver = 0.3.14 - pkgrel = 2 + pkgrel = 3 url = http://sourceforge.net/projects/trousers - install = trousers.install arch = i686 arch = x86_64 license = CPL depends = openssl + noextract = trousers-0.3.14.tar.gz options = libtool source = http://downloads.sourceforge.net/project/trousers/trousers/0.3.14/trousers-0.3.14.tar.gz - source = trousers.install + source = sysusers.conf + source = tmpfiles.conf source = tcsd.service source = 70-tpmd.rules + source = 01-tss-user.patch sha256sums = ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47 - sha256sums = 18a96f4067968d947d5c4d4572b360de19cc940e082e221768add82a24539b9e + sha256sums = 4c2684501e7a67132d4f53466b32fc06bd2a0275d4cf1fbd5479d0cdb2349bc7 + sha256sums = 1afd455b6c17e730b2cc4ec71d5625f0b63fde54f9409ae4762dc6f084c194de sha256sums = 653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd sha256sums = c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884 + sha256sums = 169cc2cbc3a8bce7fd76e0c96e5b04b5249a0db9e857b274a0c5da461bb604f7 pkgname = trousers diff --git a/01-tss-user.patch b/01-tss-user.patch new file mode 100644 index 00000000..37f74617 --- /dev/null +++ b/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/PKGBUILD b/PKGBUILD index f074a545..9b2d465e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: mutantmonkey +# Contributor: Gerardo Exequiel Pozzi # Contributor: Robert Buhren # Contributor: Gavin Lloyd # Contributor: xav @@ -7,26 +8,37 @@ pkgname=trousers pkgver=0.3.14 -pkgrel=2 +pkgrel=3 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" license=('CPL') depends=('openssl') options=('libtool') -install=${pkgname}.install source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz - ${pkgname}.install + sysusers.conf + tmpfiles.conf tcsd.service - 70-tpmd.rules) + 70-tpmd.rules + 01-tss-user.patch) +noextract=(${pkgname}-${pkgver}.tar.gz) sha256sums=('ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47' - '18a96f4067968d947d5c4d4572b360de19cc940e082e221768add82a24539b9e' + '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() { - # the tarball for 0.3.14 doesn't have a parent directory - cd ${srcdir}/ + cd ${pkgname}-${pkgver} + ./bootstrap.sh ./configure --prefix=/usr \ --sysconfdir=/etc \ --libdir=/usr/lib \ @@ -37,11 +49,12 @@ build() { } package() { - # the tarball for 0.3.14 doesn't have a parent directory - cd ${srcdir}/ + 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/sysusers.conf b/sysusers.conf new file mode 100644 index 00000000..9b5ef17b --- /dev/null +++ b/sysusers.conf @@ -0,0 +1 @@ +u tss - "TCG Software Stack" /var/lib/tpm diff --git a/tmpfiles.conf b/tmpfiles.conf new file mode 100644 index 00000000..32d03dd8 --- /dev/null +++ b/tmpfiles.conf @@ -0,0 +1,2 @@ +d /var/lib/tpm 0700 tss tss +z /etc/tcsd.conf 0600 tss tss diff --git a/trousers.install b/trousers.install deleted file mode 100644 index 3725e078..00000000 --- a/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 -} -- 2.51.2 From a2c34f42e0bdf143fc26d321cac7f69f92a772b3 Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Sat, 23 May 2020 15:38:58 -0700 Subject: [PATCH 16/21] upgpkg: trousers 0.3.14-4 Apply trousers-0.3.14-fno-common.patch from Gentoo to fix build --- .SRCINFO | 6 +++--- PKGBUILD | 21 ++++++++++++--------- trousers-0.3.14-fno-common.patch | 15 +++++++++++++++ 3 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 trousers-0.3.14-fno-common.patch diff --git a/.SRCINFO b/.SRCINFO index 6463658b..68662868 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Sat Jun 10 22:14:15 UTC 2017 pkgbase = trousers pkgdesc = Open-source TCG Software Stack implementation for use with a TPM pkgver = 0.3.14 - pkgrel = 3 + pkgrel = 4 url = http://sourceforge.net/projects/trousers arch = i686 arch = x86_64 @@ -17,12 +15,14 @@ pkgbase = trousers source = tcsd.service source = 70-tpmd.rules source = 01-tss-user.patch + source = trousers-0.3.14-fno-common.patch sha256sums = ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47 sha256sums = 4c2684501e7a67132d4f53466b32fc06bd2a0275d4cf1fbd5479d0cdb2349bc7 sha256sums = 1afd455b6c17e730b2cc4ec71d5625f0b63fde54f9409ae4762dc6f084c194de sha256sums = 653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd sha256sums = c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884 sha256sums = 169cc2cbc3a8bce7fd76e0c96e5b04b5249a0db9e857b274a0c5da461bb604f7 + sha256sums = 770fd94510adb90605eb38745b62450a4cda25c2b8c9c6c8ea2e6043582d0e27 pkgname = trousers diff --git a/PKGBUILD b/PKGBUILD index 9b2d465e..2732270f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,32 +8,35 @@ pkgname=trousers pkgver=0.3.14 -pkgrel=3 +pkgrel=4 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" license=('CPL') depends=('openssl') options=('libtool') -source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz - sysusers.conf - tmpfiles.conf - tcsd.service - 70-tpmd.rules - 01-tss-user.patch) -noextract=(${pkgname}-${pkgver}.tar.gz) +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'sysusers.conf' + 'tmpfiles.conf' + 'tcsd.service' + '70-tpmd.rules' + '01-tss-user.patch' + 'trousers-0.3.14-fno-common.patch') +noextract=("${pkgname}-${pkgver}.tar.gz") sha256sums=('ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47' '4c2684501e7a67132d4f53466b32fc06bd2a0275d4cf1fbd5479d0cdb2349bc7' '1afd455b6c17e730b2cc4ec71d5625f0b63fde54f9409ae4762dc6f084c194de' '653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd' 'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884' - '169cc2cbc3a8bce7fd76e0c96e5b04b5249a0db9e857b274a0c5da461bb604f7') + '169cc2cbc3a8bce7fd76e0c96e5b04b5249a0db9e857b274a0c5da461bb604f7' + '770fd94510adb90605eb38745b62450a4cda25c2b8c9c6c8ea2e6043582d0e27') 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 + patch -p1 -i ${srcdir}/trousers-0.3.14-fno-common.patch } build() { diff --git a/trousers-0.3.14-fno-common.patch b/trousers-0.3.14-fno-common.patch new file mode 100644 index 00000000..5046bc70 --- /dev/null +++ b/trousers-0.3.14-fno-common.patch @@ -0,0 +1,15 @@ +diff --git a/src/include/tcsd.h b/src/include/tcsd.h +index 5b9462b..05bae97 100644 +--- a/src/include/tcsd.h ++++ b/src/include/tcsd.h +@@ -166,8 +166,8 @@ void thread_signal_init(); + + /* signal handling */ + #ifndef __APPLE__ +-struct sigaction tcsd_sa_int; +-struct sigaction tcsd_sa_chld; ++extern struct sigaction tcsd_sa_int; ++extern struct sigaction tcsd_sa_chld; + #endif + + #endif -- 2.51.2 From 4ada91a5855116ee6a4cabcf12f6cf197abdf5d4 Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Sat, 28 Nov 2020 15:35:27 -0800 Subject: [PATCH 17/21] upgpkg: trousers 0.3.15-1 upstream release that fixes CVE-2020-24332 --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 68662868..134713c0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,22 +1,22 @@ pkgbase = trousers pkgdesc = Open-source TCG Software Stack implementation for use with a TPM - pkgver = 0.3.14 - pkgrel = 4 + pkgver = 0.3.15 + pkgrel = 1 url = http://sourceforge.net/projects/trousers arch = i686 arch = x86_64 license = CPL depends = openssl - noextract = trousers-0.3.14.tar.gz + noextract = trousers-0.3.15.tar.gz options = libtool - source = http://downloads.sourceforge.net/project/trousers/trousers/0.3.14/trousers-0.3.14.tar.gz + source = http://downloads.sourceforge.net/project/trousers/trousers/0.3.15/trousers-0.3.15.tar.gz source = sysusers.conf source = tmpfiles.conf source = tcsd.service source = 70-tpmd.rules source = 01-tss-user.patch source = trousers-0.3.14-fno-common.patch - sha256sums = ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47 + sha256sums = 1e5be93e518372acf1d92d2f567d01a46fdb0b730487e544e6fb896c59cac77f sha256sums = 4c2684501e7a67132d4f53466b32fc06bd2a0275d4cf1fbd5479d0cdb2349bc7 sha256sums = 1afd455b6c17e730b2cc4ec71d5625f0b63fde54f9409ae4762dc6f084c194de sha256sums = 653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd diff --git a/PKGBUILD b/PKGBUILD index 2732270f..b48acc4d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,8 +7,8 @@ # Contributor: Silvio Knizek pkgname=trousers -pkgver=0.3.14 -pkgrel=4 +pkgver=0.3.15 +pkgrel=1 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" @@ -23,7 +23,7 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver '01-tss-user.patch' 'trousers-0.3.14-fno-common.patch') noextract=("${pkgname}-${pkgver}.tar.gz") -sha256sums=('ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47' +sha256sums=('1e5be93e518372acf1d92d2f567d01a46fdb0b730487e544e6fb896c59cac77f' '4c2684501e7a67132d4f53466b32fc06bd2a0275d4cf1fbd5479d0cdb2349bc7' '1afd455b6c17e730b2cc4ec71d5625f0b63fde54f9409ae4762dc6f084c194de' '653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd' -- 2.51.2 From 1a0e3658c840b2cbaaaa0bae39056d0ee5201ced Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Sat, 28 Nov 2020 15:52:20 -0800 Subject: [PATCH 18/21] Fix trousers build Upstream changes had broken a patch, and the tarball has double-nested directories for some reason. --- .SRCINFO | 4 +--- 01-tss-user.patch | 6 +++--- PKGBUILD | 19 +++++++++++-------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 134713c0..cd914d70 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -15,14 +15,12 @@ pkgbase = trousers source = tcsd.service source = 70-tpmd.rules source = 01-tss-user.patch - source = trousers-0.3.14-fno-common.patch sha256sums = 1e5be93e518372acf1d92d2f567d01a46fdb0b730487e544e6fb896c59cac77f sha256sums = 4c2684501e7a67132d4f53466b32fc06bd2a0275d4cf1fbd5479d0cdb2349bc7 sha256sums = 1afd455b6c17e730b2cc4ec71d5625f0b63fde54f9409ae4762dc6f084c194de sha256sums = 653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd sha256sums = c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884 - sha256sums = 169cc2cbc3a8bce7fd76e0c96e5b04b5249a0db9e857b274a0c5da461bb604f7 - sha256sums = 770fd94510adb90605eb38745b62450a4cda25c2b8c9c6c8ea2e6043582d0e27 + sha256sums = d6d2f72389ffc1f61c363d839de24ba7ebb9a6453d99ece151a65933ebb0235c pkgname = trousers diff --git a/01-tss-user.patch b/01-tss-user.patch index 37f74617..7518b9ab 100644 --- a/01-tss-user.patch +++ b/01-tss-user.patch @@ -10,12 +10,12 @@ 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 +- /bin/chown root:tss ${DESTDIR}/@sysconfdir@/tcsd.conf || true +- /bin/chmod 0640 ${DESTDIR}/@sysconfdir@/tcsd.conf -endif install-exec-hook: diff --git a/PKGBUILD b/PKGBUILD index b48acc4d..1a108ebf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -20,27 +20,29 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver 'tmpfiles.conf' 'tcsd.service' '70-tpmd.rules' - '01-tss-user.patch' - 'trousers-0.3.14-fno-common.patch') + '01-tss-user.patch') +# 'trousers-0.3.14-fno-common.patch') noextract=("${pkgname}-${pkgver}.tar.gz") sha256sums=('1e5be93e518372acf1d92d2f567d01a46fdb0b730487e544e6fb896c59cac77f' '4c2684501e7a67132d4f53466b32fc06bd2a0275d4cf1fbd5479d0cdb2349bc7' '1afd455b6c17e730b2cc4ec71d5625f0b63fde54f9409ae4762dc6f084c194de' '653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd' 'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884' - '169cc2cbc3a8bce7fd76e0c96e5b04b5249a0db9e857b274a0c5da461bb604f7' - '770fd94510adb90605eb38745b62450a4cda25c2b8c9c6c8ea2e6043582d0e27') + 'd6d2f72389ffc1f61c363d839de24ba7ebb9a6453d99ece151a65933ebb0235c') +# '770fd94510adb90605eb38745b62450a4cda25c2b8c9c6c8ea2e6043582d0e27') prepare() { mkdir -p ${pkgname}-${pkgver} bsdtar -x -f ${pkgname}-${pkgver}.tar.gz -C ${pkgname}-${pkgver} - cd ${pkgname}-${pkgver} + # this is not a typo; the trousers devs released the tarball like this + cd ${pkgname}-${pkgver}/${pkgname}-${pkgver} patch -p1 -i ${srcdir}/01-tss-user.patch - patch -p1 -i ${srcdir}/trousers-0.3.14-fno-common.patch + #patch -p1 -i ${srcdir}/trousers-0.3.14-fno-common.patch } build() { - cd ${pkgname}-${pkgver} + # this is not a typo; the trousers devs released the tarball like this + cd ${pkgname}-${pkgver}/${pkgname}-${pkgver} ./bootstrap.sh ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -52,7 +54,8 @@ build() { } package() { - cd ${pkgname}-${pkgver} + # this is not a typo; the trousers devs released the tarball like this + cd ${pkgname}-${pkgver}/${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 -- 2.51.2 From e4f73a9c0f32de03bb3b613194158b3bf5a6ac78 Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Sat, 28 Nov 2020 16:05:11 -0800 Subject: [PATCH 19/21] trousers: remove noextract workaround Whoops, the double-nesting was actually my fault, so let's fix that. --- .SRCINFO | 1 - PKGBUILD | 12 +++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cd914d70..2f7c97de 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -7,7 +7,6 @@ pkgbase = trousers arch = x86_64 license = CPL depends = openssl - noextract = trousers-0.3.15.tar.gz options = libtool source = http://downloads.sourceforge.net/project/trousers/trousers/0.3.15/trousers-0.3.15.tar.gz source = sysusers.conf diff --git a/PKGBUILD b/PKGBUILD index 1a108ebf..8eee9910 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -22,7 +22,6 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver '70-tpmd.rules' '01-tss-user.patch') # 'trousers-0.3.14-fno-common.patch') -noextract=("${pkgname}-${pkgver}.tar.gz") sha256sums=('1e5be93e518372acf1d92d2f567d01a46fdb0b730487e544e6fb896c59cac77f' '4c2684501e7a67132d4f53466b32fc06bd2a0275d4cf1fbd5479d0cdb2349bc7' '1afd455b6c17e730b2cc4ec71d5625f0b63fde54f9409ae4762dc6f084c194de' @@ -32,17 +31,13 @@ sha256sums=('1e5be93e518372acf1d92d2f567d01a46fdb0b730487e544e6fb896c59cac77f' # '770fd94510adb90605eb38745b62450a4cda25c2b8c9c6c8ea2e6043582d0e27') prepare() { - mkdir -p ${pkgname}-${pkgver} - bsdtar -x -f ${pkgname}-${pkgver}.tar.gz -C ${pkgname}-${pkgver} - # this is not a typo; the trousers devs released the tarball like this - cd ${pkgname}-${pkgver}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} patch -p1 -i ${srcdir}/01-tss-user.patch #patch -p1 -i ${srcdir}/trousers-0.3.14-fno-common.patch } build() { - # this is not a typo; the trousers devs released the tarball like this - cd ${pkgname}-${pkgver}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./bootstrap.sh ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -54,8 +49,7 @@ build() { } package() { - # this is not a typo; the trousers devs released the tarball like this - cd ${pkgname}-${pkgver}/${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 -- 2.51.2 From 417e0dd24b1db0c4e54e07e03a422a31e2e4ba2d Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Sat, 12 Dec 2020 17:49:12 -0800 Subject: [PATCH 20/21] upgpkg: trousers 0.3.15-2 Fix ownership and permissions on /etc/tcsd.conf --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- tmpfiles.conf | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2f7c97de..fa8f4103 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = trousers pkgdesc = Open-source TCG Software Stack implementation for use with a TPM pkgver = 0.3.15 - pkgrel = 1 + pkgrel = 2 url = http://sourceforge.net/projects/trousers arch = i686 arch = x86_64 @@ -16,7 +16,7 @@ pkgbase = trousers source = 01-tss-user.patch sha256sums = 1e5be93e518372acf1d92d2f567d01a46fdb0b730487e544e6fb896c59cac77f sha256sums = 4c2684501e7a67132d4f53466b32fc06bd2a0275d4cf1fbd5479d0cdb2349bc7 - sha256sums = 1afd455b6c17e730b2cc4ec71d5625f0b63fde54f9409ae4762dc6f084c194de + sha256sums = 225414a8da825351da33760a141a607f731c513c36527e4624b36a607c5aa7e6 sha256sums = 653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd sha256sums = c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884 sha256sums = d6d2f72389ffc1f61c363d839de24ba7ebb9a6453d99ece151a65933ebb0235c diff --git a/PKGBUILD b/PKGBUILD index 8eee9910..52bf5791 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ pkgname=trousers pkgver=0.3.15 -pkgrel=1 +pkgrel=2 pkgdesc="Open-source TCG Software Stack implementation for use with a TPM" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/trousers" @@ -24,7 +24,7 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver # 'trousers-0.3.14-fno-common.patch') sha256sums=('1e5be93e518372acf1d92d2f567d01a46fdb0b730487e544e6fb896c59cac77f' '4c2684501e7a67132d4f53466b32fc06bd2a0275d4cf1fbd5479d0cdb2349bc7' - '1afd455b6c17e730b2cc4ec71d5625f0b63fde54f9409ae4762dc6f084c194de' + '225414a8da825351da33760a141a607f731c513c36527e4624b36a607c5aa7e6' '653c3a94ec628e7a7fb150d0d289b0866c6b3bb9aa57af2c59724517d205d7bd' 'c50ea41a4809699dd50f2e621acc6baafb2dffa43cd5a0df8a0679f1d1b1b884' 'd6d2f72389ffc1f61c363d839de24ba7ebb9a6453d99ece151a65933ebb0235c') diff --git a/tmpfiles.conf b/tmpfiles.conf index 32d03dd8..c9575179 100644 --- a/tmpfiles.conf +++ b/tmpfiles.conf @@ -1,2 +1,2 @@ d /var/lib/tpm 0700 tss tss -z /etc/tcsd.conf 0600 tss tss +z /etc/tcsd.conf 0640 root tss -- 2.51.2 From 154bae292c30f76a3786a0c7931908667a03c044 Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Mon, 7 Jun 2021 01:14:11 -0700 Subject: [PATCH 21/21] upgpkg: trousers 0.3.15-2 Update maintainer email address --- .SRCINFO | 1 - PKGBUILD | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fa8f4103..13d4c2cd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -22,4 +22,3 @@ pkgbase = trousers sha256sums = d6d2f72389ffc1f61c363d839de24ba7ebb9a6453d99ece151a65933ebb0235c pkgname = trousers - diff --git a/PKGBUILD b/PKGBUILD index 52bf5791..196925f5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: mutantmonkey +# Maintainer: mutantmonkey # Contributor: Gerardo Exequiel Pozzi # Contributor: Robert Buhren # Contributor: Gavin Lloyd