1 |
commit: 417a5098a4a58b89e7f54650156f09d38b5549d5 |
2 |
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jun 8 02:36:56 2021 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 26 03:41:10 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=417a5098 |
7 |
|
8 |
app-crypt/swtpm: Remove old |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/21154 |
11 |
Closes: https://bugs.gentoo.org/798696 |
12 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
13 |
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com> |
14 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
15 |
|
16 |
app-crypt/swtpm/Manifest | 1 - |
17 |
.../swtpm/files/swtpm-0.5.0-fix-localca-path.patch | 31 -------- |
18 |
app-crypt/swtpm/swtpm-0.5.2.ebuild | 86 ---------------------- |
19 |
3 files changed, 118 deletions(-) |
20 |
|
21 |
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest |
22 |
index 9405fc8ced4..bdcdcc6c203 100644 |
23 |
--- a/app-crypt/swtpm/Manifest |
24 |
+++ b/app-crypt/swtpm/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST swtpm-0.5.2.tar.gz 309436 BLAKE2B 0518e59b052c9224d5db1c2720f74ff15717468f73b1665e67c017581dd2b52d7a4cf28f94a932eb6068de3bc50f2e5710b8c447e4a08e6b4a31019db542d910 SHA512 4554f1b7a534829f9fbef4a09e190f1d5e91692d270f4f668bd6ef79799a4186a38db172e37a18be9f203466e2d7c9cdf3a350c0020d25ff6126128085ebe3a3 |
27 |
DIST swtpm-0.6.0.tar.gz 326049 BLAKE2B 52b310e4da1f256f440d9e0022cb6d5f5987b10aa85c8bf2837f5a5c61bc076f7d24d0a027987ef28ba0e7983a2fb04476103b88c33e3312536777366bf9b0cd SHA512 b12bb9cc486c50d0689a5655799c0d52f85d320a1d849fd56ee5c4b497472102c61b5d368f46a81e0b9feacc63b25b434bd6229f492951097af1e9c74a37cc96 |
28 |
|
29 |
diff --git a/app-crypt/swtpm/files/swtpm-0.5.0-fix-localca-path.patch b/app-crypt/swtpm/files/swtpm-0.5.0-fix-localca-path.patch |
30 |
deleted file mode 100644 |
31 |
index 27d29fc55ae..00000000000 |
32 |
--- a/app-crypt/swtpm/files/swtpm-0.5.0-fix-localca-path.patch |
33 |
+++ /dev/null |
34 |
@@ -1,31 +0,0 @@ |
35 |
-diff --git a/samples/Makefile.am b/samples/Makefile.am |
36 |
-index 7d69bf8..9fb8338 100644 |
37 |
---- a/samples/Makefile.am |
38 |
-+++ b/samples/Makefile.am |
39 |
-@@ -56,10 +56,10 @@ endif |
40 |
- |
41 |
- |
42 |
- install-data-local: |
43 |
-- $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/swtpm-localca |
44 |
-+ $(MKDIR_P) $(DESTDIR)$(localstatedir)/swtpm-localca |
45 |
- if test -z $(DESTDIR); then \ |
46 |
-- chown -R @TSS_USER@:root $(DESTDIR)$(localstatedir)/lib/swtpm-localca || true; \ |
47 |
-- chmod 0750 $(DESTDIR)$(localstatedir)/lib/swtpm-localca || true; \ |
48 |
-+ chown -R @TSS_USER@:root $(DESTDIR)$(localstatedir)/swtpm-localca || true; \ |
49 |
-+ chmod 0750 $(DESTDIR)$(localstatedir)/swtpm-localca || true; \ |
50 |
- fi |
51 |
- |
52 |
- # for out-of-tree builds we need to clean up |
53 |
-diff --git a/samples/swtpm-localca.conf.in b/samples/swtpm-localca.conf.in |
54 |
-index 1f0b48d..63f1fed 100644 |
55 |
---- a/samples/swtpm-localca.conf.in |
56 |
-+++ b/samples/swtpm-localca.conf.in |
57 |
-@@ -1,4 +1,4 @@ |
58 |
--statedir = @LOCALSTATEDIR@/lib/swtpm-localca |
59 |
--signingkey = @LOCALSTATEDIR@/lib/swtpm-localca/signkey.pem |
60 |
--issuercert = @LOCALSTATEDIR@/lib/swtpm-localca/issuercert.pem |
61 |
--certserial = @LOCALSTATEDIR@/lib/swtpm-localca/certserial |
62 |
-+statedir = @LOCALSTATEDIR@/swtpm-localca |
63 |
-+signingkey = @LOCALSTATEDIR@/swtpm-localca/signkey.pem |
64 |
-+issuercert = @LOCALSTATEDIR@/swtpm-localca/issuercert.pem |
65 |
-+certserial = @LOCALSTATEDIR@/swtpm-localca/certserial |
66 |
|
67 |
diff --git a/app-crypt/swtpm/swtpm-0.5.2.ebuild b/app-crypt/swtpm/swtpm-0.5.2.ebuild |
68 |
deleted file mode 100644 |
69 |
index 0042a1df1f8..00000000000 |
70 |
--- a/app-crypt/swtpm/swtpm-0.5.2.ebuild |
71 |
+++ /dev/null |
72 |
@@ -1,86 +0,0 @@ |
73 |
-# Copyright 1999-2021 Gentoo Authors |
74 |
-# Distributed under the terms of the GNU General Public License v2 |
75 |
- |
76 |
-EAPI=7 |
77 |
- |
78 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
79 |
- |
80 |
-inherit autotools distutils-r1 |
81 |
- |
82 |
-DESCRIPTION="Libtpms-based TPM emulator" |
83 |
-HOMEPAGE="https://github.com/stefanberger/swtpm" |
84 |
-SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
85 |
- |
86 |
-LICENSE="BSD" |
87 |
-SLOT="0" |
88 |
-KEYWORDS="~amd64" |
89 |
-IUSE="fuse gnutls seccomp test" |
90 |
-RESTRICT="!test? ( test )" |
91 |
- |
92 |
-COMMON_DEPEND=" |
93 |
- 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 |
- dev-libs/openssl:0= |
102 |
- dev-libs/libtpms |
103 |
- seccomp? ( sys-libs/libseccomp ) |
104 |
-" |
105 |
- |
106 |
-DEPEND="${COMMON_DEPEND} |
107 |
- test? ( |
108 |
- net-misc/socat |
109 |
- dev-tcltk/expect |
110 |
- ) |
111 |
-" |
112 |
- |
113 |
-RDEPEND="${COMMON_DEPEND} |
114 |
- acct-group/tss |
115 |
- acct-user/tss |
116 |
- dev-python/cryptography[${PYTHON_USEDEP}] |
117 |
-" |
118 |
- |
119 |
-PATCHES=( |
120 |
- "${FILESDIR}/${PN}-0.5.0-fix-localca-path.patch" |
121 |
- "${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch" |
122 |
-) |
123 |
- |
124 |
-src_prepare() { |
125 |
- use test || eapply "${FILESDIR}/${PN}-0.5.0-disable-test-dependencies.patch" |
126 |
- python_setup |
127 |
- default |
128 |
- eautoreconf |
129 |
-} |
130 |
- |
131 |
-src_configure() { |
132 |
- econf \ |
133 |
- --disable-static \ |
134 |
- --with-openssl \ |
135 |
- --without-selinux \ |
136 |
- $(use_with fuse cuse) \ |
137 |
- $(use_with gnutls) \ |
138 |
- $(use_with seccomp) |
139 |
-} |
140 |
- |
141 |
-src_compile() { |
142 |
- # We want the default src_compile, not the version distutils-r1 exports |
143 |
- default |
144 |
-} |
145 |
- |
146 |
-src_install() { |
147 |
- default |
148 |
- python_foreach_impl python_optimize |
149 |
- fowners -R tss:root /var/lib/swtpm-localca |
150 |
- fperms 750 /var/lib/swtpm-localca |
151 |
- keepdir /var/lib/swtpm-localca |
152 |
- find "${D}" -name '*.la' -delete || die |
153 |
-} |
154 |
- |
155 |
-src_test() { |
156 |
- # We want the default src_test, not the version distutils-r1 exports |
157 |
- default |
158 |
-} |