Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2025-01-18 08:44:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

depends: unbound: clean up patch

Browse source
This commit is contained in:
tobtoht 2023-06-26 11:48:19 +02:00
parent 89bd748956
commit 56f660ab30
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/depends/packages/unbound.mk
View file

@ -4,18 +4,18 @@ $(package)_download_path=https://www.nlnetlabs.nl/downloads/$(package)/
$(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 $(package)_sha256_hash=ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4
$(package)_dependencies=openssl expat $(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 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) --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_linux=--with-pic
$(package)_config_opts_w64=--enable-static-exe --sysconfdir=/etc --prefix=$(host_prefix) --target=$(host_prefix) $(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)_build_opts_mingw32=LDFLAGS="$($(package)_ldflags) -lpthread"
endef endef
define $(package)_preprocess_cmds define $(package)_preprocess_cmds
patch -p1 < $($(package)_patch_dir)/disable-glibc-reallocarray.patch &&\ patch -p1 < $($(package)_patch_dir)/disable-glibc-reallocarray.patch &&\
patch -p1 < $($(package)_patch_dir)/remove-SHA384_Init-check.patch &&\
autoconf autoconf
endef endef

20
contrib/depends/patches/unbound/remove-SHA384_Init-check.patch
View file

@ -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