[SCM] Debian packaging of libmail-checkuser-perl branch, master, updated. debian/1.21-1.1-16-gfdfa462
Florian Schlichting
fschlich at zedat.fu-berlin.de
Thu Mar 8 20:08:57 UTC 2012
The following commit has been merged in the master branch:
commit 8001b0595de9223475e73d5100f39da52d076d03
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date: Thu Mar 8 20:13:35 2012 +0100
Added four patches to fix failing tests, mostly picked from upstream RT
PREREQ_PM beyond are in CORE
diff --git a/debian/changelog b/debian/changelog
index d84ccc1..d3c5b3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,6 @@
libmail-checkuser-perl (1.21-2) UNRELEASED; urgency=low
[ Fabrizio Regalli ]
- TODO:
- - d/control:
- - the package FTBFS with "Can't locate Net/DNS.pm" --> add libnet-dns-perl
- to Build-Depends-Indep; not sure if the other tests pass afterwards :)
- - please check: Makefile.PL has quite some PREREQ_PM; I'd be surprised if
- they were not needed in Depends (and maybe also in B-D-I?)
- after that: please check if the package builds without internet access
* Take over (see http://lists.debian.org/debian-perl/2011/07/msg00003.html).
@@ -27,7 +21,12 @@ libmail-checkuser-perl (1.21-2) UNRELEASED; urgency=low
* debian/copyright: Replace DEP5 Format-Specification URL from
svn.debian.org to anonscm.debian.org URL.
- -- Fabrizio Regalli <fabreg at fabreg.it> Sat, 02 Jul 2011 01:40:44 +0200
+ [ Florian Schlichting ]
+ * Picked update_wildcard_mx_records.patch from upstream RT to update
+ embedded list of MX and A records; added 3 more patches to fix failing
+ tests.
+
+ -- Florian Schlichting <fschlich at zedat.fu-berlin.de> Thu, 08 Mar 2012 20:10:35 +0100
libmail-checkuser-perl (1.21-1.1) unstable; urgency=low
diff --git a/debian/patches/change_failing_smtp_test.patch b/debian/patches/change_failing_smtp_test.patch
new file mode 100644
index 0000000..80e0a8e
--- /dev/null
+++ b/debian/patches/change_failing_smtp_test.patch
@@ -0,0 +1,15 @@
+Description: fix test failure by switching from hotmail.com to an email
+ server that fails transparently for Mail::CheckUser.
+Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
+
+--- a/t/smtp.t
++++ b/t/smtp.t
+@@ -8,7 +8,7 @@
+ $Mail::CheckUser::Timeout = 120;
+
+ @ok_emails = qw(m_ilya at agava.com brokenmx at yhoo.com);
+- at bad_emails = qw(unknown at for.bar freghreucew at hotmail.com);
++ at bad_emails = qw(unknown at for.bar freghreucew12 at zedat.fu-berlin.de);
+
+ start(scalar(@ok_emails) + scalar(@bad_emails));
+
diff --git a/debian/patches/delete_failing_wildcard_tests.patch b/debian/patches/delete_failing_wildcard_tests.patch
new file mode 100644
index 0000000..851eeab
--- /dev/null
+++ b/debian/patches/delete_failing_wildcard_tests.patch
@@ -0,0 +1,20 @@
+Description: some TLDs changed their wildcard behaviour, delete them
+ from test (this list keeps changing, you may want to re-check)
+Origin: https://rt.cpan.org/Public/Bug/Display.html?id=59399
+
+--- a/t/wildcard.t
++++ b/t/wildcard.t
+@@ -13,13 +13,9 @@
+ bogus at pqpqpqp-wildcard-qpqpqpqpqpq.com
+ bogus at pqpqpqp-wildcard-qpqpqpqpqpq.net
+ bogus at pqpqpqp-wildcard-qpqpqpqpqpq.nu
+- bogus at pqpqpqp-wildcard-qpqpqpqpqpq.tk
+ bogus at pqpqpqp-wildcard-qpqpqpqpqpq.cc
+- bogus at pqpqpqp-wildcard-qpqpqpqpqpq.mp
+- bogus at pqpqpqp-wildcard-qpqpqpqpqpq.ws
+ bogus at pqpqpqp-wildcard-qpqpqpqpqpq.sh
+ bogus at pqpqpqp-wildcard-qpqpqpqpqpq.pw
+- bogus at pqpqpqp-wildcard-qpqpqpqpqpq.ph
+ bogus at pqpqpqp-wildcard-qpqpqpqpqpq.ba
+ |;
+
diff --git a/debian/patches/fix_smtp-taint.patch b/debian/patches/fix_smtp-taint.patch
new file mode 100644
index 0000000..25d5658
--- /dev/null
+++ b/debian/patches/fix_smtp-taint.patch
@@ -0,0 +1,11 @@
+Description: add '.' back into @INC
+Origin: https://rt.cpan.org/Public/Bug/Display.html?id=25808
+
+--- a/t/smtp-taint.t 28 Aug 2003 19:17:31 -0000 1.1.1.1
++++ b/t/smtp-taint.t 26 Mar 2007 14:54:57 -0000
+@@ -1,3 +1,5 @@
+ #!perl -T
+
++use lib qw(.);
++
+ do 't/smtp.t';
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1c7d45f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+update_wildcard_mx_records.patch
+fix_smtp-taint.patch
+delete_failing_wildcard_tests.patch
+change_failing_smtp_test.patch
diff --git a/debian/patches/update_wildcard_mx_records.patch b/debian/patches/update_wildcard_mx_records.patch
new file mode 100644
index 0000000..1b8f6af
--- /dev/null
+++ b/debian/patches/update_wildcard_mx_records.patch
@@ -0,0 +1,64 @@
+Description: some gTLDs have changed their wildcard mx/a records,
+ resulting in test failures.
+Origin: https://rt.cpan.org/Public/Bug/Display.html?id=25809
+
+--- a/CheckUser.pm 18 Sep 2003 23:52:06 -0000 1.1.1.1
++++ b/CheckUser.pm 26 Mar 2007 14:55:11 -0000
+@@ -85,35 +85,35 @@
+ "mail.nonregistered.nic.cx" => 1, # MX
+
+ # mp
+- "202.128.12.163" => 1, # A
++ "mail.mp" => 1, # MX
++ "72.249.38.50" => 1, # MX
+
+ # museum
+ "195.7.77.20" => 1, # A
+
+ # nu
+- "64.55.105.9" => 1, # A
++ '62.4.64.119' => 1,
++ '69.25.75.72' => 1,
+ "212.181.91.6" => 1, # A
+
+ # ph
+- "203.119.4.6" => 1, # A
++ "72.51.36.133" => 1, # A
+
+ # pw
+- "216.98.141.250" => 1, # A
+- "65.125.231.178" => 1, # A
+- "wfb.dnsvr.com" => 1, # CNAME
++ "69.20.61.189" => 1, # A
+
+ # sh
+- "194.205.62.62" => 1, # A
++ "216.117.170.115" => 1, # A
+
+ # td
+ "146.101.245.154" => 1, # A
+ "www.nic.td" => 1, # CNAME
+
+ # tk
+- "195.20.32.83" => 1, # A
+- "195.20.32.86" => 1, # A
+- "nukumatau.taloha.com" => 1, # MX
+- "195.20.32.99" => 1, # MX
++ "62.129.131.38" => 1, # A
++ "195.20.32.104" => 1, # A
++ "217.119.57.19" => 1, # A
++ "mx-host.dot.tk" => 1, # MX
+
+ # tm
+ "194.205.62.42" => 1, # A
+@@ -122,9 +122,7 @@
+ "203.73.24.11" => 1, # A
+
+ # ws
+- "216.35.187.246" => 1, # A
+- "mail.worldsite.ws" => 1, # MX
+- "216.35.187.251" => 1, # MX
++ "64.70.19.33" => 1, # A
+
+ };
+
--
Debian packaging of libmail-checkuser-perl
More information about the Pkg-perl-cvs-commits
mailing list