Browse Source

Merge pull request #12745 from neheb/getd

getdns: properly remove libbsd support
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
f48625cbf9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
  1. +2
    -2
      libs/getdns/Makefile
  2. +13
    -0
      libs/getdns/patches/010-openssl-deprecated.patch

+ 2
- 2
libs/getdns/Makefile View File

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=getdns
PKG_VERSION:=1.6.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
@ -62,7 +62,7 @@ CMAKE_OPTIONS += -DUSE_LIBIDN2=$(if $(CONFIG_GETDNS_ENABLE_IDN_LIBIDN2),ON,OFF)
# present, otherwise it will use builtin code for these functions. In order to
# force the use of the built in code and remove the libbsd dependency disable
# the test for libbsd.
CMAKE_OPTIONS += -DCMAKE_DISABLE_FIND_PACKAGE_BSD=ON
CMAKE_OPTIONS += -DBSD_LIBRARY=OFF
define Package/getdns/install
$(INSTALL_DIR) $(1)/usr/lib


+ 13
- 0
libs/getdns/patches/010-openssl-deprecated.patch View File

@ -0,0 +1,13 @@
--- a/src/tls/val_secalgo.c
+++ b/src/tls/val_secalgo.c
@@ -72,6 +72,10 @@
#include <openssl/engine.h>
#endif
+#ifdef USE_DSA
+#include <openssl/dsa.h>
+#endif
+
/** fake DSA support for unit tests */
int fake_dsa = 0;
/** fake SHA1 support for unit tests */

Loading…
Cancel
Save