From 0b02bc9db6058898549acb7d251baaacf54f905e Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Thu, 17 Sep 2009 15:36:57 +0000 Subject: [PATCH] 0.65 --- .cvsignore | 2 +- perl-Net-DNS-bz437681.patch | 24 ---------------------- perl-Net-DNS-upstream.patch | 40 ------------------------------------- perl-Net-DNS.spec | 9 +++++---- sources | 2 +- 5 files changed, 7 insertions(+), 70 deletions(-) delete mode 100644 perl-Net-DNS-bz437681.patch delete mode 100644 perl-Net-DNS-upstream.patch diff --git a/.cvsignore b/.cvsignore index 7968293..e31049f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Net-DNS-0.63.tar.gz +Net-DNS-0.65.tar.gz diff --git a/perl-Net-DNS-bz437681.patch b/perl-Net-DNS-bz437681.patch deleted file mode 100644 index 5a5887b..0000000 --- a/perl-Net-DNS-bz437681.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up Net-DNS-0.63/lib/Net/DNS/Resolver/Base.pm.BAD Net-DNS-0.63/lib/Net/DNS/Resolver/Base.pm ---- Net-DNS-0.63/lib/Net/DNS/Resolver/Base.pm.BAD 2008-04-09 10:19:50.000000000 -0400 -+++ Net-DNS-0.63/lib/Net/DNS/Resolver/Base.pm 2008-04-09 10:20:15.000000000 -0400 -@@ -62,7 +62,7 @@ BEGIN { - # INET6 prior to 2.01 will not work; sorry. - eval {require IO::Socket::INET6; IO::Socket::INET6->VERSION("2.00");} - ) { -- import Socket6; -+ Socket6->import(qw(getaddrinfo)); - $has_inet6=1; - }else{ - $has_inet6=0; -diff -up Net-DNS-0.63/lib/Net/DNS/Nameserver.pm.BAD Net-DNS-0.63/lib/Net/DNS/Nameserver.pm ---- Net-DNS-0.63/lib/Net/DNS/Nameserver.pm.BAD 2008-04-09 10:23:49.000000000 -0400 -+++ Net-DNS-0.63/lib/Net/DNS/Nameserver.pm 2008-04-09 10:31:14.000000000 -0400 -@@ -33,7 +33,7 @@ BEGIN { - } elsif ( eval {require Socket6;} && - # INET6 earlier than V2.01 will not work; sorry. - eval {require IO::Socket::INET6; IO::Socket::INET6->VERSION("2.01");} ) { -- import Socket6; -+ import IO::Socket::INET6; - $has_inet6 = 1; - } else { - $has_inet6=0; diff --git a/perl-Net-DNS-upstream.patch b/perl-Net-DNS-upstream.patch deleted file mode 100644 index db0d3e1..0000000 --- a/perl-Net-DNS-upstream.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -up Net-DNS-0.63/lib/Net/DNS.pm.old Net-DNS-0.63/lib/Net/DNS.pm ---- Net-DNS-0.63/lib/Net/DNS.pm.old 2008-02-08 16:25:54.000000000 +0100 -+++ Net-DNS-0.63/lib/Net/DNS.pm 2008-05-12 10:26:14.000000000 +0200 -@@ -38,17 +38,32 @@ use vars qw( - - - BEGIN { -- require DynaLoader; -- require Exporter; -- @ISA = qw(Exporter DynaLoader); - -+ require Exporter; -+ @ISA = qw(Exporter ); -+# these need to live here because of dependencies further on. -+ @EXPORT = qw(mx yxrrset nxrrset yxdomain nxdomain rr_add rr_del); -+ @EXPORT_OK= qw(name2labels wire2presentation rrsort stripdot); - - $VERSION = '0.63'; - $SVNVERSION = (qw$LastChangedRevision: 710 $)[1]; - - $HAVE_XS = eval { - local $SIG{'__DIE__'} = 'DEFAULT'; -- __PACKAGE__->bootstrap(); 1 -+ -+ -+ eval { -+ require XSLoader; -+ XSLoader::load('Net::DNS', $VERSION); -+ 1; -+ } or do { -+ -+ require DynaLoader; -+ push @ISA, 'DynaLoader'; -+ bootstrap Net::DNS $VERSION; -+ 1; -+ }; -+ - } ? 1 : 0; - - } diff --git a/perl-Net-DNS.spec b/perl-Net-DNS.spec index 4a00f80..8fda285 100644 --- a/perl-Net-DNS.spec +++ b/perl-Net-DNS.spec @@ -1,12 +1,11 @@ Name: perl-Net-DNS -Version: 0.63 -Release: 6%{?dist} +Version: 0.65 +Release: 1%{?dist} Summary: DNS resolver modules for Perl License: GPL+ or Artistic Group: Development/Libraries URL: http://www.net-dns.org/ Source0: http://www.cpan.org/authors/id/O/OL/OLAF/Net-DNS-%{version}.tar.gz -Patch0: perl-Net-DNS-upstream.patch BuildRequires: perl(Digest::HMAC), perl(ExtUtils::MakeMaker), perl(Test::More), perl(Net::IP) BuildRequires: perl(Test::Pod) BuildRequires: perl(Digest::BubbleBabble) @@ -36,7 +35,6 @@ objects. %prep %setup -q -n Net-DNS-%{version} -%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor --no-online-tests @@ -82,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 17 2009 Warren Togami - 0.65-1 +- 0.65 + * Sun Jul 26 2009 Fedora Release Engineering - 0.63-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 894ac13..d8d388e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c46aad24af44d424a972bb59c3aa5f37 Net-DNS-0.63.tar.gz +54e5a12a20de39b954a93723927ac789 Net-DNS-0.65.tar.gz