development/ldns: Updated for version 1.7.0

Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>

4 files changed, 13 insertions, 42 deletions

diff --git a/development/ldns/ldns-config-libversion.patch b/development/ldns/ldns-config-libversion.patch
deleted file mode 100644
index 87ed867434..0000000000
--- a/development/ldns/ldns-config-libversion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur ldns-1.6.17.orig/packaging/ldns-config.in ldns-1.6.17/packaging/ldns-config.in
---- ldns-1.6.17.orig/packaging/ldns-config.in	2014-01-10 21:04:41.000000000 +0000
-+++ ldns-1.6.17/packaging/ldns-config.in	2016-08-15 02:32:32.794747069 +0000
-@@ -9,7 +9,7 @@
- LIBS="@LIBS@ @LIBSSL_LIBS@"
- LIBDIR="@libdir@"
- INCLUDEDIR="@includedir@"
--LIBVERSION="@LIBLDNS_CURRENT@.@LIBLDNS_REVISION@.@LIBLDNS_AGE@"
-+LIBVERSION="@PACKAGE_VERSION@"
- 
- for arg in $@
- do
diff --git a/development/ldns/ldns.SlackBuild b/development/ldns/ldns.SlackBuild
index 8665d7afd4..d6dbc7585d 100644
--- a/development/ldns/ldns.SlackBuild
+++ b/development/ldns/ldns.SlackBuild
@@ -3,7 +3,7 @@
 # Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
 # Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN  USA
 # Copyright 2010,  R. Andrew Bailey, Chantilly, VA  USA
-# Copyright 2014-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -34,13 +34,13 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=ldns
-VERSION=${VERSION:-1.6.17}
+VERSION=${VERSION:-1.7.0}
 TAG=${TAG:-_SBo}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -51,8 +51,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -80,11 +80,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix manpage building with perl-5.22 (thanks to Arch Linux)
-patch -p1 < $CWD/perl-recent.patch
-# Fix ldns-config.
-patch -p1 < $CWD/ldns-config-libversion.patch
-
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -96,10 +91,10 @@ CFLAGS="$SLKCFLAGS" \
   --disable-static \
   --enable-rrtype-ninfo \
   --enable-rrtype-rkey \
-  --enable-rrtype-cds \
-  --enable-rrtype-uri \
   --enable-rrtype-ta \
+  --enable-rrtype-avc \
   --disable-rpath \
+  --disable-dane-verify \
   --with-drill \
   --with-examples \
   --with-pyldns \
@@ -136,7 +131,7 @@ mkdir -p $PKG/$(find /usr/share/vim -type d -name "vim[0-9]*")/syntax
 install -m 0644 libdns.vim \
   $PKG/$(find /usr/share/vim -type d -name "vim[0-9]*")/syntax/$PRGNAM.vim
 
-find $PKG/usr/man -type f -exec chmod 0644 {} \;
+find $PKG -type f -perm 444 -exec chmod 0644 '{}' \;
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 find $PKG -name "LDNS.so" -exec chmod 0755 {} \;
 
diff --git a/development/ldns/ldns.info b/development/ldns/ldns.info
index 2b7dfc202a..82d61d381c 100644
--- a/development/ldns/ldns.info
+++ b/development/ldns/ldns.info
@@ -1,12 +1,12 @@
 PRGNAM="ldns"
-VERSION="1.6.17"
+VERSION="1.7.0"
 HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-DOWNLOAD="http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.17.tar.gz \
+DOWNLOAD="http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.0.tar.gz \
           https://data.iana.org/root-anchors/root-anchors.xml"
-MD5SUM="a79423bcc4129e6d59b616b1cae11e5e \
+MD5SUM="74b75c9ba69fb3af2a0c26244ecfd9f6 \
         69e6f9b67e92fbc952d488cc6f67198f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="perl-Test-Exception perl-Devel-CheckLib"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja@gmail.com"
diff --git a/development/ldns/perl-recent.patch b/development/ldns/perl-recent.patch
deleted file mode 100644
index ddf711cef5..0000000000
--- a/development/ldns/perl-recent.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur old/doc/doxyparse.pl new/doc/doxyparse.pl
---- old/doc/doxyparse.pl	2014-01-11 06:04:41.000000000 +0900
-+++ new/doc/doxyparse.pl	2015-08-08 22:29:34.216889652 +0900
-@@ -273,7 +273,7 @@
- 
- 	print MAN $MAN_MIDDLE;
- 
--	if (defined(@$also)) {
-+	if (@$also) {
- 		print MAN "\n.SH SEE ALSO\n\\fI";
- 		print MAN join "\\fR, \\fI", @$also;
- 		print MAN "\\fR.\nAnd ";