Fix a couple of FTBFS issues
- Fix broken POD (CPAN RT#86060) - Work around test suite failures with Net::DNS ≥ 0.68 (CPAN RT#78214)
This commit is contained in:
parent
a4e70ce9b2
commit
114c74b817
17
Mail-SPF-v2.8.0-POD.patch
Normal file
17
Mail-SPF-v2.8.0-POD.patch
Normal file
@ -0,0 +1,17 @@
|
||||
https://rt.cpan.org/Public/Bug/Display.html?id=86060
|
||||
|
||||
--- lib/Mail/SPF/Util.pm
|
||||
+++ lib/Mail/SPF/Util.pm
|
||||
@@ -155,9 +155,9 @@ sub ipv6_address_is_ipv4_mapped {
|
||||
throws I<Mail::SPF::EInvalidOptionValue>
|
||||
|
||||
Returns the given I<NetAddr::IP> IPv4 or IPv6 address compactly formatted as a
|
||||
-I<string>. For IPv4 addresses, this is equivalent to calling L< NetAddr::IP's
|
||||
-C<addr> |NetAddr::IP/addr> method. For IPv6 addresses, this is equivalent to
|
||||
-calling L< NetAddr::IP's C<short> |NedAddr::IP/short> method. Throws a
|
||||
+I<string>. For IPv4 addresses, this is equivalent to calling L<NetAddr::IP's
|
||||
+C<addr>|NetAddr::IP/addr> method. For IPv6 addresses, this is equivalent to
|
||||
+calling L<NetAddr::IP's C<short>|NetAddr::IP/short> method. Throws a
|
||||
I<Mail::SPF::EInvalidOptionValue> exception if the specified object is not a
|
||||
I<NetAddr::IP> IPv4 or IPv6 address object.
|
||||
|
62
Mail-SPF-v2.8.0-testsuite.patch
Normal file
62
Mail-SPF-v2.8.0-testsuite.patch
Normal file
@ -0,0 +1,62 @@
|
||||
Drop tests that fail with Net::DNS ≥ 0.68 due to that module's
|
||||
sanitization of domain names
|
||||
|
||||
https://rt.cpan.org/Ticket/Display.html?id=78214
|
||||
|
||||
--- t/rfc4408-tests.yml
|
||||
+++ t/rfc4408-tests.yml
|
||||
@@ -20,16 +20,6 @@
|
||||
---
|
||||
description: Initial processing
|
||||
tests:
|
||||
- toolonglabel:
|
||||
- description: >-
|
||||
- DNS labels limited to 63 chars.
|
||||
- comment: >-
|
||||
- For initial processing, a long label results in None, not TempError
|
||||
- spec: 4.3/1
|
||||
- helo: mail.example.net
|
||||
- host: 1.2.3.5
|
||||
- mailfrom: lyme.eater@A123456789012345678901234567890123456789012345678901234567890123.example.com
|
||||
- result: none
|
||||
longlabel:
|
||||
description: >-
|
||||
DNS labels limited to 63 chars.
|
||||
@@ -360,21 +350,6 @@ tests:
|
||||
host: 1.2.3.4
|
||||
mailfrom: foo@t9.example.com
|
||||
result: permerror
|
||||
- invalid-domain-empty-label:
|
||||
- description: >-
|
||||
- target-name that is a valid domain-spec per RFC 4408 but an invalid
|
||||
- domain name per RFC 1035 (empty label) must be treated as non-existent.
|
||||
- comment: >-
|
||||
- An empty domain label, i.e. two successive dots, in a mechanism
|
||||
- target-name is valid domain-spec syntax, even though a DNS query cannot
|
||||
- be composed from it. The spec being unclear about it, this could either
|
||||
- be considered a syntax error, or, by analogy to 4.3/1 and 5/10/3, the
|
||||
- mechanism chould be treated as a no-match.
|
||||
- spec: [4.3/1, 5/10/3]
|
||||
- helo: mail.example.com
|
||||
- host: 1.2.3.4
|
||||
- mailfrom: foo@t10.example.com
|
||||
- result: [permerror, fail]
|
||||
invalid-domain-long:
|
||||
description: >-
|
||||
target-name that is a valid domain-spec per RFC 4408 but an invalid
|
||||
@@ -1776,15 +1751,6 @@ tests:
|
||||
host: 192.168.218.40
|
||||
mailfrom: test@e1.example.com
|
||||
result: permerror
|
||||
- macro-mania-in-domain:
|
||||
- description: >-
|
||||
- macro-encoded percents (%%), spaces (%_), and URL-percent-encoded
|
||||
- spaces (%-)
|
||||
- spec: 8.1/3, 8.1/4
|
||||
- helo: mail.example.com
|
||||
- host: 1.2.3.4
|
||||
- mailfrom: test@e1a.example.com
|
||||
- result: pass
|
||||
exp-txt-macro-char:
|
||||
spec: 8.1/20
|
||||
description: >-
|
@ -1,12 +1,14 @@
|
||||
Name: perl-Mail-SPF
|
||||
Version: 2.8.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Object-oriented implementation of Sender Policy Framework
|
||||
License: BSD
|
||||
Group: Development/Libraries
|
||||
URL: http://search.cpan.org/dist/Mail-SPF/
|
||||
Source0: http://www.cpan.org/authors/id/J/JM/JMEHNLE/mail-spf/Mail-SPF-v%{version}.tar.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Patch0: Mail-SPF-v2.8.0-POD.patch
|
||||
Patch1: Mail-SPF-v2.8.0-testsuite.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
|
||||
BuildArch: noarch
|
||||
BuildRequires: perl(base)
|
||||
BuildRequires: perl(constant)
|
||||
@ -32,6 +34,12 @@ Mail::SPF is an object-oriented implementation of Sender Policy Framework
|
||||
%prep
|
||||
%setup -q -n Mail-SPF-v%{version}
|
||||
|
||||
# Fix broken POD (CPAN RT#86060)
|
||||
%patch0
|
||||
|
||||
# Work around test suite failures with Net::DNS ≥ 0.68 (CPAN RT#78214)
|
||||
%patch1
|
||||
|
||||
chmod -x bin/* sbin/*
|
||||
|
||||
%build
|
||||
@ -61,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%changelog
|
||||
* Fri Jun 28 2013 Paul Howarth <paul@city-fan.org> - 2.8.0-3
|
||||
- Fix broken POD (CPAN RT#86060)
|
||||
- Work around test suite failures with Net::DNS ≥ 0.68 (CPAN RT#78214)
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user