From 8322f9c4f5303e2321127c32dd7719ed8a24dd1d Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 13 Feb 2024 18:19:31 +0100 Subject: [PATCH 1/3] depends: expat: update to 2.6.0 --- contrib/depends/packages/expat.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/depends/packages/expat.mk b/contrib/depends/packages/expat.mk index 9516f86ab..590245179 100644 --- a/contrib/depends/packages/expat.mk +++ b/contrib/depends/packages/expat.mk @@ -1,12 +1,12 @@ package=expat -$(package)_version=2.4.1 -$(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_2_4_1 +$(package)_version=2.6.0 +$(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$($(package)_version))/ $(package)_file_name=$(package)-$($(package)_version).tar.bz2 -$(package)_sha256_hash=2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40 +$(package)_sha256_hash=ff60e6a6b6ce570ae012dc7b73169c7fdf4b6bf08c12ed0ec6f55736b78d85ba define $(package)_set_vars -$(package)_config_opts=--enable-static -$(package)_config_opts=--disable-shared +$(package)_config_opts=--disable-shared --without-docbook --without-tests --without-examples +$(package)_config_opts+=--enable-option-checking --without-xmlwf --with-pic $(package)_config_opts+=--prefix=$(host_prefix) endef @@ -23,6 +23,6 @@ define $(package)_stage_cmds endef define $(package)_postprocess_cmds - rm lib/*.la + rm -rf share lib/cmake lib/*.la endef From 3aabfcfce53ede81851cec321ddfeb575d1636af Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 13 Feb 2024 16:12:06 +0100 Subject: [PATCH 2/3] depends: unbound: update to 1.19.1 --- contrib/depends/funcs.mk | 2 +- contrib/depends/packages/unbound.mk | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/depends/funcs.mk b/contrib/depends/funcs.mk index 66555aad7..e08669c98 100644 --- a/contrib/depends/funcs.mk +++ b/contrib/depends/funcs.mk @@ -145,7 +145,7 @@ $(1)_build_env+=PATH="$(build_prefix)/bin:$(PATH)" $(1)_stage_env+=PATH="$(build_prefix)/bin:$(PATH)" $(1)_autoconf=./configure --host=$($($(1)_type)_host) --prefix=$($($(1)_type)_prefix) $$($(1)_config_opts) CC="$$($(1)_cc)" CXX="$$($(1)_cxx)" -ifneq ($(1),libusb) +ifeq ($(filter $(1),libusb unbound),) $(1)_autoconf += --disable-dependency-tracking endif ifneq ($($(1)_nm),) diff --git a/contrib/depends/packages/unbound.mk b/contrib/depends/packages/unbound.mk index 166cc3f79..d9ef0076a 100644 --- a/contrib/depends/packages/unbound.mk +++ b/contrib/depends/packages/unbound.mk @@ -1,18 +1,21 @@ package=unbound -$(package)_version=1.15.0 +$(package)_version=1.19.1 $(package)_download_path=https://www.nlnetlabs.nl/downloads/$(package)/ $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=a480dc6c8937447b98d161fe911ffc76cfaffa2da18788781314e81339f1126f +$(package)_sha256_hash=bc1d576f3dd846a0739adc41ffaa702404c6767d2b6082deb9f2f97cbb24a3a9 $(package)_dependencies=openssl expat $(package)_patches=disable-glibc-reallocarray.patch define $(package)_set_vars - $(package)_config_opts=--disable-shared --enable-static --without-pyunbound --prefix=$(host_prefix) --with-libexpat=$(host_prefix) --with-ssl=$(host_prefix) --with-libevent=no --without-pythonmodule --disable-flto --with-pthreads --with-libunbound-only + $(package)_config_opts=--disable-shared --enable-static --without-pyunbound --prefix=$(host_prefix) + $(package)_config_opts+=--with-libexpat=$(host_prefix) --with-ssl=$(host_prefix) --with-libevent=no + $(package)_config_opts+=--without-pythonmodule --disable-flto --with-pthreads --with-libunbound-only $(package)_config_opts_linux=--with-pic $(package)_config_opts_w64=--enable-static-exe --sysconfdir=/etc --prefix=$(host_prefix) --target=$(host_prefix) $(package)_config_opts_x86_64_darwin=ac_cv_func_SHA384_Init=yes $(package)_build_opts_mingw32=LDFLAGS="$($(package)_ldflags) -lpthread" + $(package)_cflags_mingw32+="-D_WIN32_WINNT=0x600" endef define $(package)_preprocess_cmds @@ -31,6 +34,3 @@ endef define $(package)_stage_cmds $(MAKE) DESTDIR=$($(package)_staging_dir) install endef - -define $(package)_postprocess_cmds -endef From b98787055336673be754c1c93f05fbea45b3d48e Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 13 Feb 2024 18:45:59 +0100 Subject: [PATCH 3/3] depends: openssl: update to 3.0.13 --- contrib/depends/packages/openssl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/depends/packages/openssl.mk b/contrib/depends/packages/openssl.mk index b35cf5e97..a157762c7 100644 --- a/contrib/depends/packages/openssl.mk +++ b/contrib/depends/packages/openssl.mk @@ -1,8 +1,8 @@ package=openssl -$(package)_version=3.0.11 +$(package)_version=3.0.13 $(package)_download_path=https://www.openssl.org/source $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55 +$(package)_sha256_hash=88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313 define $(package)_set_vars $(package)_config_env=AR="$($(package)_ar)" ARFLAGS=$($(package)_arflags) RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"