1 |
commit: 7ac241549034d7ca490acb1ea8321daf25b4fd21 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 14 04:03:23 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 14 21:22:25 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ac24154 |
7 |
|
8 |
net-libs/gnutls: drop 3.7.4 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
net-libs/gnutls/Manifest | 2 - |
13 |
.../files/gnutls-3.7.4-configure-compression.patch | 63 --------- |
14 |
net-libs/gnutls/gnutls-3.7.4.ebuild | 153 --------------------- |
15 |
3 files changed, 218 deletions(-) |
16 |
|
17 |
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest |
18 |
index b80bc56323a2..cdc465872bb4 100644 |
19 |
--- a/net-libs/gnutls/Manifest |
20 |
+++ b/net-libs/gnutls/Manifest |
21 |
@@ -1,6 +1,4 @@ |
22 |
DIST gnutls-3.7.2.tar.xz 6091508 BLAKE2B f408ff65f2e08cf294b449dfac64a272a8ba40e987618960f57ee36c167a25974711ab8d11bdbd6335fbf18ac902a79b5c6b40bb6a37f4ee07549832d0611df2 SHA512 5d01d561a05379da71e4847e30ba13c2abe09f7a5c4359fd539d8bd19abad0ce87120f82ee7b6264e787bd3edbc5ae16beffa892983cbc3d59f11a1811c10329 |
23 |
DIST gnutls-3.7.3.tar.xz 6119292 BLAKE2B 811e6fbb62fbd35fa63e66cfcbfc3bf899cea5cece1d2a68bc650f507df0f7be9f59c707c90fa19b7ef5a52455a663da49682704e0884af06075c566afbfc0bf SHA512 3ace744affe23e284342658d6d2d2de49dd50065489cbc8be18fc7d38187253e5268ca54027ce5cd517056c249ac039a7481e4548cec04325de37ae85617d077 |
24 |
-DIST gnutls-3.7.4.tar.xz 6131772 BLAKE2B 1c44528952275f48e4e458558c4e03c5b90dfb267482d6815f6c836f9530abb486a23ae5ea70ba2db7e272eee8e2066b259374f02a9bb9e714487466fd5994c9 SHA512 38b488ca1223d9aa8fc25756df08db6f29aaf76fb5816fdeaa14bd89fb431a2e1c495fefc64094f726337d5b89e198146ec7dc22e9a1bca6841a9d881b0d99e6 |
25 |
-DIST gnutls-3.7.4.tar.xz.sig 685 BLAKE2B ad485450abb916a229984f8f0d74fe7c46a0a87627f9d739f8121dccf36f4ca454007178f2a4e9bd5fffa2813363481bf80eaeee40f86e1b9c23b1f25dff7b4c SHA512 74b8badd67e215313583bd25c7b639207860af45d6f5cbcb81f1aaf46dacf0992b6d06876979594688e13dac5b8b27ba39935626374b4ddaa3e48118bbc2e7de |
26 |
DIST gnutls-3.7.5.tar.xz 6321392 BLAKE2B e7b2da643dc8d5160d1872655ed6771b89587d62132eccfe0b7ce0cc9e81daa27b3608608df3301787d89148a27d321266ac52c1fde06afd2e821575e8805403 SHA512 2e4898e6aeff4f82abd48e6a442f5c9ebe4ecaeb0c038b76e2da8e468f6a7ae37fef5e8de17d90346f29aa0b56a08abf67fe8b81ba09dcf4612cc3b97b830bec |
27 |
DIST gnutls-3.7.5.tar.xz.sig 685 BLAKE2B 0a7fdeae9b10382e962c5ea7b49fbb2c0829203bded123597b7718b0cd9483204498a05556da82518f40a4775c90a9b275afdbb4d6a65e7a9396bd0c40ca522a SHA512 1110b859299d13c5121f9c68d6faf099a62b13500cd1c994ac6dea49d69c29a351fd4de42bb66fe01d2e6feef9c3fbd344e8eec0a409c804699d3f7956fe28ff |
28 |
|
29 |
diff --git a/net-libs/gnutls/files/gnutls-3.7.4-configure-compression.patch b/net-libs/gnutls/files/gnutls-3.7.4-configure-compression.patch |
30 |
deleted file mode 100644 |
31 |
index edd688d9b58a..000000000000 |
32 |
--- a/net-libs/gnutls/files/gnutls-3.7.4-configure-compression.patch |
33 |
+++ /dev/null |
34 |
@@ -1,63 +0,0 @@ |
35 |
-https://gitlab.com/gnutls/gnutls/-/merge_requests/1557 |
36 |
- |
37 |
-From: Sam James <sam@g.o> |
38 |
-Date: Fri, 18 Mar 2022 05:40:28 +0000 |
39 |
-Subject: [PATCH 1/2] configure.ac: fix brotli/zstd configure argument name |
40 |
- |
41 |
-The old `./configure` arguments for brotli and zstd respectively |
42 |
-were inconsistent with the `./configure --help` output. |
43 |
- |
44 |
-Old: --without-libbrotli --without-libzstd (also --with-*) |
45 |
-New: --without-brotli --without-zstd (also --with-*) |
46 |
- |
47 |
-Fixes: https://gitlab.com/gnutls/gnutls/-/issues/1342 |
48 |
-Signed-off-by: Sam James <sam@g.o> |
49 |
---- a/configure.ac |
50 |
-+++ b/configure.ac |
51 |
-@@ -1010,7 +1010,7 @@ if test x$ac_zlib != xno; then |
52 |
- fi |
53 |
- AC_SUBST(LIBZ_PC) |
54 |
- |
55 |
--AC_ARG_WITH(libbrotli, |
56 |
-+AC_ARG_WITH(brotli, |
57 |
- AS_HELP_STRING([--without-brotli], [disable brotli compression support]), |
58 |
- ac_brotli=$withval, ac_brotli=yes) |
59 |
- AC_MSG_CHECKING([whether to include brotli compression support]) |
60 |
-@@ -1033,7 +1033,7 @@ else |
61 |
- fi |
62 |
- AM_CONDITIONAL(HAVE_LIBBROTLI, test "$with_libbrotlienc" != "no" && test "$with_libbrotlidec" != "no") |
63 |
- |
64 |
--AC_ARG_WITH(libzstd, |
65 |
-+AC_ARG_WITH(zstd, |
66 |
- AS_HELP_STRING([--without-zstd], [disable zstd compression support]), |
67 |
- ac_zstd=$withval, ac_zstd=yes) |
68 |
- AC_MSG_CHECKING([whether to include zstd compression support]) |
69 |
-GitLab |
70 |
- |
71 |
-From: Sam James <sam@g.o> |
72 |
-Date: Fri, 18 Mar 2022 05:51:29 +0000 |
73 |
-Subject: [PATCH 2/2] configure.ac: fix zstd detection |
74 |
- |
75 |
-Fixes typo in zstd detection. |
76 |
- |
77 |
-None of the used autoconf macros will define `has_zstd_h` so |
78 |
-configure will (AFAICT) always fail to find zstd, even if it succeeded |
79 |
-via pkg-config moments before. |
80 |
- |
81 |
-Drop it and rely solely on pkg-config as that's the only search |
82 |
-we're actually doing. |
83 |
- |
84 |
-Fixes: https://gitlab.com/gnutls/gnutls/-/issues/1343 |
85 |
-Signed-off-by: Sam James <sam@g.o> |
86 |
---- a/configure.ac |
87 |
-+++ b/configure.ac |
88 |
-@@ -1040,7 +1040,7 @@ AC_MSG_CHECKING([whether to include zstd compression support]) |
89 |
- if test x$ac_zstd != xno; then |
90 |
- AC_MSG_RESULT(yes) |
91 |
- PKG_CHECK_MODULES(LIBZSTD, [libzstd >= 1.3.0], [with_libzstd=yes], [with_libzstd=no]) |
92 |
-- if test "${with_libzstd}" = "yes" && test "${has_zstd_h}" = "yes"; then |
93 |
-+ if test "${with_libzstd}" = "yes"; then |
94 |
- AC_DEFINE([HAVE_LIBZSTD], 1, [Define if ZSTD compression is enabled.]) |
95 |
- if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then |
96 |
- GNUTLS_REQUIRES_PRIVATE="Requires.private: libzstd" |
97 |
-GitLab |
98 |
|
99 |
diff --git a/net-libs/gnutls/gnutls-3.7.4.ebuild b/net-libs/gnutls/gnutls-3.7.4.ebuild |
100 |
deleted file mode 100644 |
101 |
index 6eaf9997a965..000000000000 |
102 |
--- a/net-libs/gnutls/gnutls-3.7.4.ebuild |
103 |
+++ /dev/null |
104 |
@@ -1,153 +0,0 @@ |
105 |
-# Copyright 1999-2022 Gentoo Authors |
106 |
-# Distributed under the terms of the GNU General Public License v2 |
107 |
- |
108 |
-EAPI=7 |
109 |
- |
110 |
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnutls.asc |
111 |
-inherit autotools multilib-minimal verify-sig |
112 |
- |
113 |
-DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols" |
114 |
-HOMEPAGE="https://www.gnutls.org/" |
115 |
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" |
116 |
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )" |
117 |
- |
118 |
-LICENSE="GPL-3 LGPL-2.1+" |
119 |
-SLOT="0/30" # libgnutls.so number |
120 |
-# Drop keywords while figuring out what to do (if anything) about USE=cxx ABI break |
121 |
-# https://gitlab.com/gnutls/gnutls/-/commit/f746f7d4be0070395834bef8e7f7b6f9c8d3158b |
122 |
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
123 |
-IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib zstd" |
124 |
- |
125 |
-REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )" |
126 |
-RESTRICT="!test? ( test )" |
127 |
- |
128 |
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] |
129 |
- dev-libs/libunistring:=[${MULTILIB_USEDEP}] |
130 |
- >=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}] |
131 |
- >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] |
132 |
- brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] ) |
133 |
- dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) |
134 |
- guile? ( >=dev-scheme/guile-2:=[networking] ) |
135 |
- nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) |
136 |
- pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) |
137 |
- idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] ) |
138 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) |
139 |
- zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] )" |
140 |
-DEPEND="${RDEPEND} |
141 |
- test? ( |
142 |
- seccomp? ( sys-libs/libseccomp ) |
143 |
- )" |
144 |
-BDEPEND=" |
145 |
- dev-util/gtk-doc-am |
146 |
- >=virtual/pkgconfig-0-r1 |
147 |
- doc? ( dev-util/gtk-doc ) |
148 |
- nls? ( sys-devel/gettext ) |
149 |
- valgrind? ( dev-util/valgrind ) |
150 |
- test-full? ( |
151 |
- app-crypt/dieharder |
152 |
- >=app-misc/datefudge-1.22 |
153 |
- dev-libs/softhsm:2[-bindist(-)] |
154 |
- net-dialup/ppp |
155 |
- net-misc/socat |
156 |
- ) |
157 |
- verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20220320 )" |
158 |
- |
159 |
-DOCS=( README.md doc/certtool.cfg ) |
160 |
- |
161 |
-HTML_DOCS=() |
162 |
- |
163 |
-PATCHES=( |
164 |
- "${FILESDIR}"/${P}-configure-compression.patch |
165 |
-) |
166 |
- |
167 |
-pkg_setup() { |
168 |
- # bug #520818 |
169 |
- export TZ=UTC |
170 |
- |
171 |
- use doc && HTML_DOCS+=( |
172 |
- doc/gnutls.html |
173 |
- ) |
174 |
-} |
175 |
- |
176 |
-src_prepare() { |
177 |
- default |
178 |
- |
179 |
- # don't try to use system certificate store on macOS, it is |
180 |
- # confusingly ignoring our ca-certificates and more importantly |
181 |
- # fails to compile in certain configurations |
182 |
- sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die |
183 |
- |
184 |
- # Use sane .so versioning on FreeBSD. |
185 |
- #elibtoolize |
186 |
- |
187 |
- # Need eautoreconf for: |
188 |
- # 1) gtk-doc macro fix |
189 |
- # (once fixed, we can drop unconditional gtk-doc-am BDEPEND too) |
190 |
- # see https://gitlab.com/gnutls/gnutls/-/issues/1341 |
191 |
- # |
192 |
- # 2) configure fixes for brotli, zstd |
193 |
- # see https://gitlab.com/gnutls/gnutls/-/issues/1343 |
194 |
- eautoreconf |
195 |
-} |
196 |
- |
197 |
-multilib_src_configure() { |
198 |
- LINGUAS="${LINGUAS//en/en@boldquot en@quot}" |
199 |
- |
200 |
- local libconf=() |
201 |
- |
202 |
- # TPM needs to be tested before being enabled |
203 |
- # Note that this may add a libltdl dep when enabled. Check configure.ac. |
204 |
- libconf+=( |
205 |
- --without-tpm |
206 |
- --without-tpm2 |
207 |
- ) |
208 |
- |
209 |
- # hardware-accel is disabled on OSX because the asm files force |
210 |
- # GNU-stack (as doesn't support that) and when that's removed ld |
211 |
- # complains about duplicate symbols |
212 |
- [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) |
213 |
- |
214 |
- # Cygwin as does not understand these asm files at all |
215 |
- [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) |
216 |
- |
217 |
- local myeconfargs=( |
218 |
- $(multilib_native_enable manpages) |
219 |
- $(multilib_native_use_enable doc gtk-doc) |
220 |
- $(multilib_native_use_enable doc) |
221 |
- $(multilib_native_use_enable guile) |
222 |
- $(multilib_native_use_enable seccomp seccomp-tests) |
223 |
- $(multilib_native_use_enable test tests) |
224 |
- $(multilib_native_use_enable test-full full-test-suite) |
225 |
- $(multilib_native_use_enable tools) |
226 |
- $(multilib_native_use_enable valgrind valgrind-tests) |
227 |
- $(use_enable cxx) |
228 |
- $(use_enable dane libdane) |
229 |
- $(use_enable nls) |
230 |
- $(use_enable openssl openssl-compatibility) |
231 |
- $(use_enable sslv2 ssl2-support) |
232 |
- $(use_enable sslv3 ssl3-support) |
233 |
- $(use_enable static-libs static) |
234 |
- $(use_enable tls-heartbeat heartbeat-support) |
235 |
- $(use_with brotli) |
236 |
- $(use_with idn) |
237 |
- $(use_with pkcs11 p11-kit) |
238 |
- $(use_with zlib) |
239 |
- $(use_with zstd) |
240 |
- --disable-rpath |
241 |
- --with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt |
242 |
- --with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt |
243 |
- --without-included-libtasn1 |
244 |
- $("${S}/configure" --help | grep -o -- '--without-.*-prefix') |
245 |
- ) |
246 |
- ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}" |
247 |
-} |
248 |
- |
249 |
-multilib_src_install_all() { |
250 |
- einstalldocs |
251 |
- find "${ED}" -type f -name '*.la' -delete || die |
252 |
- |
253 |
- if use examples; then |
254 |
- docinto examples |
255 |
- dodoc doc/examples/*.c |
256 |
- fi |
257 |
-} |