libtls: update to 3.8.2.
This commit is contained in:
parent
e9ac278dd4
commit
c1c8c7bc5a
@ -3499,7 +3499,7 @@ libmanette-0.2.so.0 libmanette-0.2.1_1
|
||||
libfmt.so.9 fmt-9.0.0_1
|
||||
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
|
||||
libolm.so.3 olm-3.0.0_1
|
||||
libtls.so.26 libtls-3.6.1_1
|
||||
libtls.so.28 libtls-3.8.2_1
|
||||
libxmlb.so.2 libxmlb-0.2.1_1
|
||||
libvoikko.so.1 libvoikko-4.2_1
|
||||
libfstrcmp.so.0 libfstrcmp-0.7.D001_1
|
||||
|
81
srcpkgs/libtls/patches/dynlink.patch
Normal file
81
srcpkgs/libtls/patches/dynlink.patch
Normal file
@ -0,0 +1,81 @@
|
||||
Revert of a316f8ab8cf79895062c1d1fcc5d47c3d2cc6f6a
|
||||
|
||||
--- b/apps/nc/Makefile.am
|
||||
+++ a/apps/nc/Makefile.am
|
||||
@@ -1,8 +1,6 @@
|
||||
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
|
||||
|
||||
@@ -16,13 +14,11 @@
|
||||
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 += $(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
|
||||
|
||||
--- b/apps/ocspcheck/Makefile.am
|
||||
+++ a/apps/ocspcheck/Makefile.am
|
||||
@@ -1,9 +1,5 @@
|
||||
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
|
||||
@@ -14,11 +10,9 @@
|
||||
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
|
||||
--- b/apps/openssl/Makefile.am
|
||||
+++ a/apps/openssl/Makefile.am
|
||||
@@ -1,8 +1,5 @@
|
||||
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
|
||||
@@ -10,10 +7,8 @@
|
||||
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
|
@ -1,6 +1,6 @@
|
||||
# Template file for 'libtls'
|
||||
pkgname=libtls
|
||||
version=3.7.3
|
||||
version=3.8.2
|
||||
revision=1
|
||||
create_wrksrc=yes
|
||||
build_wrksrc="libressl-${version}"
|
||||
@ -14,7 +14,7 @@ license="OpenSSL, ISC"
|
||||
homepage="http://www.libressl.org/"
|
||||
changelog="https://raw.githubusercontent.com/libressl/portable/master/ChangeLog"
|
||||
distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
|
||||
checksum=7948c856a90c825bd7268b6f85674a8dcd254bae42e221781b24e3f8dc335db3
|
||||
checksum=6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954
|
||||
_lssl_asm_ver="1.2.0"
|
||||
replaces="libtls20>0"
|
||||
patch_args="-Np1 --directory=${build_wrksrc}"
|
||||
@ -45,7 +45,12 @@ pre_configure() {
|
||||
if [ "$build_option_asm" ]; then
|
||||
./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
|
||||
fi
|
||||
autoreconf -if
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
pre_check() {
|
||||
# Else testenc.sh fails
|
||||
export OPENSSL_CONF=
|
||||
}
|
||||
|
||||
do_install() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user