Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/swtpm/, app-crypt/swtpm/files/
Date: Sat, 26 Jun 2021 03:43:57
Message-Id: 1624678869.8d163720376cbfd3583097bf2eb0f11f49989181.tamiko@gentoo
1 commit: 8d163720376cbfd3583097bf2eb0f11f49989181
2 Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
3 AuthorDate: Tue Jun 8 02:35:45 2021 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 26 03:41:09 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d163720
7
8 app-crypt/swtpm: Bump to 0.6.0
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
12 Closes: https://bugs.gentoo.org/798696
13 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
14
15 app-crypt/swtpm/Manifest | 1 +
16 .../swtpm/files/swtpm-0.6.0-fix-localca-path.patch | 31 ++++++++++
17 app-crypt/swtpm/swtpm-0.6.0.ebuild | 69 ++++++++++++++++++++++
18 3 files changed, 101 insertions(+)
19
20 diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
21 index 3516263e71e..9405fc8ced4 100644
22 --- a/app-crypt/swtpm/Manifest
23 +++ b/app-crypt/swtpm/Manifest
24 @@ -1 +1,2 @@
25 DIST swtpm-0.5.2.tar.gz 309436 BLAKE2B 0518e59b052c9224d5db1c2720f74ff15717468f73b1665e67c017581dd2b52d7a4cf28f94a932eb6068de3bc50f2e5710b8c447e4a08e6b4a31019db542d910 SHA512 4554f1b7a534829f9fbef4a09e190f1d5e91692d270f4f668bd6ef79799a4186a38db172e37a18be9f203466e2d7c9cdf3a350c0020d25ff6126128085ebe3a3
26 +DIST swtpm-0.6.0.tar.gz 326049 BLAKE2B 52b310e4da1f256f440d9e0022cb6d5f5987b10aa85c8bf2837f5a5c61bc076f7d24d0a027987ef28ba0e7983a2fb04476103b88c33e3312536777366bf9b0cd SHA512 b12bb9cc486c50d0689a5655799c0d52f85d320a1d849fd56ee5c4b497472102c61b5d368f46a81e0b9feacc63b25b434bd6229f492951097af1e9c74a37cc96
27
28 diff --git a/app-crypt/swtpm/files/swtpm-0.6.0-fix-localca-path.patch b/app-crypt/swtpm/files/swtpm-0.6.0-fix-localca-path.patch
29 new file mode 100644
30 index 00000000000..ae47bd5a793
31 --- /dev/null
32 +++ b/app-crypt/swtpm/files/swtpm-0.6.0-fix-localca-path.patch
33 @@ -0,0 +1,31 @@
34 +diff --git a/samples/Makefile.am b/samples/Makefile.am
35 +index dcbc9b6..68c8adb 100644
36 +--- a/samples/Makefile.am
37 ++++ b/samples/Makefile.am
38 +@@ -48,10 +48,10 @@ swtpm_localca_CFLAGS = \
39 + $(GLIB_CFLAGS)
40 +
41 + install-data-local:
42 +- $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/swtpm-localca
43 ++ $(MKDIR_P) $(DESTDIR)$(localstatedir)/swtpm-localca
44 + if test -z $(DESTDIR); then \
45 +- chown -R @TSS_USER@:root $(DESTDIR)$(localstatedir)/lib/swtpm-localca || true; \
46 +- chmod 0750 $(DESTDIR)$(localstatedir)/lib/swtpm-localca || true; \
47 ++ chown -R @TSS_USER@:root $(DESTDIR)$(localstatedir)/swtpm-localca || true; \
48 ++ chmod 0750 $(DESTDIR)$(localstatedir)/swtpm-localca || true; \
49 + fi
50 +
51 + EXTRA_DIST= \
52 +diff --git a/samples/swtpm-localca.conf.in b/samples/swtpm-localca.conf.in
53 +index 1f0b48d..63f1fed 100644
54 +--- a/samples/swtpm-localca.conf.in
55 ++++ b/samples/swtpm-localca.conf.in
56 +@@ -1,4 +1,4 @@
57 +-statedir = @LOCALSTATEDIR@/lib/swtpm-localca
58 +-signingkey = @LOCALSTATEDIR@/lib/swtpm-localca/signkey.pem
59 +-issuercert = @LOCALSTATEDIR@/lib/swtpm-localca/issuercert.pem
60 +-certserial = @LOCALSTATEDIR@/lib/swtpm-localca/certserial
61 ++statedir = @LOCALSTATEDIR@/swtpm-localca
62 ++signingkey = @LOCALSTATEDIR@/swtpm-localca/signkey.pem
63 ++issuercert = @LOCALSTATEDIR@/swtpm-localca/issuercert.pem
64 ++certserial = @LOCALSTATEDIR@/swtpm-localca/certserial
65
66 diff --git a/app-crypt/swtpm/swtpm-0.6.0.ebuild b/app-crypt/swtpm/swtpm-0.6.0.ebuild
67 new file mode 100644
68 index 00000000000..822bb933b86
69 --- /dev/null
70 +++ b/app-crypt/swtpm/swtpm-0.6.0.ebuild
71 @@ -0,0 +1,69 @@
72 +# Copyright 1999-2021 Gentoo Authors
73 +# Distributed under the terms of the GNU General Public License v2
74 +
75 +EAPI=7
76 +
77 +PYTHON_COMPAT=( python3_{7,8,9} )
78 +
79 +inherit autotools python-single-r1
80 +
81 +DESCRIPTION="Libtpms-based TPM emulator"
82 +HOMEPAGE="https://github.com/stefanberger/swtpm"
83 +SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
84 +
85 +LICENSE="BSD"
86 +SLOT="0"
87 +KEYWORDS="~amd64"
88 +IUSE="fuse gnutls seccomp test"
89 +RESTRICT="!test? ( test )"
90 +
91 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
92 +
93 +RDEPEND="fuse? (
94 + dev-libs/glib:2
95 + sys-fs/fuse:0
96 + )
97 + gnutls? (
98 + dev-libs/libtasn1:=
99 + >=net-libs/gnutls-3.1.0[tools]
100 + )
101 + seccomp? ( sys-libs/libseccomp )
102 + test? (
103 + net-misc/socat
104 + dev-tcltk/expect
105 + )
106 + acct-group/tss
107 + acct-user/tss
108 + dev-libs/openssl:0=
109 + dev-libs/json-glib
110 + dev-libs/libtpms
111 + ${PYTHON_DEPS}"
112 +
113 +PATCHES=(
114 + "${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
115 + "${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
116 +)
117 +
118 +src_prepare() {
119 + use test || eapply "${FILESDIR}/${PN}-0.5.0-disable-test-dependencies.patch"
120 + default
121 + eautoreconf
122 +}
123 +
124 +src_configure() {
125 + econf \
126 + --disable-static \
127 + --with-openssl \
128 + --without-selinux \
129 + $(use_with fuse cuse) \
130 + $(use_with gnutls) \
131 + $(use_with seccomp)
132 +}
133 +
134 +src_install() {
135 + default
136 + fowners -R tss:root /var/lib/swtpm-localca
137 + fperms 750 /var/lib/swtpm-localca
138 + keepdir /var/lib/swtpm-localca
139 + find "${D}" -name '*.la' -delete || die
140 +}