On Wed, Aug 26, 2009 at 08:40:17PM +0100, Adam D. Barratt wrote: > > > fwiw, the open-whois change is one I'd definitely be happy to accept. > > > > I'm preparing that upload now. Is it OK to use the same version number > > as the one that was rejected? > > You can, although if you are then you'll need to leave it until after > it's moved from the "pending" section of > http://release.debian.org/proposed-updates/stable.html to the lower > "processed" section to make sure that the previous package has been > rejected by dak. Attached is a proposed debdiff. I included the pod2man fixes because they're easy, don't affect functionality, and the manpages are ugly without them. Thanks. noah
diff -u spamassassin-3.2.5/debian/changelog spamassassin-3.2.5/debian/changelog
--- spamassassin-3.2.5/debian/changelog
+++ spamassassin-3.2.5/debian/changelog
@@ -1,3 +1,13 @@
+spamassassin (3.2.5-2+lenny1) stable; urgency=low
+
+ * Remove open-whois.org as it is cybersquatted (Closes: #537477)
+ * Fix numerous perl pod errors that caused warnings to be embedded
+ in several manpages.
+ * Fix man page formatting so as not to break whatis.
+ * Update debian/control to list the right Maintainer value.
+
+ -- Noah Meyerhans <noahm@debian.org> Wed, 26 Aug 2009 15:45:35 -0400
+
spamassassin (3.2.5-2) unstable; urgency=low
[ Duncan Findlay ]
diff -u spamassassin-3.2.5/debian/control spamassassin-3.2.5/debian/control
--- spamassassin-3.2.5/debian/control
+++ spamassassin-3.2.5/debian/control
@@ -1,8 +1,8 @@
Source: spamassassin
Section: mail
Priority: optional
-Maintainer: Duncan Findlay <duncf@debian.org>
-Uploaders: Jesus Climent <jesus.climent@hispalinux.es>, Noah Meyerhans <noahm@debian.org>
+Maintainer: Noah Meyerhans <noahm@debian.org>
+Uploaders: Jesus Climent <jesus.climent@hispalinux.es>
Build-Depends: debhelper (>= 4.1.16), perl (>= 5.6.0-16), libssl-dev,
dpatch, libhtml-parser-perl (>= 3.24), libdigest-sha1-perl,
libnet-dns-perl (>= 0.34)
diff -u spamassassin-3.2.5/debian/patches/00list spamassassin-3.2.5/debian/patches/00list
--- spamassassin-3.2.5/debian/patches/00list
+++ spamassassin-3.2.5/debian/patches/00list
@@ -4 +4,5 @@
-40_remote_dsbl.dpatch
+40_remote_dsbl
+41_remove_openwhois
+60_fix-pod
+70_fix-whatis
+80_fix_man_warnings
only in patch2:
unchanged:
--- spamassassin-3.2.5.orig/debian/patches/70_fix-whatis.dpatch
+++ spamassassin-3.2.5/debian/patches/70_fix-whatis.dpatch
@@ -0,0 +1,95 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70_fix-whatis.dpatch by <noahm@streaker>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix lintian's complaints about bad whatis lines
+
+@DPATCH@
+diff -urNad spamassassin-3.2.5~/lib/Mail/SpamAssassin/Plugin/Check.pm spamassassin-3.2.5/lib/Mail/SpamAssassin/Plugin/Check.pm
+--- spamassassin-3.2.5~/lib/Mail/SpamAssassin/Plugin/Check.pm 2009-08-09 16:35:07.000000000 -0400
++++ spamassassin-3.2.5/lib/Mail/SpamAssassin/Plugin/Check.pm 2009-08-09 16:37:04.000000000 -0400
+@@ -1,6 +1,6 @@
+ =head1 NAME
+
+-Mail::SpamAssassin::Plugin::Check
++Mail::SpamAssassin::Plugin::Check - spamassassin message checking plugin
+
+ =head1 SYNOPSIS
+
+diff -urNad spamassassin-3.2.5~/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm spamassassin-3.2.5/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
+--- spamassassin-3.2.5~/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm 2009-08-09 16:35:07.000000000 -0400
++++ spamassassin-3.2.5/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm 2009-08-09 16:37:04.000000000 -0400
+@@ -1,6 +1,6 @@
+ =head1 NAME
+
+-Mail::SpamAssassin::Plugin::OneLineBodyRuleType
++Mail::SpamAssassin::Plugin::OneLineBodyRuleType - spamassassin body test plugin
+
+ =cut
+
+diff -urNad spamassassin-3.2.5~/lib/Mail/SpamAssassin/Plugin/VBounce.pm spamassassin-3.2.5/lib/Mail/SpamAssassin/Plugin/VBounce.pm
+--- spamassassin-3.2.5~/lib/Mail/SpamAssassin/Plugin/VBounce.pm 2009-08-09 16:35:07.000000000 -0400
++++ spamassassin-3.2.5/lib/Mail/SpamAssassin/Plugin/VBounce.pm 2009-08-09 16:37:04.000000000 -0400
+@@ -17,7 +17,7 @@
+
+ =head1 NAME
+
+-Mail::SpamAssassin::Plugin::VBounce
++Mail::SpamAssassin::Plugin::VBounce - spamassassin bounce classification plugin
+
+ =head1 SYNOPSIS
+
+diff -urNad spamassassin-3.2.5~/lib/Mail/SpamAssassin/Util/DependencyInfo.pm spamassassin-3.2.5/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
+--- spamassassin-3.2.5~/lib/Mail/SpamAssassin/Util/DependencyInfo.pm 2009-08-09 16:37:04.000000000 -0400
++++ spamassassin-3.2.5/lib/Mail/SpamAssassin/Util/DependencyInfo.pm 2009-08-09 16:37:22.000000000 -0400
+@@ -17,6 +17,16 @@
+ # limitations under the License.
+ # </@LICENSE>
+
++=head1 NAME
++
++Mail::SpamAssassin::Util::DependencyInfo - spamassassin debugging helpers
++
++=head1 SYNOPSIS
++
++ loadplugin Mail::SpamAssassin::Util::DependencyInfo
++
++=cut
++
+ package Mail::SpamAssassin::Util::DependencyInfo;
+
+ use strict;
+@@ -208,6 +218,8 @@
+
+ ###########################################################################
+
++=head1 METHODS
++
+ =over 4
+
+ =item $f->debug_diagnostics ()
+diff -urNad spamassassin-3.2.5~/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm spamassassin-3.2.5/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
+--- spamassassin-3.2.5~/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm 2009-08-09 16:37:04.000000000 -0400
++++ spamassassin-3.2.5/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm 2009-08-09 16:38:00.000000000 -0400
+@@ -18,6 +18,12 @@
+ # limitations under the License.
+ # </@LICENSE>
+
++=head1 NAME
++
++Mail::SpamAssassin::Util::RegistrarBoundaries - domain delegation rules
++
++=cut
++
+ package Mail::SpamAssassin::Util::RegistrarBoundaries;
+
+ use strict;
+@@ -262,6 +268,8 @@
+
+ ###########################################################################
+
++=head1 METHODS
++
+ =over 4
+
+ =item ($hostname, $domain) = split_domain ($fqdn)
only in patch2:
unchanged:
--- spamassassin-3.2.5.orig/debian/patches/41_remove_openwhois.dpatch
+++ spamassassin-3.2.5/debian/patches/41_remove_openwhois.dpatch
@@ -0,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 41_remove_openwhois.dpatch by <noahm@crystalline-entity.csail.mit.edu>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove the obsolete OPENWHOIS rules. Debian bug #537477
+
+@DPATCH@
+diff -urNad Mail-SpamAssassin-3.2.5~/rules/50_scores.cf Mail-SpamAssassin-3.2.5/rules/50_scores.cf
+--- Mail-SpamAssassin-3.2.5~/rules/50_scores.cf 2008-06-10 05:20:35.000000000 -0400
++++ Mail-SpamAssassin-3.2.5/rules/50_scores.cf 2009-07-20 09:25:01.000000000 -0400
+@@ -63,7 +63,6 @@
+ score DEAR_WINNER 3.199 3.196 3.199 3.197 # n=2
+ score DIET_1 2.472 0.336 1.442 0.083
+ score DIGEST_MULTIPLE 0 0.001 0 0.001 # n=0 n=2
+-score DNS_FROM_OPENWHOIS 0 2.431 0 1.130 # n=0 n=2
+ score DOS_FIX_MY_URI 0 # n=1 n=3
+ score DOS_LET_GO_JOB 0 # n=1 n=3
+ score DOS_STOCK_BAT 3.290 3.383 2.336 3.699 # n=2
+diff -urNad Mail-SpamAssassin-3.2.5~/rules/72_active.cf Mail-SpamAssassin-3.2.5/rules/72_active.cf
+--- Mail-SpamAssassin-3.2.5~/rules/72_active.cf 2008-06-10 05:21:33.000000000 -0400
++++ Mail-SpamAssassin-3.2.5/rules/72_active.cf 2009-07-20 09:24:39.000000000 -0400
+@@ -109,15 +109,6 @@
+ body DEAR_WINNER /\bdear.{1,20}winner/i
+ ##} DEAR_WINNER
+
+-##{ DNS_FROM_OPENWHOIS
+-
+-ifplugin Mail::SpamAssassin::Plugin::DNSEval
+-header DNS_FROM_OPENWHOIS eval:check_rbl_envfrom('openwhois', 'bl.open-whois.org.')
+-describe DNS_FROM_OPENWHOIS Envelope sender listed in bl.open-whois.org.
+-tflags DNS_FROM_OPENWHOIS net publish
+-endif
+-##} DNS_FROM_OPENWHOIS
+-
+ ##{ DOS_FIX_MY_URI
+ meta DOS_FIX_MY_URI __MIMEOLE_1106 && __DOS_HAS_ANY_URI && __DOS_SINGLE_EXT_RELAY && __DOS_HI && __DOS_LINK
+ describe DOS_FIX_MY_URI Looks like a "fix my obfu'd URI please" spam
+diff -urNad Mail-SpamAssassin-3.2.5~/rules/active.list Mail-SpamAssassin-3.2.5/rules/active.list
+--- Mail-SpamAssassin-3.2.5~/rules/active.list 2008-06-10 05:20:35.000000000 -0400
++++ Mail-SpamAssassin-3.2.5/rules/active.list 2009-07-20 09:25:55.000000000 -0400
+@@ -92,9 +92,6 @@
+ DNS_FROM_DOB
+
+ # tflags net
+-DNS_FROM_OPENWHOIS
+-
+-# tflags net
+ DNS_FROM_RFC_BOGUSMX
+
+ # tflags net
only in patch2:
unchanged:
--- spamassassin-3.2.5.orig/debian/patches/60_fix-pod.dpatch
+++ spamassassin-3.2.5/debian/patches/60_fix-pod.dpatch
@@ -0,0 +1,165 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_fix-pod.dpatch by <noahm@streaker>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix a bunch of pod2man warnings and miscellaneous other minor doc issues.
+
+@DPATCH@
+diff -urNad spamassassin-3.2.5~/lib/Mail/SpamAssassin/Conf/Parser.pm spamassassin-3.2.5/lib/Mail/SpamAssassin/Conf/Parser.pm
+--- spamassassin-3.2.5~/lib/Mail/SpamAssassin/Conf/Parser.pm 2008-06-10 05:20:14.000000000 -0400
++++ spamassassin-3.2.5/lib/Mail/SpamAssassin/Conf/Parser.pm 2009-08-10 12:06:30.000000000 -0400
+@@ -113,10 +113,6 @@
+
+ =back
+
+-=head1 METHODS
+-
+-=over 4
+-
+ =cut
+
+ package Mail::SpamAssassin::Conf::Parser;
+diff -urNad spamassassin-3.2.5~/lib/Mail/SpamAssassin/Conf.pm spamassassin-3.2.5/lib/Mail/SpamAssassin/Conf.pm
+--- spamassassin-3.2.5~/lib/Mail/SpamAssassin/Conf.pm 2009-08-10 12:06:29.000000000 -0400
++++ spamassassin-3.2.5/lib/Mail/SpamAssassin/Conf.pm 2009-08-10 12:06:30.000000000 -0400
+@@ -266,6 +266,8 @@
+ }
+ });
+
++=back
++
+ =head2 WHITELIST AND BLACKLIST OPTIONS
+
+ =over 4
+diff -urNad spamassassin-3.2.5~/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm spamassassin-3.2.5/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm
+--- spamassassin-3.2.5~/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm 2008-06-10 05:20:21.000000000 -0400
++++ spamassassin-3.2.5/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm 2009-08-10 12:06:30.000000000 -0400
+@@ -70,6 +70,8 @@
+
+ The following configuration settings are used to control shortcircuiting:
+
++=over 4
++
+ =item shortcircuit SYMBOLIC_TEST_NAME {ham|spam|on|off}
+
+ Shortcircuiting a test will force all other pending rules to be skipped, if
+@@ -213,6 +215,8 @@
+ $conf->{parser}->register_commands(\@cmds);
+ }
+
++=back
++
+ =head1 TAGS
+
+ The following tags are added to the set available for use in reports, headers
+diff -urNad spamassassin-3.2.5~/lib/Mail/SpamAssassin/Plugin.pm spamassassin-3.2.5/lib/Mail/SpamAssassin/Plugin.pm
+--- spamassassin-3.2.5~/lib/Mail/SpamAssassin/Plugin.pm 2008-06-10 05:20:22.000000000 -0400
++++ spamassassin-3.2.5/lib/Mail/SpamAssassin/Plugin.pm 2009-08-10 12:06:30.000000000 -0400
+@@ -842,6 +842,8 @@
+ %{$self} = ();
+ }
+
++=back
++
+ =head1 HELPER APIS
+
+ These methods provide an API for plugins to register themselves
+diff -urNad spamassassin-3.2.5~/lib/Mail/SpamAssassin/Util/DependencyInfo.pm spamassassin-3.2.5/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
+--- spamassassin-3.2.5~/lib/Mail/SpamAssassin/Util/DependencyInfo.pm 2008-06-10 05:20:12.000000000 -0400
++++ spamassassin-3.2.5/lib/Mail/SpamAssassin/Util/DependencyInfo.pm 2009-08-10 12:06:30.000000000 -0400
+@@ -208,6 +208,8 @@
+
+ ###########################################################################
+
++=over 4
++
+ =item $f->debug_diagnostics ()
+
+ Output some diagnostic information, useful for debugging SpamAssassin
+diff -urNad spamassassin-3.2.5~/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm spamassassin-3.2.5/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
+--- spamassassin-3.2.5~/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm 2008-06-10 05:20:12.000000000 -0400
++++ spamassassin-3.2.5/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm 2009-08-10 12:06:30.000000000 -0400
+@@ -262,6 +262,8 @@
+
+ ###########################################################################
+
++=over 4
++
+ =item ($hostname, $domain) = split_domain ($fqdn)
+
+ Cut a fully-qualified hostname into the hostname part and the domain
+diff -urNad spamassassin-3.2.5~/lib/spamassassin-run.pod spamassassin-3.2.5/lib/spamassassin-run.pod
+--- spamassassin-3.2.5~/lib/spamassassin-run.pod 2009-08-10 12:06:29.000000000 -0400
++++ spamassassin-3.2.5/lib/spamassassin-run.pod 2009-08-10 12:06:30.000000000 -0400
+@@ -1,5 +1,3 @@
+-=cut
+-
+ <@LICENSE>
+ Copyright 2004 Apache Software Foundation
+
+@@ -278,7 +276,7 @@
+ For more information about which areas (also known as channels) are available,
+ please see the documentation at:
+
+- C<http://wiki.apache.org/spamassassin/DebugChannels>
++ http://wiki.apache.org/spamassassin/DebugChannels
+
+ =item B<-x>, B<--nocreate-prefs>
+
+diff -urNad spamassassin-3.2.5~/sa-compile.raw spamassassin-3.2.5/sa-compile.raw
+--- spamassassin-3.2.5~/sa-compile.raw 2009-08-10 12:06:29.000000000 -0400
++++ spamassassin-3.2.5/sa-compile.raw 2009-08-10 12:06:30.000000000 -0400
+@@ -662,8 +662,6 @@
+
+ ##############################################################################
+
+-=cut
+-
+ =head1 NAME
+
+ sa-compile - compile SpamAssassin ruleset into native code
+diff -urNad spamassassin-3.2.5~/sa-update.raw spamassassin-3.2.5/sa-update.raw
+--- spamassassin-3.2.5~/sa-update.raw 2008-06-10 05:21:07.000000000 -0400
++++ spamassassin-3.2.5/sa-update.raw 2009-08-10 12:06:30.000000000 -0400
+@@ -1297,8 +1297,6 @@
+
+ ##############################################################################
+
+-=cut
+-
+ =head1 NAME
+
+ sa-update - automate SpamAssassin rule updates
+diff -urNad spamassassin-3.2.5~/spamassassin.raw spamassassin-3.2.5/spamassassin.raw
+--- spamassassin-3.2.5~/spamassassin.raw 2008-06-10 05:21:07.000000000 -0400
++++ spamassassin-3.2.5/spamassassin.raw 2009-08-10 12:06:30.000000000 -0400
+@@ -535,6 +535,8 @@
+
+ # ---------------------------------------------------------------------------
+
++=pod
++
+ =cut
+
+ =head1 NAME
+diff -urNad spamassassin-3.2.5~/spamc/spamc.pod spamassassin-3.2.5/spamc/spamc.pod
+--- spamassassin-3.2.5~/spamc/spamc.pod 2009-08-10 12:06:29.000000000 -0400
++++ spamassassin-3.2.5/spamc/spamc.pod 2009-08-10 12:06:30.000000000 -0400
+@@ -1,5 +1,3 @@
+-=cut
+-
+ <@LICENSE>
+ Copyright 2004 Apache Software Foundation
+
+diff -urNad spamassassin-3.2.5~/spamd/spamd.raw spamassassin-3.2.5/spamd/spamd.raw
+--- spamassassin-3.2.5~/spamd/spamd.raw 2009-08-10 12:06:29.000000000 -0400
++++ spamassassin-3.2.5/spamd/spamd.raw 2009-08-10 12:06:56.000000000 -0400
+@@ -3089,7 +3089,7 @@
+ =item B<--timeout-child>=I<number>
+
+ This option specifies the number of seconds to wait for a spamd child to
+-to process or check a message. The minimum value is C<1>, the default
++process or check a message. The minimum value is C<1>, the default
+ value is C<300>, and a value of C<0> will disable child timeouts completely.
+
+ =item B<-H> I<directory>, B<--helper-home-dir>=I<directory>
only in patch2:
unchanged:
--- spamassassin-3.2.5.orig/debian/patches/80_fix_man_warnings.dpatch
+++ spamassassin-3.2.5/debian/patches/80_fix_man_warnings.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_fix_man_warnings.dpatch by <noahm@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix some more man errors by shortening some long lines.
+
+@DPATCH@
+diff -urNad trunk~/lib/Mail/SpamAssassin/Conf.pm trunk/lib/Mail/SpamAssassin/Conf.pm
+--- trunk~/lib/Mail/SpamAssassin/Conf.pm 2009-02-23 12:14:24.000000000 -0500
++++ trunk/lib/Mail/SpamAssassin/Conf.pm 2009-02-23 12:18:48.000000000 -0500
+@@ -2700,7 +2700,7 @@
+ sprintf statement with the username as the only parameter, thus is can hold a
+ single __USERNAME__ expression. This will be replaced with the username.
+
+-Example: C<ldap://localhost:389/dc=koehntopp,dc=de?spamassassinconfig?uid=__USERNAME__>
++Example: C<ldap://localhost:389/dc=koehntopp,dc=de?saconfig?uid=__USERNAME__>
+
+ =cut
+
+diff -urNad trunk~/sa-learn.raw trunk/sa-learn.raw
+--- trunk~/sa-learn.raw 2009-02-23 12:14:23.000000000 -0500
++++ trunk/sa-learn.raw 2009-02-23 12:15:11.000000000 -0500
+@@ -1281,7 +1281,7 @@
+ E<lt>http://www.paulgraham.com/E<gt>
+ Paul Graham's "A Plan For Spam" paper
+
+-E<lt>http://radio.weblogs.com/0101454/stories/2002/09/16/spamDetection.htmlE<gt>
++E<lt>http://www.linuxjournal.com/article/6467E<gt>
+ Gary Robinson's f(x) and combining algorithms, as used in SpamAssassin
+
+ E<lt>http://www.bgl.nu/~glouis/bogofilter/E<gt>
Attachment:
signature.asc
Description: Digital signature