ldns: more fixes for hardcoded paths (#1615)

diff --git a/packages/ldns/build.sh b/packages/ldns/build.sh
index fad2798..2ca6698 100755 (executable)
--- a/packages/ldns/build.sh
+++ b/packages/ldns/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.nlnetlabs.nl/projects/ldns/
 TERMUX_PKG_DESCRIPTION="Library for simplifying DNS programming and supporting recent and experimental RFCs"
 TERMUX_PKG_DEPENDS="openssl"
 TERMUX_PKG_VERSION=1.7.0
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://www.nlnetlabs.nl/downloads/ldns/ldns-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc
 # --disable-dane-verify needed until openssl 1.1.0:

diff --git a/packages/ldns/fix-hardcoded-paths.patch b/packages/ldns/fix-hardcoded-paths.patch
index c87cfdd..677aac0 100644 (file)
--- a/packages/ldns/fix-hardcoded-paths.patch
+++ b/packages/ldns/fix-hardcoded-paths.patch
@@ -1,6 +1,6 @@
 diff -uNr ldns-1.7.0/ldns/resolver.h ldns-1.7.0.mod/ldns/resolver.h
 --- ldns-1.7.0/ldns/resolver.h 2016-12-20 12:48:22.000000000 +0200
-+++ ldns-1.7.0.mod/ldns/resolver.h     2017-09-12 12:05:37.802990331 +0300
++++ ldns-1.7.0.mod/ldns/resolver.h     2017-10-04 16:27:10.112448953 +0300
 @@ -33,9 +33,9 @@
  #endif
  
@@ -13,3 +13,15 @@ diff -uNr ldns-1.7.0/ldns/resolver.h ldns-1.7.0.mod/ldns/resolver.h
  
  #define LDNS_RESOLV_KEYWORD     -1
  #define LDNS_RESOLV_DEFDOMAIN 0
+diff -uNr ldns-1.7.0/resolver.c ldns-1.7.0.mod/resolver.c
+--- ldns-1.7.0/resolver.c      2016-12-20 12:48:22.000000000 +0200
++++ ldns-1.7.0.mod/resolver.c  2017-10-04 16:28:34.203407382 +0300
+@@ -780,7 +780,7 @@
+         if(!line_nr) line_nr = &lnr;
+ 
+       if(!fp) {
+-              myfp = fopen("/etc/resolv.conf", "r");
++              myfp = fopen("@TERMUX_PREFIX@/etc/resolv.conf", "r");
+               if(!myfp)
+                       return LDNS_STATUS_FILE_ERR;
+       }