commit: 71f1ae9caa4335aaff05cb143312461a6e6105af Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Sat Apr 8 15:53:37 2023 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Wed Apr 12 01:59:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=71f1ae9c
dev-libs/libressl: Add 3.7.2 + Remove 3.7.0 Closes: https://github.com/gentoo/libressl/pull/512 Signed-off-by: orbea <orbea <AT> riseup.net> dev-libs/libressl/Manifest | 4 +- .../files/libressl-3.7.0-no-static-tests.patch | 69 ---------------------- ...libressl-3.7.0.ebuild => libressl-3.7.2.ebuild} | 9 +-- 3 files changed, 5 insertions(+), 77 deletions(-) diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest index 09b5c7d..3ec7011 100644 --- a/dev-libs/libressl/Manifest +++ b/dev-libs/libressl/Manifest @@ -2,7 +2,7 @@ DIST libressl-3.5.4.tar.gz 4039834 BLAKE2B 65d13e746a01a7bfb24b1b5d90b3ae1f421fc DIST libressl-3.5.4.tar.gz.asc 833 BLAKE2B b62aa4d8ce82e5dc59aade83a04e13e691166f7363a247382a78107d2fbe98c174d99c67966b25071caf6d24b57e097431c10a06d0aba176292267c85b41ac28 SHA512 4d8316888053e4f812f41c19c93c93c0a35ff958bbf845d472a25675551ad4480492158d14bc7a1d8cf1fda4d5d44c092b8db90b92d958e1f7e6404f053018cc DIST libressl-3.6.2.tar.gz 4239482 BLAKE2B 6c978ba3afcd031773184494470a53e67572ddcf793b591a8fb855c4801e4c84928c480c1a3b9f24ad13ab8fc3b3e9d01bebb3eda3112d947128347353964949 SHA512 8fc81e05d1c9f9259d06508ca97d5a1ba5d46b857088c273c20e6b242921f7eac58a1136564ad9831c923758ee63f7b0897c8c6c7b1e53ab8132a995cc559aeb DIST libressl-3.6.2.tar.gz.asc 833 BLAKE2B 1c5b5041277d1bb79fc752bf6872e6b45407f206cbf57e51de525e277c2a6b2819ba6d765154b8ff8f0137df99fcee163333844b80c0f1dd099da7ca769d2437 SHA512 e983936800a84d193c357c8f3f7fbdc5af9750bcf4f6429cfac92147f97a5cc673a6916564f26f4449b1c7a35a40f6c23ecfc81cecc8550aa174750afb014802 -DIST libressl-3.7.0.tar.gz 4260077 BLAKE2B c94131d5d7f12c3d197af98f36105b34a92da8fd7b2120c8bfde7050087df654dbaca77d874bcf809eecfdd21f78768da2293d9ab400629e25b1e94aa1803ace SHA512 913f24aa84ce4a5034a62fce3dc19e27e39cf67f2e2b172adf4dd2ca36009c7ea60945a188bd8ea4b9fbd48c0ab8c3926207eba65d88d559c60bef49cbb96f68 -DIST libressl-3.7.0.tar.gz.asc 833 BLAKE2B 8cbd34dc8cf41f79537a8189c60672696ce8a15ce49c26788f7943600b0c9888d420308f983d478750138adff76606ab3942e3a51791647be51ff7952ed1f116 SHA512 5df0cfb2078a3eed7fcf002e4563521d1b12cd4dd693b4d8d8dbe5d89876d9893e75c30248b67304aec7a41b1d556a5d55b33951945084838bfbe72423d059a3 DIST libressl-3.7.1.tar.gz 4299952 BLAKE2B 91c88963c1cc6568f8c023ebec589af4ac29958fa201906d370575ff5035b0fef73ea837ea846c25304bc88a085ae77606e13491b98fe9aaff1c97b6abe30486 SHA512 94c0f2b82d5b16ef43e481ecc281cb9b33687d4214f77e1da9b67bbed7115d847ba1c61aa5399f4ccb5c658e29ab945f178ea2448e7ea70633397a6c71de5d79 DIST libressl-3.7.1.tar.gz.asc 833 BLAKE2B d703f286dac1f6a259f6f46f0a9b53d4086e5a046ebd6af26605aa8a52c7d7a800ab6e246b98b6020fbac34a350f3e78ebb5fb394af8f4819c31114f034c37d6 SHA512 114453643228d88acaf24ebbfad6d276af425249a84f6cc77e22098591961f919d8ea10080898d254dc6727dd01ace4e872e001a5b3bec71f21b9ccf9bcf5882 +DIST libressl-3.7.2.tar.gz 4336143 BLAKE2B b68eb2d31b438e6b2f67e178d92a49eb95515c6545c88aae39d4d895a96753e26b0aae907eef76387b31f88afdcc3e97ba46182adae318f9014c26466448c487 SHA512 289d7aae073881a7466d226989218b8d09ada915d3332ef820736ffc5577d2fdcd9aa0713e3b08f921052cd835a25ab36301d9250055eb6ef9265b980deccb97 +DIST libressl-3.7.2.tar.gz.asc 833 BLAKE2B ced54101719018670bc7e9338787707b58b6a9ef2fc662b3367ca47640e3b9292acebc4cacec1908e4f3682fdeb9af99fe0d69754965740c0682303d69dceb3b SHA512 b25ace89dfc3c172224f4c80e8aa1ad314ba116e8b867c9d2a708172a9e05c5c505c2d43a13f4bd443a940ed6339b067021d54ac3a9e084e1f44c48f29fd4cfc 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 <[email protected]> -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.7.0.ebuild b/dev-libs/libressl/libressl-3.7.2.ebuild similarity index 87% rename from dev-libs/libressl/libressl-3.7.0.ebuild rename to dev-libs/libressl/libressl-3.7.2.ebuild index f5770bf..168cab3 100644 --- a/dev-libs/libressl/libressl-3.7.0.ebuild +++ b/dev-libs/libressl/libressl-3.7.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,18 +26,15 @@ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-libressl )" VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libressl.asc +MULTILIB_WRAPPED_HEADERS=( /usr/include/openssl/opensslconf.h ) + PATCHES=( "${FILESDIR}"/${PN}-2.8.3-solaris10.patch - # https://github.com/libressl-portable/portable/pull/806 - "${FILESDIR}"/${P}-no-static-tests.patch ) src_prepare() { default - # Required for the no-static-tests.patch - touch tests/empty.c || die - eautoreconf }
