[arch-commits] Commit in gresolver/trunk (PKGBUILD ldns.patch)

[Sergej Pupykin]

    Date: Monday, March 11, 2013 @ 11:26:40
  Author: spupykin
Revision: 86010

upgpkg: gresolver 0.0.5-8

upd

Added:
  gresolver/trunk/ldns.patch
Modified:
  gresolver/trunk/PKGBUILD

------------+
 PKGBUILD   |   12 +++++++-----
 ldns.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-11 08:47:43 UTC (rev 86009)
+++ PKGBUILD	2013-03-11 10:26:40 UTC (rev 86010)
@@ -4,21 +4,23 @@
 
 pkgname=gresolver
 pkgver=0.0.5
-pkgrel=7
+pkgrel=8
 pkgdesc="A graphical frontend for dig"
 arch=('any')
 license=('GPL')
 url="http://jodrell.net/projects/gresolver"
-depends=('gtk2-perl' 'perl-locale-gettext' 'perl-net-ipv6addr' 'dnsutils' 'glade-perl' 'perl-net-ipv4addr')
-#source=(http://jodrell.net/files/unsupported/gresolver/gresolver-$pkgver.tar.gz
+depends=('gtk2-perl' 'perl-locale-gettext' 'perl-net-ipv6addr' 'ldns' 'glade-perl' 'perl-net-ipv4addr')
 source=(http://arch.p5n.pp.ru/~sergej/dl/2012/gresolver-$pkgver.tar.gz
-        desktop.patch)
+	desktop.patch
+	ldns.patch)
 md5sums=('092adb0206423118357a93ce3f14afb1'
-         'db1e194234b66a6ab7cc7d0757471516')
+         'db1e194234b66a6ab7cc7d0757471516'
+         '7cb3789ab5d7642924637507cdaac75d')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   patch -p1 -i ../desktop.patch
+  patch -p1 -i ../ldns.patch
   ./configure --prefix=/usr
   make
 }

Added: ldns.patch
===================================================================
--- ldns.patch	                        (rev 0)
+++ ldns.patch	2013-03-11 10:26:40 UTC (rev 86010)
@@ -0,0 +1,42 @@
+diff -wbBur gresolver-0.0.5/gresolver.pl gresolver-0.0.5.my/gresolver.pl
+--- gresolver-0.0.5/gresolver.pl	2006-01-30 23:54:10.000000000 +0300
++++ gresolver-0.0.5.my/gresolver.pl	2013-03-11 14:21:00.183262791 +0400
+@@ -63,7 +63,7 @@
+ 	$DIG = $OPTIONS->{dig};
+ 
+ } else {
+-	chomp($DIG = `which dig 2>/dev/null`);
++	chomp($DIG = `which drill 2>/dev/null`);
+ 
+ }
+ 
+@@ -410,7 +410,7 @@
+ sub get_dig_version {
+ 	my $version;
+ 	# an un-argumented call to dig returns the root hints from the default server;
+-	if (!open(DIG, "\"$DIG\"|")) {
++	if (!open(DIG, "\"$DIG\" -v|")) {
+ 		print STDERR "Cannot pipe from '$DIG': $!\n";
+ 		exit 1;
+ 
+@@ -421,16 +421,16 @@
+ 		my $line = <DIG>;
+ 		close(DIG);
+ 
+-		if ($line =~ /DiG ([\d\.]+)/) {
++		if ($line =~ /drill version ([\d\.]+)/) {
+ 			$version = $1;
++		}
++	}
+ 
+-		} else {
++	if(!defined $version) {
+ 			print STDERR "Error parsing version output from dig, got:\n\t$line\n";
+ 			exit 1;
+ 		}
+ 
+-	}
+-
+ 	return split(/\./, $version, 3);
+ }
+