ldns: fix compilation without deprecated APIs

Signed-off-by: Rosen Penev <redacted>

diff --git a/libs/ldns/Makefile b/libs/ldns/Makefile
index ca84b588ff0b2af84b188cda23aef7bc859c5c94..c53567d930c16bed85c093b1dfed837c6e4b85b3 100644 (file)
--- a/libs/ldns/Makefile
+++ b/libs/ldns/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ldns
 PKG_VERSION:=1.7.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.nlnetlabs.nl/downloads/ldns

diff --git a/libs/ldns/patches/001-compile-for-darwin.patch b/libs/ldns/patches/001-compile-for-darwin.patch
index 1108c668cf222c05467df392db2af08da417c99c..3449d86096c89c85fc2274dc92ff646000ed3b57 100644 (file)
--- a/libs/ldns/patches/001-compile-for-darwin.patch
+++ b/libs/ldns/patches/001-compile-for-darwin.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -881,7 +881,7 @@ AC_ARG_WITH(xcode-sdk, AC_HELP_STRING([--with-xcode-sdk],
+@@ -861,7 +861,7 @@ AC_ARG_WITH(xcode-sdk, AC_HELP_STRING([--with-xcode-sdk],
   [],[with_xcode_sdk="yes"])
  if test "x_$with_xcode_sdk" != "x_no" ; then
     # check OSX deployment target, if needed

diff --git a/libs/ldns/patches/030-signzone.patch b/libs/ldns/patches/030-signzone.patch
new file mode 100644 (file)
index 0000000..f001ab8
--- /dev/null
+++ b/libs/ldns/patches/030-signzone.patch
@@ -0,0 +1,18 @@
+--- a/examples/ldns-signzone.c
++++ b/examples/ldns-signzone.c
+@@ -535,6 +535,7 @@ init_openssl_engine ( const char * const id )
+ static void
+ shutdown_openssl ( ENGINE * const e )
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
+       if ( e != NULL ) {
+               ENGINE_free ( e );
+               ENGINE_cleanup ();
+@@ -544,6 +545,7 @@ shutdown_openssl ( ENGINE * const e )
+       EVP_cleanup ();
+       CRYPTO_cleanup_all_ex_data ();
+       ERR_free_strings ();
++#endif
+ }
+ #endif
+