Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/files/, app-crypt/p11-kit/
Date: Tue, 25 Feb 2020 11:45:28
Message-Id: 1582631121.76d756918124ac019e8d1a801a082e9fdcc252b0.zlogene@gentoo
1 commit: 76d756918124ac019e8d1a801a082e9fdcc252b0
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 25 11:45:04 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 25 11:45:21 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76d75691
7
8 app-crypt/p11-kit: Drop old
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 app-crypt/p11-kit/Manifest | 2 -
14 .../p11-kit/files/p11-kit-0.23.12-mktime.patch | 26 ---------
15 app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild | 64 ----------------------
16 app-crypt/p11-kit/p11-kit-0.23.18.1.ebuild | 60 --------------------
17 4 files changed, 152 deletions(-)
18
19 diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
20 index 426b269a7dc..fe72990c699 100644
21 --- a/app-crypt/p11-kit/Manifest
22 +++ b/app-crypt/p11-kit/Manifest
23 @@ -1,4 +1,2 @@
24 -DIST p11-kit-0.23.16.1.tar.gz 1292783 BLAKE2B 60be56656156c86d6f0f3285bd691ed85ec1a992e8a789f0f21f9ada172a8cab0581cc42f89c3079a1bd7b3493f0d38cd952711fda50c2e80bf96e94fcd9ff87 SHA512 7d0bbd793b43dba081054b4d022a8dbd1d477a3bd6aced72a641087023cf020f1d898899a08e737880e6c810f924814c62497c5ecb19f8322cde42667426a9a7
25 -DIST p11-kit-0.23.18.1.tar.gz 1305755 BLAKE2B 6d453fad0f4b42e3ae583e76bd206377fd30dd32d98dda94ba3b2fe505cde4c3e05410e685ebe9e8e2f6cae7da3cbd2b78203cae64b8c000b1a2f2ec2a902c4c SHA512 941996aea75025dad5dfc6f9b4609bc92bc0888d5b2b58de0d498d6cf75d059421405d9c3bad51122108b6ad1e41e434609ead23404efe635cdb806836ccadbd
26 DIST p11-kit-0.23.19.tar.xz 822652 BLAKE2B c1750e2d0b8ebdfcf70695259401a029b2d5739d8222c37f128f94f8a4313321956e120dcba5c7cb882d16e1a6b12398f9dfa88ef601e826f0dfec5acbf438c8 SHA512 1a7feb2c14381f2ca87386b6a81f46cfb27ccce70ad87a2fc86726e2827b49971958e40c4fc54df01df7570d82058afe82d21c5b3c59fb8310aa641d3b370da2
27 DIST p11-kit-0.23.20.tar.xz 822588 BLAKE2B adda58acc121d38d3520d20daf8f59c3c46f81afe807d9277fae70e836d194d08cfea0405d2186d548ea91be56eee63d576a318c330fa844a0cf1889960db384 SHA512 1eb88773fdd49dd48c7e089744e9dbbf6c1033a4863f3bfe75a68d842804baa3c373cb1b28ee625dd69a6e16c89df4ac755e0928495dccf38c007c530f6cfa57
28
29 diff --git a/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch b/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch
30 deleted file mode 100644
31 index 7cc0baada97..00000000000
32 --- a/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch
33 +++ /dev/null
34 @@ -1,26 +0,0 @@
35 -From 3d009fda4cb39157d6876e7d16cbc57f7b59bc86 Mon Sep 17 00:00:00 2001
36 -From: Alon Bar-Lev <alon.barlev@×××××.com>
37 -Date: Mon, 1 Jul 2019 13:38:25 +0300
38 -Subject: [PATCH] trust: do not allow daylight to invalidate date validation
39 -
40 -Issue: 235
41 -Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com>
42 ----
43 - trust/builder.c | 1 +
44 - 1 file changed, 1 insertion(+)
45 -
46 -diff --git a/trust/builder.c b/trust/builder.c
47 -index d819dc8..2fc0c40 100644
48 ---- a/trust/builder.c
49 -+++ b/trust/builder.c
50 -@@ -261,6 +261,7 @@ type_date (p11_builder *builder,
51 - return false;
52 -
53 - memcpy (&two, &tm, sizeof (tm));
54 -+ two.tm_isdst = -1; // do not perform tz fixup
55 - if (mktime (&two) < 0)
56 - return false;
57 -
58 ---
59 -2.21.0
60 -
61
62 diff --git a/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
63 deleted file mode 100644
64 index 3b3fbdb534d..00000000000
65 --- a/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
66 +++ /dev/null
67 @@ -1,64 +0,0 @@
68 -# Copyright 1999-2020 Gentoo Authors
69 -# Distributed under the terms of the GNU General Public License v2
70 -
71 -EAPI=7
72 -
73 -inherit multilib-minimal
74 -
75 -DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
76 -HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
77 -SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
78 -
79 -LICENSE="MIT"
80 -SLOT="0"
81 -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
82 -IUSE="+asn1 debug +libffi +trust"
83 -REQUIRED_USE="trust? ( asn1 )"
84 -
85 -RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
86 - libffi? ( >=virtual/libffi-3.0.0:=[${MULTILIB_USEDEP}] )
87 - trust? ( app-misc/ca-certificates )"
88 -DEPEND="${RDEPEND}"
89 -BDEPEND="virtual/pkgconfig"
90 -
91 -PATCHES=(
92 - "${FILESDIR}/${PN}-0.23.12-mktime.patch"
93 -)
94 -
95 -pkg_setup() {
96 - # disable unsafe tests, bug#502088
97 - export FAKED_MODE=1
98 -}
99 -
100 -src_prepare() {
101 - if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
102 - # Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
103 - # drop to XPG6 to make feature_tests.h happy
104 - sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
105 - # paths.h isn't available, oddly enough also not used albeit included
106 - sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
107 - # we don't have SUN_LEN here
108 - sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
109 - p11-kit/server.c || die
110 - fi
111 - default
112 -}
113 -
114 -multilib_src_configure() {
115 - ECONF_SOURCE="${S}" econf \
116 - $(use_enable trust trust-module) \
117 - $(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
118 - $(use_enable debug) \
119 - $(use_with libffi) \
120 - $(use_with asn1 libtasn1)
121 -
122 - if multilib_is_native_abi; then
123 - # re-use provided documentation
124 - ln -s "${S}"/doc/manual/html doc/manual/html || die
125 - fi
126 -}
127 -
128 -multilib_src_install_all() {
129 - einstalldocs
130 - find "${D}" -name '*.la' -delete || die
131 -}
132
133 diff --git a/app-crypt/p11-kit/p11-kit-0.23.18.1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.18.1.ebuild
134 deleted file mode 100644
135 index 3a5ba72d93a..00000000000
136 --- a/app-crypt/p11-kit/p11-kit-0.23.18.1.ebuild
137 +++ /dev/null
138 @@ -1,60 +0,0 @@
139 -# Copyright 1999-2020 Gentoo Authors
140 -# Distributed under the terms of the GNU General Public License v2
141 -
142 -EAPI=7
143 -
144 -inherit multilib-minimal
145 -
146 -DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
147 -HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
148 -SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
149 -
150 -LICENSE="MIT"
151 -SLOT="0"
152 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
153 -IUSE="+asn1 debug +libffi +trust"
154 -REQUIRED_USE="trust? ( asn1 )"
155 -
156 -RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
157 - libffi? ( >=virtual/libffi-3.0.0:=[${MULTILIB_USEDEP}] )
158 - trust? ( app-misc/ca-certificates )"
159 -DEPEND="${RDEPEND}"
160 -BDEPEND="virtual/pkgconfig"
161 -
162 -pkg_setup() {
163 - # disable unsafe tests, bug#502088
164 - export FAKED_MODE=1
165 -}
166 -
167 -src_prepare() {
168 - if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
169 - # Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
170 - # drop to XPG6 to make feature_tests.h happy
171 - sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
172 - # paths.h isn't available, oddly enough also not used albeit included
173 - sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
174 - # we don't have SUN_LEN here
175 - sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
176 - p11-kit/server.c || die
177 - fi
178 - default
179 -}
180 -
181 -multilib_src_configure() {
182 - ECONF_SOURCE="${S}" econf \
183 - $(use_enable trust trust-module) \
184 - $(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
185 - $(use_enable debug) \
186 - $(use_with libffi) \
187 - $(use_with asn1 libtasn1)
188 -
189 - if multilib_is_native_abi; then
190 - # re-use provided documentation
191 - ln -s "${S}"/doc/manual/html doc/manual/html || die
192 - fi
193 -}
194 -
195 -multilib_src_install_all() {
196 - einstalldocs
197 - find "${D}" -name '*.la' -delete || die
198 -}