From 1d248adb32a0b97637083c83f3af70966050dd1e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 8 May 2017 11:47:28 +0200 Subject: gnu: perl-net-dns-resolver-programmable: Shorten patch file name. This avoids a warning from GNU tar upon "make dist" about file names that are too long for POSIX tar. * gnu/packages/patches/perl-net-dns-resolver-programmable-Fix-broken-interface.patch: Rename to... * gnu/packages/patches/perl-net-dns-resolver-programmable-fix.patch: ... this. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/networking.scm (perl-net-dns-resolver-programmable)[source]: Likewise. --- gnu/local.mk | 2 +- gnu/packages/networking.scm | 3 +-- ...esolver-programmable-Fix-broken-interface.patch | 30 ---------------------- .../perl-net-dns-resolver-programmable-fix.patch | 30 ++++++++++++++++++++++ 4 files changed, 32 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/perl-net-dns-resolver-programmable-Fix-broken-interface.patch create mode 100644 gnu/packages/patches/perl-net-dns-resolver-programmable-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index dcf9b14cec..55abf5c888 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -867,7 +867,7 @@ dist_patch_DATA = \ %D%/packages/patches/perl-io-socket-ssl-openssl-1.0.2f-fix.patch \ %D%/packages/patches/perl-net-amazon-s3-moose-warning.patch \ %D%/packages/patches/perl-net-ssleay-disable-ede-test.patch \ - %D%/packages/patches/perl-net-dns-resolver-programmable-Fix-broken-interface.patch \ + %D%/packages/patches/perl-net-dns-resolver-programmable-fix.patch \ %D%/packages/patches/perl-no-sys-dirs.patch \ %D%/packages/patches/perl-module-pluggable-search.patch \ %D%/packages/patches/perl-reproducible-build-date.patch \ diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f0d5bb75bf..94152226da 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -727,8 +727,7 @@ (define-public perl-net-dns-resolver-programmable (base32 "1v3nl2kaj4fs55n1617n53q8sa3mir06898vpy1rq98zjih24h4d")) (patches - (search-patches - "perl-net-dns-resolver-programmable-Fix-broken-interface.patch")))) + (search-patches "perl-net-dns-resolver-programmable-fix.patch")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) diff --git a/gnu/packages/patches/perl-net-dns-resolver-programmable-Fix-broken-interface.patch b/gnu/packages/patches/perl-net-dns-resolver-programmable-Fix-broken-interface.patch deleted file mode 100644 index 371693dca1..0000000000 --- a/gnu/packages/patches/perl-net-dns-resolver-programmable-Fix-broken-interface.patch +++ /dev/null @@ -1,30 +0,0 @@ -perl-net-dns-resolver-programmable used the undocumented and internal -method Net::DNS::rcodesbyname [0], and that interface is no longer -exposed. - -This patch, copied from [1], makes the program check for the existence -of the method before trying to use it. - -[0] - - -[1] - - -diff --git a/lib/Net/DNS/Resolver/Programmable.pm b/lib/Net/DNS/Resolver/Programmable.pm -index 1af72ce..e09a2f0 100644 ---- a/lib/Net/DNS/Resolver/Programmable.pm -+++ b/lib/Net/DNS/Resolver/Programmable.pm -@@ -203,8 +203,10 @@ sub send { - if (defined(my $resolver_code = $self->{resolver_code})) { - ($result, $aa, @answer_rrs) = $resolver_code->($domain, $rr_type, $class); - } -- -- if (not defined($result) or defined($Net::DNS::rcodesbyname{$result})) { -+ -+ if (not defined($result) -+ or defined($Net::DNS::Parameters::rcodebyname{$result}) -+ or defined($Net::DNS::rcodesbyname{$result})) { - # Valid RCODE, return a packet: - - $aa = TRUE if not defined($aa); diff --git a/gnu/packages/patches/perl-net-dns-resolver-programmable-fix.patch b/gnu/packages/patches/perl-net-dns-resolver-programmable-fix.patch new file mode 100644 index 0000000000..371693dca1 --- /dev/null +++ b/gnu/packages/patches/perl-net-dns-resolver-programmable-fix.patch @@ -0,0 +1,30 @@ +perl-net-dns-resolver-programmable used the undocumented and internal +method Net::DNS::rcodesbyname [0], and that interface is no longer +exposed. + +This patch, copied from [1], makes the program check for the existence +of the method before trying to use it. + +[0] + + +[1] + + +diff --git a/lib/Net/DNS/Resolver/Programmable.pm b/lib/Net/DNS/Resolver/Programmable.pm +index 1af72ce..e09a2f0 100644 +--- a/lib/Net/DNS/Resolver/Programmable.pm ++++ b/lib/Net/DNS/Resolver/Programmable.pm +@@ -203,8 +203,10 @@ sub send { + if (defined(my $resolver_code = $self->{resolver_code})) { + ($result, $aa, @answer_rrs) = $resolver_code->($domain, $rr_type, $class); + } +- +- if (not defined($result) or defined($Net::DNS::rcodesbyname{$result})) { ++ ++ if (not defined($result) ++ or defined($Net::DNS::Parameters::rcodebyname{$result}) ++ or defined($Net::DNS::rcodesbyname{$result})) { + # Valid RCODE, return a packet: + + $aa = TRUE if not defined($aa); -- cgit v1.2.3