lib32-ldns: update to 1.7.1

3 files changed, 6 insertions, 75 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ddc29175247d..9ba949b1fabd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lib32-ldns
 	pkgdesc = Fast DNS library supporting recent RFCs (32-bit)
-	pkgver = 1.7.0
+	pkgver = 1.7.1
 	pkgrel = 1
 	url = https://www.nlnetlabs.nl/projects/ldns/
 	arch = x86_64
@@ -8,10 +8,8 @@ pkgbase = lib32-ldns
 	makedepends = lib32-libpcap
 	depends = lib32-openssl
 	depends = ldns
-	source = https://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.0.tar.gz
-	source = pc.patch
-	sha256sums = c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc
-	sha256sums = 3586302eed28269c7fa6013785c0a017689aa9d4ff24ff8d7735fa23a3732cb7
+	source = https://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz
+	sha256sums = 8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229
 
 pkgname = lib32-ldns
 
diff --git a/PKGBUILD b/PKGBUILD
index 262a58818efc..a05126e25f30 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=ldns
 pkgname=lib32-${_pkgname}
-pkgver=1.7.0
+pkgver=1.7.1
 pkgrel=1
 pkgdesc='Fast DNS library supporting recent RFCs (32-bit)'
 url='https://www.nlnetlabs.nl/projects/ldns/'
@@ -10,15 +10,8 @@ license=('custom:BSD')
 arch=('x86_64')
 depends=('lib32-openssl' 'ldns')
 makedepends=('lib32-libpcap')
-source=("https://www.nlnetlabs.nl/downloads/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
-        'pc.patch')
-sha256sums=('c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc'
-            '3586302eed28269c7fa6013785c0a017689aa9d4ff24ff8d7735fa23a3732cb7')
-
-prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/pc.patch"
-}
+source=("https://www.nlnetlabs.nl/downloads/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
+sha256sums=('8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229')
 
 build() {
   export CC='gcc -m32'
diff --git a/pc.patch b/pc.patch
deleted file mode 100644
index a37b1c376f38..000000000000
--- a/pc.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2a38f26ed5695c3ad737de082b56a296240dd51a Mon Sep 17 00:00:00 2001
-From: Willem Toorop <willem@nlnetlabs.nl>
-Date: Thu, 19 Jan 2017 09:41:51 +0100
-Subject: bugfix #1209: make install ldns.pc file
-
----
- Changelog   |  4 ++++
- Makefile.in | 16 ++++++++++++++--
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/Changelog b/Changelog
-index 0bd3658..efda95e 100644
---- a/Changelog
-+++ b/Changelog
-@@ -1,3 +1,7 @@
-+1.7.1	????-??-??
-+	* bugfix #1209: make install ldns.pc file
-+	  Thanks Oleksandr Natalenko
-+
- 1.7.0	2016-12-20
- 	* Fix lookup of relative names in ldns_resolver_search.
- 	* bugfix #548: Double free for answers > 4096 in ldns_resolver_send_pkt
-diff --git a/Makefile.in b/Makefile.in
-index 04f683b..853777e 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -308,9 +308,9 @@ clean-p5-dns-ldns: $(p5_dns_ldns_dir)/Makefile
- test-p5-dns-ldns: $(p5_dns_ldns_dir)/Makefile
- 	cd $(p5_dns_ldns_dir); $(MAKE) test
- 
--install: install-h install-lib @INSTALL_CONFIG@ install-manpages $(pyldns_inst) $(pyldnsx_inst) @INSTALL_P5_DNS_LDNS@ @INSTALL_DRILL@ @INSTALL_EXAMPLES@
-+install: install-h install-lib install-pc @INSTALL_CONFIG@ install-manpages $(pyldns_inst) $(pyldnsx_inst) @INSTALL_P5_DNS_LDNS@ @INSTALL_DRILL@ @INSTALL_EXAMPLES@
- 
--uninstall: uninstall-manpages @UNINSTALL_CONFIG@ uninstall-h uninstall-lib $(pyldns_uninst) $(pyldnsx_uninst) @UNINSTALL_P5_DNS_LDNS@ @UNINSTALL_DRILL@ @UNINSTALL_EXAMPLES@
-+uninstall: uninstall-manpages @UNINSTALL_CONFIG@ uninstall-h uninstall-lib uninstall-pc $(pyldns_uninst) $(pyldnsx_uninst) @UNINSTALL_P5_DNS_LDNS@ @UNINSTALL_DRILL@ @UNINSTALL_EXAMPLES@
- 
- destclean: uninstall
- 
-@@ -355,6 +355,18 @@ uninstall-h:
- 	test ! -d $(DESTDIR)$(includedir)/ldns || rmdir -p $(DESTDIR)$(includedir)/ldns || echo "ok, dir already gone"
- 	exit 0
- 
-+packaging/libldns.pc: packaging/libldns.pc.in
-+	./config.status $@
-+
-+install-pc: packaging/libldns.pc
-+	$(INSTALL) -m 644 packaging/libldns.pc $(DESTDIR)$(libdir)/pkgconfig/ldns.pc
-+
-+uninstall-pc:
-+	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/pkgconfig/ldns.pc
-+	test ! -d $(DESTDIR)$(libdir)/pkgconfig || rmdir -p $(DESTDIR)$(libdir)/pkgconfig || echo "ok, dir already gone"
-+	test ! -d $(DESTDIR)$(libdir) || rmdir -p $(DESTDIR)$(libdir) || echo "ok, dir already gone"
-+
-+	
- install-lib: lib
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
- 	$(LIBTOOL) --mode=install cp libldns.la $(DESTDIR)$(libdir)
--- 
-cgit v0.11.2
-