From 3089eb1ec237bc72f19d740c2e1dab2c91239f27 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 4 Nov 2023 22:01:41 +0100 Subject: [PATCH 1/7] libtls: update to 3.8.2. --- common/shlibs | 2 +- srcpkgs/libtls/patches/dynlink.patch | 81 ++++++++++++++++++++++++++++ srcpkgs/libtls/template | 11 ++-- 3 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/libtls/patches/dynlink.patch diff --git a/common/shlibs b/common/shlibs index 9036a675c1ae51..c27597d35155f2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3501,7 +3501,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 diff --git a/srcpkgs/libtls/patches/dynlink.patch b/srcpkgs/libtls/patches/dynlink.patch new file mode 100644 index 00000000000000..cab37fbabf5a7d --- /dev/null +++ b/srcpkgs/libtls/patches/dynlink.patch @@ -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 diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template index 1ea7763b035221..f9edf1c7585596 100644 --- a/srcpkgs/libtls/template +++ b/srcpkgs/libtls/template @@ -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() { From 3e791a1d3a55ed32836f297829186950c643f41f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 7 Nov 2023 16:37:53 +0100 Subject: [PATCH 2/7] catgirl: rebuild for libtls-3.8.2. --- srcpkgs/catgirl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template index 7e2f8dc7634698..aa95e7d89d1475 100644 --- a/srcpkgs/catgirl/template +++ b/srcpkgs/catgirl/template @@ -1,7 +1,7 @@ # Template file for 'catgirl' pkgname=catgirl version=2.2 -revision=1 +revision=2 build_style=gnu-configure make_build_target="all" hostmakedepends="pkg-config" From e3933573129aa987e02447c4588fb1f2662b1fea Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 7 Nov 2023 16:37:53 +0100 Subject: [PATCH 3/7] litterbox: rebuild for libtls-3.8.2. --- srcpkgs/litterbox/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template index 5031c4fbc4ee2e..d2cada7a5c22b3 100644 --- a/srcpkgs/litterbox/template +++ b/srcpkgs/litterbox/template @@ -1,7 +1,7 @@ # Template file for 'litterbox' pkgname=litterbox version=1.9 -revision=1 +revision=2 build_style=gnu-configure make_build_target="all" hostmakedepends="pkg-config" From a2550514712612cc5dec2001c2239286f1f571b7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 7 Nov 2023 16:37:53 +0100 Subject: [PATCH 4/7] openntpd: rebuild for libtls-3.8.2. --- srcpkgs/openntpd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template index 72c43ac0a9188a..ae65aa07fc2b9f 100644 --- a/srcpkgs/openntpd/template +++ b/srcpkgs/openntpd/template @@ -1,7 +1,7 @@ # Template file for 'openntpd' pkgname=openntpd version=6.8p1 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-privsep-user=openntpd --with-cacert=/etc/ssl/certs.pem" hostmakedepends="automake libtool" From a94cd46d7c9576052e9750c67c24b492b9128f74 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 7 Nov 2023 16:37:54 +0100 Subject: [PATCH 5/7] pounce: rebuild for libtls-3.8.2. --- srcpkgs/pounce/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template index 1e14ef5b8431ac..91321550ec95a4 100644 --- a/srcpkgs/pounce/template +++ b/srcpkgs/pounce/template @@ -1,7 +1,7 @@ # Template file for 'pounce' pkgname=pounce version=3.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-notify --enable-palaver" make_build_target="all" From d4ca20732a38fde676d889e43af0e720d2115dea Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 7 Nov 2023 16:37:54 +0100 Subject: [PATCH 6/7] sacc: rebuild for libtls-3.8.2. --- srcpkgs/sacc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sacc/template b/srcpkgs/sacc/template index 2ed784c44262d4..c9a068918484a6 100644 --- a/srcpkgs/sacc/template +++ b/srcpkgs/sacc/template @@ -1,7 +1,7 @@ # Template file for 'sacc' pkgname=sacc version=1.05 -revision=3 +revision=4 build_style="gnu-makefile" makedepends="ncurses-devel libtls-devel" short_desc="Terminal gopher client" From d10de34c1222a56a4f2e2540af2416aae1a365a9 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 7 Nov 2023 17:13:27 +0100 Subject: [PATCH 7/7] libtls: drop asm option, upstream unmaintained. --- srcpkgs/libtls/template | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template index f9edf1c7585596..c51f2fd6baf643 100644 --- a/srcpkgs/libtls/template +++ b/srcpkgs/libtls/template @@ -5,7 +5,7 @@ revision=1 create_wrksrc=yes build_wrksrc="libressl-${version}" build_style=gnu-configure -configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)" +configure_args="--enable-libtls-only --enable-nc" hostmakedepends="automake libtool" depends="ca-certificates" short_desc="Version of the TLS/crypto stack forked from OpenSSL" @@ -15,36 +15,15 @@ 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=6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954 -_lssl_asm_ver="1.2.0" replaces="libtls20>0" patch_args="-Np1 --directory=${build_wrksrc}" -build_options="asm" -desc_option_asm="Use platform assembly for faster crypto" - -build_options_default="" - -if [ "$build_option_asm" ]; then - distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz" - checksum+=" e1c76178c4deb1cd20a0cd7ba553d6607f8131acb2e0844223f797e42f0d6f60" -fi - case "$XBPS_TARGET_MACHINE" in # disable ssp i686-musl) configure_args+=" --disable-hardening";; - # on armv5 always disable asm as it's not supported - armv5*) configure_args+=" --disable-asm";; esac -post_extract() { - [ -z "$build_option_asm" ] && return 0 - mv libressl-portable-asm-${_lssl_asm_ver} ${build_wrksrc} -} - pre_configure() { - if [ "$build_option_asm" ]; then - ./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh . - fi autoreconf -fi } @@ -56,10 +35,6 @@ pre_check() { do_install() { make -C tls install DESTDIR="$DESTDIR" vlicense COPYING - if [ "$build_option_asm" ]; then - vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams - vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl - fi } libtls-devel_package() {