vars/build.vars, patches/ldns-1.7.0.local.patch: adds ldns v1.7.0 (via Redfoxmoon.)

2 files changed, 62 insertions, 1 deletions

diff --git a/patches/ldns-1.7.0.local.patch b/patches/ldns-1.7.0.local.patch
new file mode 100644
index 00000000..0e60ed78
--- /dev/null
+++ b/patches/ldns-1.7.0.local.patch
@@ -0,0 +1,55 @@
+--- ldns-1.7.0/Makefile.in.orig	2016-12-20 10:48:22.000000000 +0000
++++ ldns-1.7.0/Makefile.in	2017-01-26 14:37:19.980529846 +0000
+@@ -148,7 +148,7 @@
+ 	fi
+ 
+ drill/drill: $(DRILL_LOBJS) $(LIB)
+-	$(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill
++	$(LINK_EXE) $(DRILL_LOBJS) -L./lib -lldns $(LIBS) $(LIBSSL_LIBS) -o drill/drill
+ 
+ drill/drill.1: $(srcdir)/drill/drill.1.in
+ 	$(edit) $(srcdir)/drill/drill.1.in > drill/drill.1
+@@ -179,21 +179,21 @@
+ 	fi
+ 
+ $(EXAMPLE_PROGS):
+-	$(LINK_EXE) $@.lo $(LIBS) -lldns -o $@
++	$(LINK_EXE) $@.lo -L./lib -lldns $(LIBS) $(LIBSSL_LIBS) -o $@
+ 
+ $(TESTNS):
+-	$(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS)
++	$(LINK_EXE) $(TESTNS_LOBJS) -L./lib -lldns $(LIBS) $(LIBSSL_LIBS) -o $(TESTNS)
+ 
+ $(LDNS_DPA):
+-	$(LINK_EXE) $(LDNS_DPA_LOBJS) $(LIBS) $(LIBPCAP_LIBS) -lldns \
++	$(LINK_EXE) $(LDNS_DPA_LOBJS) -L./lib -lldns $(LIBS) $(LIBPCAP_LIBS) \
+ 		 -o $(LDNS_DPA)
+ 
+ $(LDNS_DANE):
+-	$(LINK_EXE) $(LDNS_DANE_LOBJS) $(LIBS) $(LIBSSL_SSL_LIBS) -lldns \
++	$(LINK_EXE) $(LDNS_DANE_LOBJS) -L./lib -lldns $(LIBS) $(LIBSSL_SSL_LIBS) \
+ 		 -o $(LDNS_DANE)
+ 
+ $(EX_SSL_PROGS):
+-	$(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@
++	$(LINK_EXE) $@.lo -L./lib -lldns $(LIBS) $(LIBSSL_LIBS) -o $@
+ 
+ examples/ldns-dane.1: $(srcdir)/examples/ldns-dane.1.in
+ 	$(edit) $(srcdir)/examples/ldns-dane.1.in > examples/ldns-dane.1
+@@ -228,14 +228,14 @@
+ 
+ linktest: $(srcdir)/linktest.c libldns.la
+ 	$(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/linktest.c -o linktest.lo
+-	$(LINK_EXE) linktest.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o linktest
++	$(LINK_EXE) linktest.lo -L./lib -lldns $(LIBS) $(LIBSSL_LIBS) -o linktest
+ 
+ lib: libldns.la
+ 
+ lib-export-all: libldns.la-export-all
+ 
+ libldns.la: $(LDNS_ALL_LOBJS)
+-	$(LINK_LIB) $(LIBSSL_LDFLAGS) $(LIBSSL_LIBS) -export-symbols-regex '^(ldns_|b32_[pn]to[pn]|mktime_from_utc|qsort_rr_compare_nsec3)' -o libldns.la $(LDNS_ALL_LOBJS) -rpath $(libdir) $(RUNTIME_PATH)
++	$(LINK_LIB) $(LIBSSL_LDFLAGS) -export-symbols-regex '^(ldns_|b32_[pn]to[pn]|mktime_from_utc|qsort_rr_compare_nsec3)' -o libldns.la $(LDNS_ALL_LOBJS) $(LIBSSL_LIBS) -rpath $(libdir) $(RUNTIME_PATH)
+ 
+ libldns.la-export-all: $(LDNS_ALL_LOBJS)
+ 	$(LINK_LIB) -o libldns.la $(LDNS_ALL_LOBJS) -rpath $(libdir) $(RUNTIME_PATH)
diff --git a/vars/build.vars b/vars/build.vars
index 74c21dbf..c6d79e52 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -433,7 +433,7 @@ LEAF_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 LEAF_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 LEAF_PACKAGES_PACKAGES="
 apk_tools bash bc bdwgc chicken clang_host coreutils cparser cron dash datamash diffutils dos2unix
-ed figlet file findutils gawk git gnupg grep hexcurse htop inetutils infounzip infozip irssi john
+ed figlet file findutils gawk git gnupg grep hexcurse htop inetutils infounzip infozip irssi john ldns
 less lynx make man_db mc mksh mingw_w64 nano netcat openssh p7zip pacman patch perl procps_ng python3
 rsync rxvt_unicode sed smallbasic tar tcsh the_silver_searcher tmux util_linux vim weechat wget which
 whois xeyes xwd zsh";
@@ -581,6 +581,12 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_JOHN_MAKEFLAGS_INSTALL_EXTRA:="-C src"};
 : ${PKG_JOHN_NO_MAKE_INSTALL:=1};
 : ${PKG_JOHN_SUBDIR:=john-${PKG_JOHN_VERSION}};
+: ${PKG_LDNS_SHA256SUM:=c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc};
+: ${PKG_LDNS_VERSION:=1.7.0};
+: ${PKG_LDNS_URL:=https://www.nlnetlabs.nl/downloads/ldns/ldns-${PKG_LDNS_VERSION}.tar.gz};
+: ${PKG_LDNS_CONFIGURE_ARGS_EXTRA:="--with-ssl=${PREFIX_NATIVE} --disable-dane-ta-usage --with-drill --with-examples"};
+: ${PKG_LDNS_MAKEFLAGS_BUILD_EXTRA:=libtool=slibtool};
+: ${PKG_LDNS_MAKEFLAGS_INSTALL_EXTRA:=libtool=slibtool};
 : ${PKG_LESS_SHA256SUM:=3fa38f2cf5e9e040bb44fffaa6c76a84506e379e47f5a04686ab78102090dda5};
 : ${PKG_LESS_VERSION:=481};
 : ${PKG_LESS_URL:=http://www.greenwoodsoftware.com/less/less-${PKG_LESS_VERSION}.tar.gz};