Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/gnutls/
Date: Fri, 18 Sep 2020 10:30:28
Message-Id: 1600425004.5d7af8385b56e3b113c42f2f01db52d90bdb650f.polynomial-c@gentoo
1 commit: 5d7af8385b56e3b113c42f2f01db52d90bdb650f
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 18 10:11:07 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 18 10:30:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d7af838
7
8 net-libs/gnutls: Security cleanup
9
10 Bug: https://bugs.gentoo.org/740390
11 Package-Manager: Portage-3.0.7, Repoman-3.0.1
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 net-libs/gnutls/Manifest | 1 -
15 net-libs/gnutls/gnutls-3.6.14.ebuild | 132 -----------------------------------
16 2 files changed, 133 deletions(-)
17
18 diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
19 index 580a7c962dd..57fe6ac8d9f 100644
20 --- a/net-libs/gnutls/Manifest
21 +++ b/net-libs/gnutls/Manifest
22 @@ -1,2 +1 @@
23 -DIST gnutls-3.6.14.tar.xz 6069088 BLAKE2B a1cd88a7c977f3a94a49e4187878560a8d9589a6fd32d8ad41b84c33534597fb85a88cf6b260a4a5e8b1a100790a7ba701acac2368f1ad42dcaba7e5c90b6758 SHA512 b2d427b5542a4679117c011dffa8efb0e0bffa3ce9cebc319f8998d03f80f4168d08f9fda35df18dbeaaada59e479d325a6c1c77d5ca7f8ce221b44e42bfe604
24 DIST gnutls-3.6.15.tar.xz 6081656 BLAKE2B 6c52419037e41e817087a2577a6b73969cf065453ecf88e2f87152f544a177e4ad0ef825ae9dab243312e0223a953ab28e532bd2dbf96cb9498618415bc7f654 SHA512 f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c
25
26 diff --git a/net-libs/gnutls/gnutls-3.6.14.ebuild b/net-libs/gnutls/gnutls-3.6.14.ebuild
27 deleted file mode 100644
28 index 1969a839156..00000000000
29 --- a/net-libs/gnutls/gnutls-3.6.14.ebuild
30 +++ /dev/null
31 @@ -1,132 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -inherit libtool multilib-minimal
38 -
39 -DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
40 -HOMEPAGE="http://www.gnutls.org/"
41 -SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
42 -
43 -LICENSE="GPL-3 LGPL-2.1+"
44 -SLOT="0/30" # libgnutls.so number
45 -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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
46 -IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
47 -
48 -REQUIRED_USE="
49 - test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
50 -RESTRICT="!test? ( test )"
51 -
52 -# NOTICE: sys-devel/autogen is required at runtime as we
53 -# use system libopts
54 -RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
55 - dev-libs/libunistring:=[${MULTILIB_USEDEP}]
56 - >=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}]
57 - >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
58 - tools? ( sys-devel/autogen:= )
59 - dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
60 - guile? ( >=dev-scheme/guile-2:=[networking] )
61 - nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
62 - pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
63 - idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
64 -DEPEND="${RDEPEND}
65 - test? (
66 - seccomp? ( sys-libs/libseccomp )
67 - )"
68 -BDEPEND=">=virtual/pkgconfig-0-r1
69 - doc? ( dev-util/gtk-doc )
70 - nls? ( sys-devel/gettext )
71 - tools? ( sys-devel/autogen )
72 - valgrind? ( dev-util/valgrind )
73 - test-full? (
74 - app-crypt/dieharder
75 - >=app-misc/datefudge-1.22
76 - dev-libs/softhsm:2[-bindist]
77 - net-dialup/ppp
78 - net-misc/socat
79 - )"
80 -
81 -DOCS=(
82 - README.md
83 - doc/certtool.cfg
84 -)
85 -
86 -HTML_DOCS=()
87 -
88 -pkg_setup() {
89 - # bug#520818
90 - export TZ=UTC
91 -
92 - use doc && HTML_DOCS+=(
93 - doc/gnutls.html
94 - )
95 -}
96 -
97 -src_prepare() {
98 - default
99 -
100 - # force regeneration of autogen-ed files
101 - local file
102 - for file in $(grep -l AutoGen-ed src/*.c) ; do
103 - rm src/$(basename ${file} .c).{c,h} || die
104 - done
105 -
106 - # Use sane .so versioning on FreeBSD.
107 - elibtoolize
108 -}
109 -
110 -multilib_src_configure() {
111 - LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
112 -
113 - local libconf=()
114 -
115 - # TPM needs to be tested before being enabled
116 - libconf+=( --without-tpm )
117 -
118 - # hardware-accell is disabled on OSX because the asm files force
119 - # GNU-stack (as doesn't support that) and when that's removed ld
120 - # complains about duplicate symbols
121 - [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
122 -
123 - # Cygwin as does not understand these asm files at all
124 - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
125 -
126 - local myeconfargs=(
127 - $(multilib_native_enable manpages)
128 - $(multilib_native_use_enable doc gtk-doc)
129 - $(multilib_native_use_enable doc)
130 - $(multilib_native_use_enable guile)
131 - $(multilib_native_use_enable seccomp seccomp-tests)
132 - $(multilib_native_use_enable test tests)
133 - $(multilib_native_use_enable test-full full-test-suite)
134 - $(multilib_native_use_enable tools)
135 - $(multilib_native_use_enable valgrind valgrind-tests)
136 - $(use_enable cxx)
137 - $(use_enable dane libdane)
138 - $(use_enable nls)
139 - $(use_enable openssl openssl-compatibility)
140 - $(use_enable sslv2 ssl2-support)
141 - $(use_enable sslv3 ssl3-support)
142 - $(use_enable static-libs static)
143 - $(use_enable tls-heartbeat heartbeat-support)
144 - $(use_with idn)
145 - $(use_with pkcs11 p11-kit)
146 - --disable-rpath
147 - --with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
148 - --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt"
149 - --without-included-libtasn1
150 - $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
151 - )
152 - ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
153 -}
154 -
155 -multilib_src_install_all() {
156 - einstalldocs
157 - find "${ED}" -type f -name '*.la' -delete || die
158 -
159 - if use examples; then
160 - docinto examples
161 - dodoc doc/examples/*.c
162 - fi
163 -}