From c7f4ed6bfcde783d9b167cd50f6064cc9880dde9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Mon, 12 May 2008 09:54:37 +0000 Subject: [PATCH] 437681 remove previous patch and use upstream patch, which should solve all problems with noisy logs. --- perl-Net-DNS-upstream.patch | 40 +++++++++++++++++++++++++++++++++++++ perl-Net-DNS.spec | 8 ++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 perl-Net-DNS-upstream.patch diff --git a/perl-Net-DNS-upstream.patch b/perl-Net-DNS-upstream.patch new file mode 100644 index 0000000..db0d3e1 --- /dev/null +++ b/perl-Net-DNS-upstream.patch @@ -0,0 +1,40 @@ +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 c46a06c..2fb555b 100644 --- a/perl-Net-DNS.spec +++ b/perl-Net-DNS.spec @@ -1,12 +1,12 @@ Name: perl-Net-DNS Version: 0.63 -Release: 3%{?dist} +Release: 4%{?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-bz437681.patch +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) @@ -82,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 12 2008 Marcela Maslanova - 0.63-4 +- 437681 remove previous patch and use upstream patch, which should solve + all problems with noisy logs. + * Wed Apr 9 2008 Tom "spot" Callaway - 0.63-3 - fix patch to not require Socket6