commit: 0c8976ee2eb9eb2c9af8a8d28222010822d64553 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Fri Apr 5 01:26:21 2024 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Fri Apr 5 01:26:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=0c8976ee
dev-libs/libressl: drop 3.6.3 Signed-off-by: orbea <orbea <AT> riseup.net> dev-libs/libressl/Manifest | 2 - .../files/libressl-3.6.2-genrsa-rand.patch | 26 -------- .../files/libressl-3.7.0-no-static-tests.patch | 69 ---------------------- dev-libs/libressl/libressl-3.6.3.ebuild | 60 ------------------- 4 files changed, 157 deletions(-) diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest index 919d2de..470ad6d 100644 --- a/dev-libs/libressl/Manifest +++ b/dev-libs/libressl/Manifest @@ -1,5 +1,3 @@ -DIST libressl-3.6.3.tar.gz 4240172 BLAKE2B 2712ff0fde0c6c559cc3a144c868da0022c1d1757ae8a93df260f1803f863ccb7da5c9fab24c64159085ddc5ce6549911006bf20b78b42ee9f7b772a644d7fc0 SHA512 c0def27c07a7e7480dda32f255078fbade6401461f7616213e7b93b4d3a649ceda35f6fc7191fd6a2cc78aa87976199bbf962671a76439593cbd0733b174713f -DIST libressl-3.6.3.tar.gz.asc 833 BLAKE2B 66a300ab7551a0ea3159545e4f7d9dbf1293fee9dcac63e29ecc7ffdf98caccd61a19b629f9356744a62ec9235f7b8cc1892a293f4e260daef5d0627662f30e3 SHA512 f4dacd2d4bb96f15dfb1fd9c9c183d6e8abcdeeca5e743a37d0b89ac628c33da50816cf26512dd2ad3ffe2b442a86e9684a335abf1cf58156d0747ac71eb7d8b 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 diff --git a/dev-libs/libressl/files/libressl-3.6.2-genrsa-rand.patch b/dev-libs/libressl/files/libressl-3.6.2-genrsa-rand.patch deleted file mode 100644 index 69458d7..0000000 --- a/dev-libs/libressl/files/libressl-3.6.2-genrsa-rand.patch +++ /dev/null @@ -1,26 +0,0 @@ -Gentoo's ssl-cert.eclass uses 'openssl genrsa -rand'. - -Upstream Issue: https://github.com/libressl/portable/issues/839 - ---- a/apps/openssl/genrsa.c.orig -+++ b/apps/openssl/genrsa.c -@@ -90,6 +90,7 @@ - unsigned long f4; - char *outfile; - char *passargout; -+ char *rand_dummy; - } genrsa_config; - - static int -@@ -252,6 +253,11 @@ - .type = OPTION_ARG, - .opt.arg = &genrsa_config.passargout, - }, -+ { -+ .name = "rand", -+ .type = OPTION_ARG, -+ .opt.arg = &genrsa_config.rand_dummy, -+ }, - { NULL }, - }; - diff --git a/dev-libs/libressl/files/libressl-3.7.0-no-static-tests.patch b/dev-libs/libressl/files/libressl-3.7.0-no-static-tests.patch deleted file mode 100644 index 13eedd4..0000000 --- a/dev-libs/libressl/files/libressl-3.7.0-no-static-tests.patch +++ /dev/null @@ -1,69 +0,0 @@ -Upstream Bug: https://github.com/libressl-portable/portable/issues/754 -Upstream Commit: https://github.com/libressl-portable/portable/commit/4f0f6ebd1aa1038923e08af6730a32cde3202f62 -Upstream PR: https://github.com/libressl-portable/portable/pull/806 - -From 4f0f6ebd1aa1038923e08af6730a32cde3202f62 Mon Sep 17 00:00:00 2001 -From: Brent Cook <bust...@gmail.com> -Date: Tue, 13 Dec 2022 04:34:25 -0600 -Subject: [PATCH] Build a static test library with all symbols - -Build and link a special test library rather than assuming that the -build has static libraries available. - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 6fea2ebc9..26f6b7d73 100644 ---- a/tests/Makefile.am -+++ b/tests/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 -+ - AM_CPPFLAGS += -DLIBRESSL_CRYPTO_INTERNAL - - AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1 -@@ -14,13 +18,15 @@ AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl - AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl/compat - AM_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(top_srcdir)/cert.pem\" - --LDADD = $(abs_top_builddir)/tls/.libs/libtls.a --LDADD += $(abs_top_builddir)/ssl/.libs/libssl.a --LDADD += $(abs_top_builddir)/crypto/.libs/libcrypto.a --LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) --if HOST_ASM_MACOSX_X86_64 --LDADD += $(abs_top_builddir)/crypto/.libs/libcrypto_la-cpuid-macosx-x86_64.o --endif -+noinst_LTLIBRARIES = libtest.la -+libtest_la_LIBADD = $(libcrypto_la_objects) -+libtest_la_LIBADD += $(libcompat_la_objects) -+libtest_la_LIBADD += $(libcompatnoopt_la_objects) -+libtest_la_LIBADD += $(libssl_la_objects) -+libtest_la_LIBADD += $(libtls_la_objects) -+libtest_la_SOURCES = empty.c -+ -+LDADD = libtest.la $(PLATFORM_LDADD) $(PROG_LDADD) - - TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh - -diff --git a/tls/Makefile.am b/tls/Makefile.am -index 4d31c9282..160359c3f 100644 ---- a/tls/Makefile.am -+++ b/tls/Makefile.am -@@ -9,6 +9,15 @@ EXTRA_DIST = VERSION - EXTRA_DIST += CMakeLists.txt - EXTRA_DIST += tls.sym - -+CLEANFILES = libtls_la_objects.mk -+ -+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' \ -+ > libtls_la_objects.mk -+ - libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym - libtls_la_LIBADD = $(libcrypto_la_objects) - libtls_la_LIBADD += $(libcompat_la_objects) diff --git a/dev-libs/libressl/libressl-3.6.3.ebuild b/dev-libs/libressl/libressl-3.6.3.ebuild deleted file mode 100644 index 617cc76..0000000 --- a/dev-libs/libressl/libressl-3.6.3.ebuild +++ /dev/null @@ -1,60 +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/53" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+asm static-libs test" -RESTRICT="!test? ( test )" - -PDEPEND="app-misc/ca-certificates" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-libressl )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.8.3-solaris10.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.6.2-genrsa-rand.patch - # https://github.com/libressl-portable/portable/pull/806 - "${FILESDIR}"/${PN}-3.7.0-no-static-tests.patch -) - -src_prepare() { - default - - # Required for the no-static-tests.patch - touch tests/empty.c || die - - eautoreconf -} - -multilib_src_configure() { - local ECONF_SOURCE="${S}" - local args=( - $(use_enable asm) - $(use_enable static-libs static) - $(use_enable test tests) - ) - econf "${args[@]}" -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -exec rm -f {} + || die -}
