From fbe09a42ebb439b16c6271bc316ddb5b2256313d Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Fri, 29 Apr 2022 00:53:47 +0200
Subject: [PATCH] community/libressl: upgrade to 3.5.2
---
community/libressl/APKBUILD | 23 +++++++-----------
community/libressl/disable-test.patch | 33 --------------------------
community/libressl/ssl-libcompat.patch | 13 ----------
3 files changed, 9 insertions(+), 60 deletions(-)
delete mode 100644 community/libressl/disable-test.patch
delete mode 100644 community/libressl/ssl-libcompat.patch
diff --git a/community/libressl/APKBUILD b/community/libressl/APKBUILD
index 67d1d3c07488..a02ea959dab5 100644
--- a/community/libressl/APKBUILD
+++ b/community/libressl/APKBUILD
@@ -14,7 +14,7 @@
# - CVE-2017-8301
#
pkgname=libressl
-pkgver=3.4.3
+pkgver=3.5.2
_namever=${pkgname}${pkgver%.*}
pkgrel=0
pkgdesc="Version of the TLS/crypto stack forked from OpenSSL"
@@ -23,21 +23,18 @@ arch="all"
license="custom"
pcprefix="libressl:" # avoid mix up with openssl pkg-config
sonameprefix="libressl:" # avoid mix up with libretls
-makedepends_build="automake autoconf libtool"
+#makedepends_build="automake autoconf libtool"
makedepends_host="linux-headers"
makedepends="$makedepends_host $makedepends_build"
subpackages="$pkgname-dbg $_namever-libcrypto:_libs $_namever-libssl:_libs
$_namever-libtls:_libs $pkgname-dev $pkgname-doc"
-source="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-$pkgver.tar.gz
- ssl-libcompat.patch
- disable-test.patch
- "
+source="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-$pkgver.tar.gz"
-prepare() {
- default_prepare
-
- autoreconf -vif
-}
+#prepare() {
+# default_prepare
+#
+# autoreconf -vif
+#}
build() {
CFLAGS="-L$CBUILDROOT/usr/lib $CFLAGS" \
@@ -87,7 +84,5 @@ _libs() {
}
sha512sums="
-0562d9c1fc227bacb9c6a51f50a5f29e73a960758c2ee9b0e702352cc55808f93533c9e0d2e85fb841846b9fdf6a50e6048205ebb67b8a8b7d9fdf5856fbfb91 libressl-3.4.3.tar.gz
-18e72b7db28664ee4e294a4a461e48daa90be9e9323584112a5878fd56a578d02f4730c7c788f57cc39b2bc35447df0a47a4391077d764d953419890ad511d35 ssl-libcompat.patch
-e786a19917900122c48b2e5882d357288b918f4ce07d697b4d9819f4c323020ae191a45dd7d5b75a3c20742d69ec89d72bf3a8d078b078c0e97f363db491ce6a disable-test.patch
+07ebd1529934d472b621b31ba458a185c9fa1a4588d0bc34b669952ff0846e227094019b322cbb808def42967510abbb0928be3f6784920451b3e0c96c8f4cad libressl-3.5.2.tar.gz
"
diff --git a/community/libressl/disable-test.patch b/community/libressl/disable-test.patch
deleted file mode 100644
index 4c7b465a5431..000000000000
--- a/community/libressl/disable-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/tests/Makefile.am 2021-10-23 22:50:56.318883740 +0300
-+++ b/tests/Makefile.am 2021-10-23 22:51:17.107008650 +0300
-@@ -445,10 +445,6 @@
- EXTRA_DIST += testdsa.sh testdsa.bat
- EXTRA_DIST += openssl.cnf
-
--# testenc
--TESTS += testenc.sh
--EXTRA_DIST += testenc.sh testenc.bat
--
- # testrsa
- TESTS += testrsa.sh
- EXTRA_DIST += testrsa.sh testrsa.bat
---- a/tests/Makefile.in 2021-10-23 22:51:02.490920824 +0300
-+++ b/tests/Makefile.in 2021-10-23 22:52:24.539414024 +0300
-@@ -115,7 +115,7 @@
- sha256test$(EXEEXT) sha512test$(EXEEXT) sm3test$(EXEEXT) \
- sm4test$(EXEEXT) ssl_get_shared_ciphers$(EXEEXT) \
- ssl_methods$(EXEEXT) ssl_versions$(EXEEXT) ssltest.sh \
-- testdsa.sh testenc.sh testrsa.sh timingsafe$(EXEEXT) \
-+ testdsa.sh testrsa.sh timingsafe$(EXEEXT) \
- tlsexttest$(EXEEXT) tlslegacytest$(EXEEXT) tlstest.sh \
- tls_ext_alpn$(EXEEXT) tls_prf$(EXEEXT) utf8test$(EXEEXT) \
- valid_handshakes_terminate$(EXEEXT) verifytest$(EXEEXT) \
-@@ -1385,7 +1385,7 @@
- pq_test.sh pq_test.bat pq_expected.txt rfc5280time_small.test \
- servertest.sh servertest.bat ssltest.sh ssltest.bat testssl \
- testssl.bat ca.pem server.pem testdsa.sh testdsa.bat \
-- openssl.cnf testenc.sh testenc.bat testrsa.sh testrsa.bat \
-+ openssl.cnf testrsa.sh testrsa.bat \
- tlstest.sh tlstest.bat
- DISTCLEANFILES = pidwraptest.txt
- aeadtest_SOURCES = aeadtest.c
diff --git a/community/libressl/ssl-libcompat.patch b/community/libressl/ssl-libcompat.patch
deleted file mode 100644
index 4af15c3a31c0..000000000000
--- a/community/libressl/ssl-libcompat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ssl/Makefile.am b/ssl/Makefile.am
-index 99d138a..9d8f1f4 100644
---- a/ssl/Makefile.am
-+++ b/ssl/Makefile.am
-@@ -7,7 +7,7 @@
- EXTRA_DIST += ssl.sym
-
- 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 = $(abs_top_builddir)/crypto/libcrypto.la $(abs_top_builddir)/crypto/libcompat.la $(PLATFORM_LDADD)
-
- libssl_la_SOURCES = bio_ssl.c
- libssl_la_SOURCES += bs_ber.c
--
GitLab