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

[Sergej Pupykin]

    Date: Monday, March 11, 2013 @ 11:37:42
  Author: spupykin
Revision: 86018

upgpkg: gresolver 0.0.5-9

upd

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

------------+
 PKGBUILD   |    4 ++--
 ldns.patch |   28 +++++++++++++++-------------
 2 files changed, 17 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-11 10:27:49 UTC (rev 86017)
+++ PKGBUILD	2013-03-11 10:37:42 UTC (rev 86018)
@@ -4,7 +4,7 @@
 
 pkgname=gresolver
 pkgver=0.0.5
-pkgrel=8
+pkgrel=9
 pkgdesc="A graphical frontend for dig"
 arch=('any')
 license=('GPL')
@@ -15,7 +15,7 @@
 	ldns.patch)
 md5sums=('092adb0206423118357a93ce3f14afb1'
          'db1e194234b66a6ab7cc7d0757471516'
-         '7cb3789ab5d7642924637507cdaac75d')
+         '20c87c1098944cdf4146a478532c732d')
 
 build() {
   cd $srcdir/$pkgname-$pkgver

Modified: ldns.patch
===================================================================
--- ldns.patch	2013-03-11 10:27:49 UTC (rev 86017)
+++ ldns.patch	2013-03-11 10:37:42 UTC (rev 86018)
@@ -1,6 +1,6 @@
 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
++++ gresolver-0.0.5.my/gresolver.pl	2013-03-11 14:35:30.336586368 +0400
 @@ -63,7 +63,7 @@
  	$DIG = $OPTIONS->{dig};
  
@@ -10,7 +10,7 @@
  
  }
  
-@@ -410,7 +410,7 @@
+@@ -410,25 +410,22 @@
  sub get_dig_version {
  	my $version;
  	# an un-argumented call to dig returns the root hints from the default server;
@@ -19,24 +19,26 @@
  		print STDERR "Cannot pipe from '$DIG': $!\n";
  		exit 1;
  
-@@ -421,16 +421,16 @@
+ 	} else {
+-		# ignore the first line:
+-		<DIG>;
+-		# capture the next line:
  		my $line = <DIG>;
  		close(DIG);
  
 -		if ($line =~ /DiG ([\d\.]+)/) {
-+		if ($line =~ /drill version ([\d\.]+)/) {
++		if ($line =~ /drill version ([\d\.]+) /) {
  			$version = $1;
+-
+-		} else {
+-			print STDERR "Error parsing version output from dig, got:\n\t$line\n";
+-			exit 1;
 +		}
-+	}
+ 		}
  
--		} else {
 +	if(!defined $version) {
- 			print STDERR "Error parsing version output from dig, got:\n\t$line\n";
- 			exit 1;
- 		}
++			print STDERR "Error parsing version output from dig\n";
++			exit 1;
+ 	}
  
--	}
--
  	return split(/\./, $version, 3);
- }
-