diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-08-07 19:08:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-07 19:08:51 -0700 |
| commit | cdcbe880df459e98a0153adb789321b87c98f1b1 (patch) | |
| tree | 505fdd50fd7f427afb0113073d039b7dc32ab9f2 /libs | |
| parent | b91235e150361cf200ea8f57100c7cba45c9be99 (diff) | |
| parent | a89a876de9ceac06ae05ad4fddeca7c4abef6460 (diff) | |
Merge pull request #13028 from neheb/ldnsss
ldns: fix compilation without deprecated APIs
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ldns/Makefile | 2 | ||||
| -rw-r--r-- | libs/ldns/patches/001-compile-for-darwin.patch | 2 | ||||
| -rw-r--r-- | libs/ldns/patches/030-signzone.patch | 18 |
3 files changed, 20 insertions, 2 deletions
diff --git a/libs/ldns/Makefile b/libs/ldns/Makefile index ca84b588f..c53567d93 100644 --- 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 1108c668c..3449d8609 100644 --- 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 index 000000000..f001ab857 --- /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 + |