Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12767 from jonathanunderwood/openwrt-19.07

Browse source 
[19.07] stubby: remove libbsd dependency and fix compilation with deprecated OpenSSL APIs
This commit is contained in:
Rosen Penev 2020-07-08 23:04:26 -07:00 committed by GitHub
commit a9045767b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/getdns/Makefile
View file

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=getdns PKG_NAME:=getdns
PKG_VERSION:=1.6.0 PKG_VERSION:=1.6.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE 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 # 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 # force the use of the built in code and remove the libbsd dependency disable
# the test for libbsd. # the test for libbsd.
CMAKE_OPTIONS += -DCMAKE_DISABLE_FIND_PACKAGE_BSD=ON CMAKE_OPTIONS += -DBSD_LIBRARY=OFF
define Package/getdns/install define Package/getdns/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib

13
libs/getdns/patches/010-openssl-deprecated.patch Normal file
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 */