| Subject: | [combined patch] test failure t/wildcard.t |
There are addresses in t/wildcard.t that causes the test to fail. They
are:
bogus@pqpqpqp-wildcard-qpqpqpqpqpq.mp
bogus@pqpqpqp-wildcard-qpqpqpqpqpq.pw
bogus@pqpqpqp-wildcard-qpqpqpqpqpq.ph
This combined patch file patches t/wildcard.t by removing those
address. It includes the patches in the bug reports 25808 and 25809.
While the Subject of 25809 refers to t/wildcard.t, that patch is
actually for CheckUser.pm
Apply with -p0 to avoid having to tell it which files to patch in the t
directory.
| Subject: | CheckUser-combined.patch |
Index: CheckUser.pm
===================================================================
diff -crB CheckUser.pm CheckUser.pm
*** CheckUser.pm 2003-09-18 16:52:06.000000000 -0700
--- CheckUser.pm 2010-07-14 16:43:28.000000000 -0700
***************
*** 85,119 ****
"mail.nonregistered.nic.cx" => 1, # MX
# mp
! "202.128.12.163" => 1, # A
# museum
"195.7.77.20" => 1, # A
# nu
! "64.55.105.9" => 1, # A
"212.181.91.6" => 1, # A
# ph
! "203.119.4.6" => 1, # A
# pw
! "216.98.141.250" => 1, # A
! "65.125.231.178" => 1, # A
! "wfb.dnsvr.com" => 1, # CNAME
# sh
! "194.205.62.62" => 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
# tm
"194.205.62.42" => 1, # A
--- 85,119 ----
"mail.nonregistered.nic.cx" => 1, # MX
# mp
! "mail.mp" => 1, # MX
! "72.249.38.50" => 1, # MX
# museum
"195.7.77.20" => 1, # A
# nu
! '62.4.64.119' => 1,
! '69.25.75.72' => 1,
"212.181.91.6" => 1, # A
# ph
! "72.51.36.133" => 1, # A
# pw
! "69.20.61.189" => 1, # A
# sh
! "216.117.170.115" => 1, # A
# td
"146.101.245.154" => 1, # A
"www.nic.td" => 1, # CNAME
# tk
! "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,130 ****
"203.73.24.11" => 1, # A
# ws
! "216.35.187.246" => 1, # A
! "mail.worldsite.ws" => 1, # MX
! "216.35.187.251" => 1, # MX
};
--- 122,128 ----
"203.73.24.11" => 1, # A
# ws
! "64.70.19.33" => 1, # A
};
Index: t/smtp-taint.t
===================================================================
diff -crB t/smtp-taint.t t/smtp-taint.t
*** t/smtp-taint.t 2003-08-28 12:17:31.000000000 -0700
--- t/smtp-taint.t 2010-07-14 16:44:04.000000000 -0700
***************
*** 1,3 ****
--- 1,5 ----
#!perl -T
+ use lib qw(.);
+
do 't/smtp.t';
Index: t/wildcard.t
===================================================================
diff -crB t/wildcard.t t/wildcard.t
*** t/wildcard.t 2003-09-18 16:52:06.000000000 -0700
--- t/wildcard.t 2010-07-14 16:44:21.000000000 -0700
***************
*** 15,25 ****
bogus@pqpqpqp-wildcard-qpqpqpqpqpq.nu
bogus@pqpqpqp-wildcard-qpqpqpqpqpq.tk
bogus@pqpqpqp-wildcard-qpqpqpqpqpq.cc
- bogus@pqpqpqp-wildcard-qpqpqpqpqpq.mp
bogus@pqpqpqp-wildcard-qpqpqpqpqpq.ws
bogus@pqpqpqp-wildcard-qpqpqpqpqpq.sh
- bogus@pqpqpqp-wildcard-qpqpqpqpqpq.pw
- bogus@pqpqpqp-wildcard-qpqpqpqpqpq.ph
bogus@pqpqpqp-wildcard-qpqpqpqpqpq.ba
|;
--- 15,22 ----