437681 remove previous patch and use upstream patch, which should solve all

problems with noisy logs.
This commit is contained in:
Marcela Mašláňová 2008-05-12 09:54:37 +00:00
parent fcb201ea03
commit c7f4ed6bfc
2 changed files with 46 additions and 2 deletions

View File

@ -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;
}

View File

@ -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 <mmaslano@redhat.com> - 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 <tcallawa@redhat.com> - 0.63-3
- fix patch to not require Socket6