commit: b47829f809bdf4af9f3399cf64a0f07ed19882d0 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Mon Apr 8 18:12:16 2024 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Mon Apr 8 18:12:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=b47829f8
dev-libs/libressl: drop 3.7.3-r1 Not supported upstream and fails tests with expired certs. Signed-off-by: orbea <orbea <AT> riseup.net> dev-libs/libressl/Manifest | 2 - .../files/libressl-3.7.2-array-bounds.patch | 24 --- ...3.7.3-libcrypto-unexport-internal-symbols.patch | 234 --------------------- dev-libs/libressl/libressl-3.7.3-r1.ebuild | 74 ------- 4 files changed, 334 deletions(-) diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest index 470ad6d..ac00a00 100644 --- a/dev-libs/libressl/Manifest +++ b/dev-libs/libressl/Manifest @@ -1,5 +1,3 @@ -DIST libressl-3.7.3.tar.gz 4337594 BLAKE2B e335e5b6080e4165c5c4088f7c79cef3fcc79274ad71294afec2bc67cfdb77aeb2f16ca70056994bb526035c8d98421d5dea993f28258cae175b76df7e67f984 SHA512 657942b5c127c2478ba29fc29b8bfd607ffd64e73646c01aa570e62776175e880f6d32762de9b95bb944608a195f9a958a1dd87bbd5ef473c4b1d06c63041fdd -DIST libressl-3.7.3.tar.gz.asc 833 BLAKE2B 3b41ed454cb13fc6e830a0142e41cdbb7fd2a861a2b9a2f9acb56cbc20c266a7a8343d864b44c06ca748ffd7fbd3d2b67766885bab6f3674ace1d98c4ae1f4d8 SHA512 89043da91ca2218816f8ba3e5c87b6e0bb0980272eb9aafbf6480e1e5f573a46e723fbca1f25f9902ef204d50fbf4c760cd6c7bd9ee3ee64851805064f7b3cb7 DIST libressl-3.8.3.tar.gz 4475058 BLAKE2B f29ca56e6a717c09efd2510c97ef38a4f037b38352c3b02badad9db841c636628cbebdd9a1f69e9138fee038764326559939b0221bf335aaf03b415f4fe92d66 SHA512 b8107fc809d5a095a49cebe3192a9b609441dfaa86c7bee472c34c177854d1d8ca983eb071828593f98e0c161f75176dabeefe6067ba417b2ecbaea5aa20645f DIST libressl-3.8.3.tar.gz.asc 833 BLAKE2B 752c161854cbeeb3ff3e6d921728f723d4ae1dd391cf41a266fee3bb1575664b2608481db26706fb239469888ae0885194cfa727c59c4c0339d3962155594aa9 SHA512 a2a9e5e0cf6387674c7af9ca07531eee294e3c1c90862082af6d7aafc1953b1bb8ff79172ac2c6e2b9113c462622a7e4feb2a28824721288cb30d9b6ab21fa8a DIST libressl-3.8.4.tar.gz 4467303 BLAKE2B 7ae939e012e1a8d98814e28caec86d5f36f7e01250f6201f6d46aa5a236a8fc0619b6bbe24d6ff70eb65eae767e9d43f26a714df317a1fd2b2dea0c0177ba50d SHA512 b8986a9e2c0a1f912770d2e55ed39b3ca0c072b8c98ecf2d22a3d36768c36b6f4588698dd248d8b585db1bd0a74f8995cc09a0ca3e707e680d87d4fa169f8941 diff --git a/dev-libs/libressl/files/libressl-3.7.2-array-bounds.patch b/dev-libs/libressl/files/libressl-3.7.2-array-bounds.patch deleted file mode 100644 index 7ebdc33..0000000 --- a/dev-libs/libressl/files/libressl-3.7.2-array-bounds.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/libressl/portable/issues/825 - ---- a/include/openssl/crypto.h -+++ b/include/openssl/crypto.h -@@ -132,6 +132,10 @@ - extern "C" { - #endif - -+#ifndef __dead -+#define __dead -+#endif -+ - /* Backward compatibility to SSLeay */ - /* This is more to be used to check the correct DLL is being used - * in the MS world. */ -@@ -488,7 +492,7 @@ typedef int *CRYPTO_MEM_LEAK_CB(unsigned long, const char *, int, int, void *); - int CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb); - - /* die if we have to */ --void OpenSSLDie(const char *file, int line, const char *assertion); -+__dead void OpenSSLDie(const char *file, int line, const char *assertion); - #define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1)) - - uint64_t OPENSSL_cpu_caps(void); diff --git a/dev-libs/libressl/files/libressl-3.7.3-libcrypto-unexport-internal-symbols.patch b/dev-libs/libressl/files/libressl-3.7.3-libcrypto-unexport-internal-symbols.patch deleted file mode 100644 index 40cc470..0000000 --- a/dev-libs/libressl/files/libressl-3.7.3-libcrypto-unexport-internal-symbols.patch +++ /dev/null @@ -1,234 +0,0 @@ -https://github.com/gentoo/libressl/issues/549 -https://github.com/libressl/portable/pull/808 - -From b38f5a8904b83d433e967f683821ca992354551b Mon Sep 17 00:00:00 2001 -From: Brent Cook <[email protected]> -Date: Sun, 18 Dec 2022 21:39:58 -0600 -Subject: [PATCH 1/4] fix dangling whitespace when building object list - -breaks latest macOS linker to have a directory in the object list ---- - tls/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tls/Makefile.am b/tls/Makefile.am -index 9b62b2231e..d5725c362a 100644 ---- a/tls/Makefile.am -+++ b/tls/Makefile.am -@@ -16,7 +16,7 @@ EXTRA_libtls_la_DEPENDENCIES = libtls_la_objects.mk - - libtls_la_objects.mk: Makefile - @echo "libtls_la_objects= $(libtls_la_OBJECTS)" \ -- | sed 's/ */ $$\(abs_top_builddir\)\/tls\//g' \ -+ | sed -e 's/ *$$//' -e 's/ */ $$\(abs_top_builddir\)\/tls\//g' \ - > libtls_la_objects.mk - - libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym - -From cfbdf67f5960198363f56b06f6a4f88aa8654d10 Mon Sep 17 00:00:00 2001 -From: Brent Cook <[email protected]> -Date: Sun, 18 Dec 2022 22:10:11 -0600 -Subject: [PATCH 2/4] link internal apps statically - ---- - apps/nc/Makefile.am | 11 +++++++---- - apps/ocspcheck/Makefile.am | 12 +++++++++--- - apps/openssl/Makefile.am | 9 +++++++-- - 3 files changed, 23 insertions(+), 9 deletions(-) - -diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am -index e9db6e592b..aba306ed3b 100644 ---- a/apps/nc/Makefile.am -+++ b/apps/nc/Makefile.am -@@ -1,6 +1,8 @@ - include $(top_srcdir)/Makefile.am.common - - -include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk -+-include $(abs_top_builddir)/ssl/libssl_la_objects.mk -+-include $(abs_top_builddir)/tls/libtls_la_objects.mk - - if BUILD_NC - -@@ -14,12 +16,13 @@ endif - EXTRA_DIST = nc.1 - EXTRA_DIST += CMakeLists.txt - --nc_LDADD = $(abs_top_builddir)/tls/libtls.la --nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) -- --nc_LDADD += $(libcrypto_la_objects) -+nc_LDADD = $(libcrypto_la_objects) - nc_LDADD += $(libcompat_la_objects) - nc_LDADD += $(libcompatnoopt_la_objects) -+nc_LDADD += $(libssl_la_objects) -+nc_LDADD += $(libtls_la_objects) -+ -+nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) - - AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat - -diff --git a/apps/ocspcheck/Makefile.am b/apps/ocspcheck/Makefile.am -index 7c7b454313..e6f3c5436b 100644 ---- a/apps/ocspcheck/Makefile.am -+++ b/apps/ocspcheck/Makefile.am -@@ -1,5 +1,9 @@ - include $(top_srcdir)/Makefile.am.common - -+-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk -+-include $(abs_top_builddir)/ssl/libssl_la_objects.mk -+-include $(abs_top_builddir)/tls/libtls_la_objects.mk -+ - if !ENABLE_LIBTLS_ONLY - bin_PROGRAMS = ocspcheck - dist_man_MANS = ocspcheck.8 -@@ -10,9 +14,11 @@ endif - EXTRA_DIST = ocspcheck.8 - EXTRA_DIST += CMakeLists.txt - --ocspcheck_LDADD = $(abs_top_builddir)/crypto/libcrypto.la --ocspcheck_LDADD += $(abs_top_builddir)/ssl/libssl.la --ocspcheck_LDADD += $(abs_top_builddir)/tls/libtls.la -+ocspcheck_LDADD = $(libcrypto_la_objects) -+ocspcheck_LDADD += $(libcompat_la_objects) -+ocspcheck_LDADD += $(libcompatnoopt_la_objects) -+ocspcheck_LDADD += $(libssl_la_objects) -+ocspcheck_LDADD += $(libtls_la_objects) - ocspcheck_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) - - ocspcheck_SOURCES = http.c -diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am -index 7cbac48ae6..9574e06339 100644 ---- a/apps/openssl/Makefile.am -+++ b/apps/openssl/Makefile.am -@@ -1,5 +1,8 @@ - include $(top_srcdir)/Makefile.am.common - -+-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk -+-include $(abs_top_builddir)/ssl/libssl_la_objects.mk -+ - if !ENABLE_LIBTLS_ONLY - bin_PROGRAMS = openssl - dist_man_MANS = openssl.1 -@@ -7,8 +10,10 @@ else - noinst_PROGRAMS = openssl - endif - --openssl_LDADD = $(abs_top_builddir)/ssl/libssl.la --openssl_LDADD += $(abs_top_builddir)/crypto/libcrypto.la -+openssl_LDADD = $(libcrypto_la_objects) -+openssl_LDADD += $(libcompat_la_objects) -+openssl_LDADD += $(libcompatnoopt_la_objects) -+openssl_LDADD += $(libssl_la_objects) - openssl_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) - - openssl_SOURCES = apps.c - -From f261e8c46e5ce6a15638275b95d9d5c145d35d9c Mon Sep 17 00:00:00 2001 -From: Brent Cook <[email protected]> -Date: Tue, 28 Feb 2023 08:34:39 -0600 -Subject: [PATCH 4/4] unexport internal compat symbols from libcrypto - ---- - crypto/Makefile.am | 66 ---------------------------------------------- - ssl/Makefile.am | 4 +++ - 2 files changed, 4 insertions(+), 66 deletions(-) - -diff --git a/crypto/Makefile.am b/crypto/Makefile.am -index c09d266b2e..0b5ba3f99f 100644 ---- a/crypto/Makefile.am -+++ b/crypto/Makefile.am -@@ -44,73 +44,7 @@ crypto_portable.sym: crypto.sym Makefile - -echo "generating crypto_portable.sym ..." - -cp $(top_srcdir)/crypto/crypto.sym crypto_portable.sym - -chmod u+w crypto_portable.sym --if !HAVE_ARC4RANDOM_BUF -- -echo arc4random >> crypto_portable.sym -- -echo arc4random_buf >> crypto_portable.sym -- -echo arc4random_uniform >> crypto_portable.sym --if !HAVE_GETENTROPY -- -echo getentropy >> crypto_portable.sym --endif --endif --if !HAVE_ASPRINTF -- -echo asprintf >> crypto_portable.sym -- -echo vasprintf >> crypto_portable.sym --endif --if !HAVE_EXPLICIT_BZERO -- -echo explicit_bzero >> crypto_portable.sym --endif --if !HAVE_FREEZERO -- -echo freezero >> crypto_portable.sym --endif --if !HAVE_REALLOCARRAY -- -echo reallocarray >> crypto_portable.sym --endif --if !HAVE_RECALLOCARRAY -- -echo recallocarray >> crypto_portable.sym --endif --if !HAVE_STRLCAT -- -echo strlcat >> crypto_portable.sym --endif --if !HAVE_STRLCPY -- -echo strlcpy >> crypto_portable.sym --endif --if !HAVE_STRNDUP -- -echo strndup >> crypto_portable.sym --endif --if !HAVE_STRNLEN -- -echo strnlen >> crypto_portable.sym --endif --if !HAVE_STRSEP -- -echo strsep >> crypto_portable.sym --endif --if !HAVE_STRTONUM -- -echo strtonum >> crypto_portable.sym --endif --if !HAVE_TIMEGM -- -echo timegm >> crypto_portable.sym --endif --if !HAVE_TIMINGSAFE_BCMP -- -echo timingsafe_bcmp >> crypto_portable.sym --endif --if !HAVE_TIMINGSAFE_MEMCMP -- -echo timingsafe_memcmp >> crypto_portable.sym --endif --if HOST_CPU_IS_INTEL -- -echo OPENSSL_ia32cap_P >> crypto_portable.sym --endif - if HOST_WIN -- -echo posix_perror >> crypto_portable.sym -- -echo posix_fopen >> crypto_portable.sym -- -echo posix_fgets >> crypto_portable.sym -- -echo posix_open >> crypto_portable.sym -- -echo posix_rename >> crypto_portable.sym -- -echo posix_connect >> crypto_portable.sym -- -echo posix_close >> crypto_portable.sym -- -echo posix_read >> crypto_portable.sym -- -echo posix_write >> crypto_portable.sym -- -echo posix_getsockopt >> crypto_portable.sym -- -echo posix_setsockopt >> crypto_portable.sym -- -echo getuid >> crypto_portable.sym - -grep -v BIO_s_log crypto_portable.sym > crypto_portable.sym.tmp - -mv crypto_portable.sym.tmp crypto_portable.sym - endif -diff --git a/ssl/Makefile.am b/ssl/Makefile.am -index d27e2af835..002a26674a 100644 ---- a/ssl/Makefile.am -+++ b/ssl/Makefile.am -@@ -1,5 +1,7 @@ - include $(top_srcdir)/Makefile.am.common - -+-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk -+ - AM_CPPFLAGS += -I$(top_srcdir)/crypto/bio - - noinst_LTLIBRARIES = libbs.la -@@ -34,6 +36,8 @@ remove_bs_objects: libssl.la - libssl_la_CPPFLAGS = -I$(top_srcdir)/ssl/hidden ${AM_CPPFLAGS} - libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym - libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la $(PLATFORM_LDADD) -+libssl_la_LIBADD += $(libcompat_la_objects) -+libssl_la_LIBADD += $(libcompatnoopt_la_objects) - libssl_la_LIBADD += libbs.la - - libbs_la_SOURCES = bs_ber.c diff --git a/dev-libs/libressl/libressl-3.7.3-r1.ebuild b/dev-libs/libressl/libressl-3.7.3-r1.ebuild deleted file mode 100644 index f221896..0000000 --- a/dev-libs/libressl/libressl-3.7.3-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libressl.asc -inherit autotools multilib-minimal verify-sig - -DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL" -HOMEPAGE="https://www.libressl.org/"; -SRC_URI=" - https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz - verify-sig? ( https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz.asc ) -" - -LICENSE="ISC openssl" -# Reflects ABI of libcrypto.so and libssl.so. Since these can differ, -# we'll try to use the max of either. However, if either change between -# versions, we have to change the subslot to trigger rebuild of consumers. -SLOT="0/54" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+asm netcat static-libs test" -RESTRICT="!test? ( test )" - -PDEPEND="app-misc/ca-certificates" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-libressl )" -RDEPEND="netcat? ( - !net-analyzer/netcat - !net-analyzer/nmap[symlink] - !net-analyzer/openbsd-netcat -)" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/openssl/opensslconf.h ) - -# LibreSSL checks for libc features during configure -QA_CONFIG_IMPL_DECL_SKIP=( - __va_copy - b64_ntop -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.8.3-solaris10.patch - # Silences a Gentoo QA notice that is a false positive - # https://github.com/libressl/portable/issues/825 - "${FILESDIR}"/${PN}-3.7.2-array-bounds.patch - # Gentoo's ssl-cert.eclass uses 'openssl genrsa -rand' - # which LibreSSL doesn't support. - # https://github.com/libressl/portable/issues/839 - "${FILESDIR}"/${PN}-3.7.2-genrsa-rand.patch - # https://github.com/gentoo/libressl/issues/549 - "${FILESDIR}"/${P}-libcrypto-unexport-internal-symbols.patch -) - -src_prepare() { - default - - eautoreconf -} - -multilib_src_configure() { - local ECONF_SOURCE="${S}" - local args=( - $(use_enable asm) - $(use_enable static-libs static) - $(use_enable netcat nc) - $(use_enable test tests) - ) - econf "${args[@]}" -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -exec rm -f {} + || die -}
