From: tobtoht <tob@featherwallet.org>
Date: Mon, 26 Jun 2023 09:48:19 +0000 (+0200)
Subject: depends: unbound: clean up patch
X-Git-Url: https://git.nutra.tk/v2?a=commitdiff_plain;h=56f660ab30fa291dbbfa2eb4ce5cc5830624795c;p=gamesguru%2Ffeather.git

depends: unbound: clean up patch
---

diff --git a/contrib/depends/packages/unbound.mk b/contrib/depends/packages/unbound.mk
index 37f43761..9916262b 100644
--- a/contrib/depends/packages/unbound.mk
+++ b/contrib/depends/packages/unbound.mk
@@ -4,18 +4,18 @@ $(package)_download_path=https://www.nlnetlabs.nl/downloads/$(package)/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_sha256_hash=ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4
 $(package)_dependencies=openssl expat
-$(package)_patches=disable-glibc-reallocarray.patch remove-SHA384_Init-check.patch
+$(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_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"
 endef
 
 define $(package)_preprocess_cmds
   patch -p1 < $($(package)_patch_dir)/disable-glibc-reallocarray.patch &&\
-  patch -p1 < $($(package)_patch_dir)/remove-SHA384_Init-check.patch &&\
   autoconf
 endef
 
diff --git a/contrib/depends/patches/unbound/remove-SHA384_Init-check.patch b/contrib/depends/patches/unbound/remove-SHA384_Init-check.patch
deleted file mode 100644
index 5cce4b85..00000000
--- a/contrib/depends/patches/unbound/remove-SHA384_Init-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://stackoverflow.com/a/28947978
----
- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2c758331..33b7ae33 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1150,7 +1150,6 @@ case "$enable_ecdsa" in
-     *)
-       if test $USE_NSS = "no" -a $USE_NETTLE = "no"; then
- 	      AC_CHECK_FUNC(ECDSA_sign, [], [AC_MSG_ERROR([OpenSSL does not support ECDSA: please upgrade or rerun with --disable-ecdsa])])
--	      AC_CHECK_FUNC(SHA384_Init, [], [AC_MSG_ERROR([OpenSSL does not support SHA384: please upgrade or rerun with --disable-ecdsa])])
- 	      AC_CHECK_DECLS([NID_X9_62_prime256v1, NID_secp384r1], [], [AC_MSG_ERROR([OpenSSL does not support the ECDSA curves: please upgrade or rerun with --disable-ecdsa])], [AC_INCLUDES_DEFAULT
- #include <openssl/evp.h>
- 	      ])
--- 
-2.39.2
-