From afdfa05c5ce824f49340d033a80cdee422ac264a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 8 Aug 2023 09:27:00 +0100 Subject: gentoo auto-resync : 08:08:2023 - 09:27:00 --- net-libs/Manifest.gz | Bin 32620 -> 32620 bytes net-libs/gnutls/Manifest | 3 +- .../files/gnutls-3.8.1-fix-gnutls-header.patch | 46 +++++++ net-libs/gnutls/gnutls-3.8.1-r1.ebuild | 146 +++++++++++++++++++++ net-libs/gnutls/gnutls-3.8.1.ebuild | 142 -------------------- 5 files changed, 194 insertions(+), 143 deletions(-) create mode 100644 net-libs/gnutls/files/gnutls-3.8.1-fix-gnutls-header.patch create mode 100644 net-libs/gnutls/gnutls-3.8.1-r1.ebuild delete mode 100644 net-libs/gnutls/gnutls-3.8.1.ebuild (limited to 'net-libs') diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz index 49361d5ad13f..d8c680799d70 100644 Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest index cd0a649188be..6bbd0f5072be 100644 --- a/net-libs/gnutls/Manifest +++ b/net-libs/gnutls/Manifest @@ -1,3 +1,4 @@ +AUX gnutls-3.8.1-fix-gnutls-header.patch 1432 BLAKE2B 019f3e720c3f4f72cbb022fcef53b6a0ab1ea41fcd9080bd2d4ea0cc8ef786250c869245cc71605364a0b899c1e9b6f136a53d3246ab991827750572017d0e40 SHA512 a763fffcd8abc828a194e1cc4162231992e5c961a693bf314c5fb8cdf338a9cca062c0113ba7a1cd81f6560adb9a1f9de131551d94c4805978abc50fabaec245 DIST gnutls-3.7.6.tar.xz 6338276 BLAKE2B 9f3cce8dfc0b88f2c42d1d2633417dac649a265407b620b6d15967e5210debb99d287ef31d2b9dc37a527ac1e5b9db4c240b98a63293078fbd2e26ac694bf3d3 SHA512 f872339df80ec31d292821ff00eaafbe50e0bd4cdbb86e21e4f78541cd0a26d843596d5e69c91de4db8ce7d027fc639ae6462b57d89fb116162ae63c5a97486a DIST gnutls-3.7.6.tar.xz.sig 685 BLAKE2B eae022d6cb0d772e465257411381afd97f3dfd19d6f794a1c3e0f8c3c1232a8a1b91269ca7252a5662782183b11ca393c31efe3f88171a526884400fd0534528 SHA512 c969da9a938b9d29a70cea3b00cce337f9a4c4304aae7f501ef6263894f81a420395ddbe1b005f35dff2e900d3fac75e288f10bbfde0ebea034f7e257bb16d0e DIST gnutls-3.7.7.tar.xz 6351664 BLAKE2B a66037ecc6da660ff12949f50012840263c2e0b174079e41b62a2d884f060cee56f0c64a2815d07321a54b08cce016d2b4c8f0e059636c1ab5f7db9c8d64c7c6 SHA512 ba00b20126379ec7e96c6bfa606cfb7bb0d9a5853318b29b5278a42a85ae40d39d8442778938e1f165debcdb1adaf9c63bcec59a4eb3387dd1ac99b08bcc5c08 @@ -15,5 +16,5 @@ EBUILD gnutls-3.7.7.ebuild 4519 BLAKE2B 6746f8fd62cd038e3667b6e820fec62479262a3c EBUILD gnutls-3.7.8.ebuild 4519 BLAKE2B 69a26e7a39719ce26e616c7c89b95d0f76771cc6f65be592495d6860286bb755217c2837acab47551ef5b072e8e29ce56610ceb43fff99974fab4b82bee2fa86 SHA512 1807038baaff74f64b2f91fea3ecfddfd75eebedc533d6da9d957a8f214a8c7975e43ae4ffb89630190189a10a838fffed84bf2069c72a5f2204450059956aa1 EBUILD gnutls-3.7.9.ebuild 4527 BLAKE2B 291b7a1865c31d80b464b8f3fe9576936ad4640a38b280aa08d0cd09cc0182aa62d160f3265cd9d621f9d2570ebe035d8d095e9512ed42d9ec1f4ebc13cf98cf SHA512 fc683ba6d8be45cbf78fb93c2fb2a7a81453e6b71f31130c64fba4342bd4d845b55e2cef4cef4b44cb3e31a525455b3c4196284e3ef43ff04ffca421022a2513 EBUILD gnutls-3.8.0.ebuild 4579 BLAKE2B 38703cb29df6f33be0c563e9aaf486b5702d1d3f6f82413780d6075cba021b80d099562cb74c8e3320f9965bff1faabe2f8ad0e8bdeda6c3b5d870adb4d0e961 SHA512 3a41cb2e4cb06ce959282c1b78d823dd3b827eb9e589286ef4d8d234ca31ad5ca1d38200344ed1a4d1b0d533aa89fd5fa59dcc06d0d4c900ba5151c3d9928dd3 -EBUILD gnutls-3.8.1.ebuild 4619 BLAKE2B 587a7ec65ecc5b341ba37dbad8ca48d01443808ce65637ef8b48b671c8bf21e5191e904c780351ee2314eb0872c3a7ef1ec06ab6329f0b04d8038aa2915847e0 SHA512 769e50085cbf19686da13c8d9de9abc8a788dd5f6448726cb777cc90694cf1516dfb9a9e110e077a9bc164a0fb9af794ab224988f308dee896624e37d0f63f14 +EBUILD gnutls-3.8.1-r1.ebuild 4676 BLAKE2B 580b5fe63a3e9375c57c95fd9096a5f7e3367e85b759e8d8a1b646dd0c4363e0ebccafb8c684414110c814835e2903bc69f5643d11060fae5acf19b15ade2321 SHA512 5014cd6cc667e39208728e74d8cc76c23909d1c5a97d4afe2471b035764def78611b244b7b9167f3428174e9cbc162615f0786ab87258240f2c5cc5140269462 MISC metadata.xml 1244 BLAKE2B eff214451ce68366e577291a22efabdf2c3788ee1d5b75ca6517f2731704d0dd4c01b7cbe1668629643f8c8e534889c671ee2acaa22179354975ab26e7529a91 SHA512 f9ea9d08a2559482592c20e5badde333f2aee4927c047ee9cb0534c8243b54d32ec0db61ba4cac80d7fe5bbd735caa242afbccb10a6a5a6df46a2c81855681a7 diff --git a/net-libs/gnutls/files/gnutls-3.8.1-fix-gnutls-header.patch b/net-libs/gnutls/files/gnutls-3.8.1-fix-gnutls-header.patch new file mode 100644 index 000000000000..b3d10c1788f6 --- /dev/null +++ b/net-libs/gnutls/files/gnutls-3.8.1-fix-gnutls-header.patch @@ -0,0 +1,46 @@ +https://bugs.gentoo.org/911872 +https://gitlab.com/gnutls/gnutls/-/commit/abfa8634db940115a11a07596ce53c8f9c4f87d2 + +From abfa8634db940115a11a07596ce53c8f9c4f87d2 Mon Sep 17 00:00:00 2001 +From: Adrian Bunk +Date: Sun, 6 Aug 2023 22:46:22 +0300 +Subject: [PATCH] Move the GNUTLS_NO_EXTENSIONS compatibility #define to + gnutls.h + +Signed-off-by: Adrian Bunk +--- a/lib/ext/ext_master_secret.h ++++ b/lib/ext/ext_master_secret.h +@@ -23,9 +23,6 @@ + #ifndef GNUTLS_LIB_EXT_EXT_MASTER_SECRET_H + #define GNUTLS_LIB_EXT_EXT_MASTER_SECRET_H + +-/* Keep backward compatibility */ +-#define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS +- + #include + + extern const hello_ext_entry_st ext_mod_ext_master_secret; +--- a/lib/includes/gnutls/gnutls.h.in ++++ b/lib/includes/gnutls/gnutls.h.in +@@ -542,6 +542,9 @@ typedef enum { + #define GNUTLS_ENABLE_CERT_TYPE_NEG 0 + // Here for compatibility reasons + ++/* Keep backward compatibility */ ++#define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS ++ + /** + * gnutls_alert_level_t: + * @GNUTLS_AL_WARNING: Alert of warning severity. +--- a/lib/state.h ++++ b/lib/state.h +@@ -110,7 +110,4 @@ inline static int _gnutls_PRF(gnutls_session_t session, const uint8_t *secret, + + #define DEFAULT_CERT_TYPE GNUTLS_CRT_X509 + +-/* Keep backward compatibility */ +-#define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS +- + #endif /* GNUTLS_LIB_STATE_H */ +-- +GitLab diff --git a/net-libs/gnutls/gnutls-3.8.1-r1.ebuild b/net-libs/gnutls/gnutls-3.8.1-r1.ebuild new file mode 100644 index 000000000000..730ced6f1866 --- /dev/null +++ b/net-libs/gnutls/gnutls-3.8.1-r1.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnutls.asc +inherit libtool multilib-minimal verify-sig + +DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols" +HOMEPAGE="https://www.gnutls.org/" +SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" +SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )" + +LICENSE="GPL-3 LGPL-2.1+" +# As of 3.8.0, the C++ library is header-only, but we won't drop the subslot +# component for it until libgnutls.so breaks ABI, to avoid pointless rebuilds. +# Subslot format: +# . +SLOT="0/30.30" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd" +REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 seccomp tls-heartbeat tools )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] + dev-libs/libunistring:=[${MULTILIB_USEDEP}] + >=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}] + >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] + brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] ) + dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) + nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) + pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) + idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] ) +" +DEPEND=" + ${RDEPEND} + test? ( + seccomp? ( sys-libs/libseccomp ) + ) +" +BDEPEND=" + dev-util/gtk-doc-am + >=virtual/pkgconfig-0-r1 + doc? ( dev-util/gtk-doc ) + nls? ( sys-devel/gettext ) + test-full? ( + app-crypt/dieharder + || ( sys-libs/libfaketime >=app-misc/datefudge-1.22 ) + dev-libs/softhsm:2[-bindist(-)] + net-dialup/ppp + net-misc/socat + ) + verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20221017 ) +" + +DOCS=( README.md doc/certtool.cfg ) + +HTML_DOCS=() + +PATCHES=( + "${FILESDIR}"/${P}-fix-gnutls-header.patch +) + +src_prepare() { + default + + # bug #520818 + export TZ=UTC + + use doc && HTML_DOCS+=( doc/gnutls.html ) + + # don't try to use system certificate store on macOS, it is + # confusingly ignoring our ca-certificates and more importantly + # fails to compile in certain configurations + sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die + + # Use sane .so versioning on FreeBSD. + elibtoolize +} + +multilib_src_configure() { + LINGUAS="${LINGUAS//en/en@boldquot en@quot}" + + local libconf=() + + # TPM needs to be tested before being enabled + # Note that this may add a libltdl dep when enabled. Check configure.ac. + libconf+=( + --without-tpm + --without-tpm2 + ) + + # hardware-accel is disabled on OSX because the asm files force + # GNU-stack (as doesn't support that) and when that's removed ld + # complains about duplicate symbols + [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) + + # -fanalyzer substantially slows down the build and isn't useful for + # us. It's useful for upstream as it's static analysis, but it's not + # useful when just getting something built. + export gl_cv_warn_c__fanalyzer=no + + local myeconfargs=( + --disable-valgrind-tests + $(multilib_native_enable manpages) + $(multilib_native_use_enable doc gtk-doc) + $(multilib_native_use_enable doc) + $(multilib_native_use_enable seccomp seccomp-tests) + $(multilib_native_use_enable test tests) + $(multilib_native_use_enable test-full full-test-suite) + $(multilib_native_use_enable tools) + $(use_enable cxx) + $(use_enable dane libdane) + $(use_enable nls) + $(use_enable openssl openssl-compatibility) + $(use_enable sslv2 ssl2-support) + $(use_enable sslv3 ssl3-support) + $(use_enable static-libs static) + $(use_enable tls-heartbeat heartbeat-support) + $(use_with brotli) + $(use_with idn) + $(use_with pkcs11 p11-kit) + $(use_with zlib) + $(use_with zstd) + --disable-rpath + --with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt + --with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt + --without-included-libtasn1 + $("${S}/configure" --help | grep -o -- '--without-.*-prefix') + ) + + ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + + if use examples; then + docinto examples + dodoc doc/examples/*.c + fi +} diff --git a/net-libs/gnutls/gnutls-3.8.1.ebuild b/net-libs/gnutls/gnutls-3.8.1.ebuild deleted file mode 100644 index 19eb1aa7b6f0..000000000000 --- a/net-libs/gnutls/gnutls-3.8.1.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnutls.asc -inherit libtool multilib-minimal verify-sig - -DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols" -HOMEPAGE="https://www.gnutls.org/" -SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" -SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )" - -LICENSE="GPL-3 LGPL-2.1+" -# As of 3.8.0, the C++ library is header-only, but we won't drop the subslot -# component for it until libgnutls.so breaks ABI, to avoid pointless rebuilds. -# Subslot format: -# . -SLOT="0/30.30" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd" -REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 seccomp tls-heartbeat tools )" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] - dev-libs/libunistring:=[${MULTILIB_USEDEP}] - >=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}] - >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] - brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] ) - dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) - nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) - pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) - idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) - zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - test? ( - seccomp? ( sys-libs/libseccomp ) - ) -" -BDEPEND=" - dev-util/gtk-doc-am - >=virtual/pkgconfig-0-r1 - doc? ( dev-util/gtk-doc ) - nls? ( sys-devel/gettext ) - test-full? ( - app-crypt/dieharder - || ( sys-libs/libfaketime >=app-misc/datefudge-1.22 ) - dev-libs/softhsm:2[-bindist(-)] - net-dialup/ppp - net-misc/socat - ) - verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20221017 ) -" - -DOCS=( README.md doc/certtool.cfg ) - -HTML_DOCS=() - -src_prepare() { - default - - # bug #520818 - export TZ=UTC - - use doc && HTML_DOCS+=( doc/gnutls.html ) - - # don't try to use system certificate store on macOS, it is - # confusingly ignoring our ca-certificates and more importantly - # fails to compile in certain configurations - sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die - - # Use sane .so versioning on FreeBSD. - elibtoolize -} - -multilib_src_configure() { - LINGUAS="${LINGUAS//en/en@boldquot en@quot}" - - local libconf=() - - # TPM needs to be tested before being enabled - # Note that this may add a libltdl dep when enabled. Check configure.ac. - libconf+=( - --without-tpm - --without-tpm2 - ) - - # hardware-accel is disabled on OSX because the asm files force - # GNU-stack (as doesn't support that) and when that's removed ld - # complains about duplicate symbols - [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) - - # -fanalyzer substantially slows down the build and isn't useful for - # us. It's useful for upstream as it's static analysis, but it's not - # useful when just getting something built. - export gl_cv_warn_c__fanalyzer=no - - local myeconfargs=( - --disable-valgrind-tests - $(multilib_native_enable manpages) - $(multilib_native_use_enable doc gtk-doc) - $(multilib_native_use_enable doc) - $(multilib_native_use_enable seccomp seccomp-tests) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable test-full full-test-suite) - $(multilib_native_use_enable tools) - $(use_enable cxx) - $(use_enable dane libdane) - $(use_enable nls) - $(use_enable openssl openssl-compatibility) - $(use_enable sslv2 ssl2-support) - $(use_enable sslv3 ssl3-support) - $(use_enable static-libs static) - $(use_enable tls-heartbeat heartbeat-support) - $(use_with brotli) - $(use_with idn) - $(use_with pkcs11 p11-kit) - $(use_with zlib) - $(use_with zstd) - --disable-rpath - --with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt - --with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt - --without-included-libtasn1 - $("${S}/configure" --help | grep -o -- '--without-.*-prefix') - ) - - ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete || die - - if use examples; then - docinto examples - dodoc doc/examples/*.c - fi -} -- cgit v1.2.3