From 805c1344e5b7c202e90c79c78176266474116c50 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 7 Jul 2020 14:20:01 -0700 Subject: [PATCH 1/2] getdns: properly remove libbsd support Signed-off-by: Rosen Penev --- libs/getdns/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/getdns/Makefile b/libs/getdns/Makefile index 81104b741..2329c43f8 100644 --- a/libs/getdns/Makefile +++ b/libs/getdns/Makefile @@ -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 @@ -64,7 +64,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 From 6a0eeda77f8a1bd69092c5b63930c690178f3a58 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 7 Jul 2020 14:57:59 -0700 Subject: [PATCH 2/2] getdns: fix compilation without deprecated OpenSSL APIs Since DSA is enabled, dsa.h is needed. Normally this header is included implicitly with engine.h but with OPENSSL_API_COMPAT >= 0x10100000L , this is not so. Signed-off-by: Rosen Penev --- libs/getdns/patches/010-openssl-deprecated.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 libs/getdns/patches/010-openssl-deprecated.patch diff --git a/libs/getdns/patches/010-openssl-deprecated.patch b/libs/getdns/patches/010-openssl-deprecated.patch new file mode 100644 index 000000000..21d850351 --- /dev/null +++ b/libs/getdns/patches/010-openssl-deprecated.patch @@ -0,0 +1,13 @@ +--- a/src/tls/val_secalgo.c ++++ b/src/tls/val_secalgo.c +@@ -72,6 +72,10 @@ + #include + #endif + ++#ifdef USE_DSA ++#include ++#endif ++ + /** fake DSA support for unit tests */ + int fake_dsa = 0; + /** fake SHA1 support for unit tests */