[SACVS] CVS: spamassassin/debian README.postfix,NONE,1.1 spamassassin.links,1.2,1.3 README.Upgrade,1.2,1.3 build.pl,1.3,1.4 changelog,1.1,1.2 control,1.9,1.10 rules,1.10,1.11 spamassassin.docs,1.3,1.4 spamassassin.preinst,1.4,1.5 spamassassin.templates,1.4,1.5 changelog.in,1.8,NONE spamassassin.postrm,1.2,NONE

Update of /cvsroot/spamassassin/spamassassin/debian
In directory sc8-pr-cvs1:/tmp/cvs-serv8068/debian

Modified Files:
        README.Upgrade build.pl changelog control rules 
        spamassassin.docs spamassassin.preinst spamassassin.templates 
Added Files:
        README.postfix spamassassin.links 
Removed Files:
        changelog.in spamassassin.postrm 
Log Message:
Fixing debian build system. Includes use of DESTDIR in
debian/rules. Redid debian/build.pl. Now contains workaround for
po-debconf stuff for woody systems. General packaging changes.
Now should not need an update after each release.


--- NEW FILE: README.postfix ---
Integration SpamAssassin with Postfix

This file contains information on how to integrate SpamAssassin with Postfix
for incoming mails.

1. Set SpamAssassin to start after booting the system

Edit /etc/defaults/spamassassin and set SpamAssassin to start after a reboot.

2. Start SpamAssassin

/etc/init.d/spamassassin start

3. Create a filter user.

adduser --disabled-password --disabled-login --gecos "Postfix Filter User" 
filter

4. Create the filter script.

Under ~filter, create filter.sh:

#!/bin/sh
/bin/cat | /usr/bin/spamc -f | /usr/sbin/sendmail -i "$@"
exit $?

Be sure to chmod it to 750, at least.

A more complete example can be found under /usr/share/doc/spamassassin/examples

5. Set /etc/postfix/master.cf

It must contain the following lines:

localhost:smtp          inet    n       -       -       -       -       smtpd
<external.ip>:smtp      inet    n       -       -       -       -       smtpd
  -o content_filter=filter:

[...]

filter    unix  -       n       n       -       -       pipe
  flags=Rq user=filter argv=/home/filter/filter.sh -f ${sender} -- ${recipient}

6. Reload postfix

As root, exec:

#> postfix reload



That should be it.

Aug 2003, Jesus Climent


Index: README.Upgrade
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/debian/README.Upgrade,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -w -u -d -r1.2 -r1.3
--- README.Upgrade      21 Jun 2003 01:25:21 -0000      1.2
+++ README.Upgrade      17 Sep 2003 03:10:26 -0000      1.3
@@ -13,6 +13,27 @@
 change them back, otherwise your scores may be skewed too high,
 resulting in false positives.
 
+spamd now supports UNIX-domain sockets. This is strongly recommended
+if spamd and spamc are running on the same server. Look at the
+--socketpath option for spamd and the -U option for spamc.
+
+SpamAssassin no longer uses AnyDBM_File to access its Bayes database,
+instead, DB_File is used. If your bayes database is not in dbm format,
+you will need to run 'sa-learn --import' before you can use bayes. To
+check what database format you are currently using, use the following
+command:
+ $ file ~/.spamassassin/bayes_{seen,toks}
+If the output does not contain "Berkeley DB", you are not using
+DB_File and you will need to run 'sa-learn --import'
+
+Before upgrading, it is best to run 'sa-learn --rebuild' to sync your
+Bayes journal with the database. Otherwise, your journal will be
+erased because of incompatibilities with the previous database.
+
+In order to properly use RBLs and other network tests, you will want
+to set the trusted_networks option. (The autodetection algorithm is
+not perfect.) Read man Mail::SpamAssassin::Conf for more info.
+
 Upgrading to 2.5x:
 ------------------
 

Index: build.pl
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/debian/build.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -w -u -d -r1.3 -r1.4
--- build.pl    21 Aug 2003 22:38:34 -0000      1.3
+++ build.pl    17 Sep 2003 03:10:26 -0000      1.4
@@ -1,85 +1,117 @@
 #!/usr/bin/perl -w
 
-die 'Run from top level spamassassin directory' unless -d 'debian';
+# CVS Build script for SpamAssassin Debian packages
+# Options:
+# -d           Automatically build package
+# -e <email>   Set email to use in changelog
+# -f <name>    Set full name to use in changelog
 
 use lib 'lib';
 use Mail::SpamAssassin;
 use Getopt::Std;
+use POSIX;
+use strict;
 
-getopts('d'); # d = do it!
-
-our $opt_d;
-
-# Checking that everything is where we need it.
-warn 'You might want to set $EMAIL or $DEBEMAIL'
-    if !$ENV{EMAIL} && !$ENV{DEBEMAIL};
-
-warn 'You might want to set $DEBFULLNAME'
-    if !$ENV{DEBFULLNAME};
-
-die 'dch not available: run apt-get install devscripts' unless -x 
'/usr/bin/dch';
-
-die 'dpkg-buildpackage not available: run apt-get install dpkg-dev' unless -x 
'/usr/bin/dpkg-buildpackage';
-
-die 'debhelper not available: run apt-get install debhelper' unless -x 
'/usr/bin/dh_testroot';
-
+our ($email, $name, %opts);
+getopts('de:f:', \%opts); # d = do it!
 
-# Let's go.
-if (!-f 'changelog') {
-    system ("/bin/cp", "debian/changelog.in", "debian/changelog") == 0
-       or die "Couldn't copy, error $?";
+# check env
+sub check_environment {
+    if (! -x 'debian/rules') {
+       die 'Run from top level spamassassin CVS directory';
+    }
+    if (!$ENV{EMAIL} && !$ENV{DEBEMAIL} && !$opts{e}) {
+       warn 'No e-mail address specified. Using nobody@nowhere';
+    }
+    if(system("/usr/bin/dpkg-checkbuilddeps") != 0) {
+       die 'Build dependencies not satisfied, or dpkg-checkbuilddeps not 
available.';
+    }
 }
 
-my ($cvsversion, $oldversion, $datecode, $debianversion, $revisioncode);
+sub set_maintainer {
+    $email = undef;
+    $name = undef;
 
-$cvsversion = $Mail::SpamAssassin::VERSION;
-print "Current CVS version: $cvsversion\n";
+    if ($opts{e}) {
+       $email = $opts{e};
+    }
 
-$datecode = `date -u +%Y%m%d`;
-chomp $datecode;
+    if ($opts{f}) {
+       $name = $opts{f};
+    }
 
-open (CHANGELOG, "debian/changelog");
+    return if (defined $name and defined $email);
 
-while (<CHANGELOG>) {
-    if (/spamassassin \((\d+\.\d+)pre(\d+.\d+)cvs(\d+)-(\d+)\) unstable;/) {
-       $oldversion = $1;
-       warn "Using current CVS version, not version from changelog" if $2 != 
$cvsversion;
-       if ($3 == $datecode) {
-           $revisioncode = $4 + 1;
-           print "Already built today, using revision $revisioncode\n";
-       } else {
-           $revisioncode = 1;
+    if ($ENV{DEBEMAIL}) {
+       if ($ENV{DEBEMAIL} =~ /^(.*)\s+<(.*)>$/) {
+           $name ||= $1;
+           $email ||= $2;
        }
-       last;
     }
         
-    if (/spamassassin \((\d+\.\d+)-\d\) (?:unstable|experimental); urgency=/) 
{ # Should ignore cvs versions
-       $oldversion = $1;
-       print "Last Debian version: $oldversion\n";
-       $revisioncode = 1;
-       last;
+    return if (defined $name and defined $email);
+
+    if ($ENV{EMAIL}) {
+       if ($ENV{EMAIL} =~ /^(.*)\s+<(.*)>$/) {
+           $name ||= $1;
+           $email ||= $2;
     }
 }
 
-close CHANGELOG;
+    return if (defined $name and defined $email);
 
-die "Can't determine old version\n" if !$oldversion;
+    # Don't bother looking up user's name from /etc/passwd
+    $name ||= 'Anonymous CVS Builder';
+    $email ||= 'nobody@nowhere';
 
-$debianversion = 
"${oldversion}pre${cvsversion}cvs${datecode}-${revisioncode}"; # Not pretty but 
informative
+}
 
-print "Building debian version $debianversion\n";
+sub get_version {
+    return Mail::SpamAssassin::Version();
+}
 
-unlink "debian/changelog"; # We don't need accumulating changelogs!
-system ("/bin/cp", "debian/changelog.in", "debian/changelog") == 0
-  or die "Couldn't copy, error $?";
+sub update_changelog {
+    my ($datel, $dates);
+    my $version = get_version();
+    chomp($datel = `822-date`);
+    chomp($dates = `date +"%Y%m%d"`);
+    open OUT, '>debian/changelog';
+    print OUT <<EOF;
+spamassassin ($version+$dates-1) experimental; urgency=low
 
-system('/usr/bin/dch', "--newversion=$debianversion", 'Packaging from CVS') == 
0 or die "system() error: $?";
+  * CVS packaged version
+  * A changelog to previous versions is not included. Please see the
+    official Debian packages for changelog information.
 
-print "OK!\n";
+ -- $name <$email>  $datel
+EOF
+    close OUT;
+}
 
-if ($opt_d) {
+# Merge templates
+sub check_debconfpo {
+    if (! -x '/usr/bin/po2debconf') {
+       open IN, 'debian/spamassassin.templates';
+       open OUT, '>debian/spamassassin.templates.stripped';
+       while (<IN>) {
+           s#^__?##;
+           print OUT $_;
+       }
+       close IN;
+       close OUT;
+       rename 'debian/spamassassin.templates', 
'debian/spamassassin.templates.orig';
+       rename 'debian/spamassassin.templates.stripped', 
'debian/spamassassin.templates'
+    }
+}
+
+sub doit {
     print "Trying to run dpkg-buildpackage\n";
     exec('/usr/bin/dpkg-buildpackage', '-rfakeroot', '-b');
     die "Exec failed! Error: $?";
 }
 
+check_environment();
+set_maintainer();
+update_changelog();
+check_debconfpo();
+doit() if $opts{d};

Index: changelog
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/debian/changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -w -u -d -r1.1 -r1.2
--- changelog   21 Aug 2003 22:48:04 -0000      1.1
+++ changelog   17 Sep 2003 03:10:26 -0000      1.2
@@ -1,379 +1,7 @@
-spamassassin (2.60-1) experimental; urgency=low
-
-  * New upstream release
-
- -- Jesus Climent <jesus.climent@xxxxxxxxxxxxx>  Thu, 21 Aug 2003 08:59:03 
+0000
-
-spamassassin (2.59pre2.60pre3-1) experimental; urgency=low
-
-  * New upstream pre-release, before mass-check verification. Use at your own
-    risk.
-  * This version solves:
-    + French typo (Closes: #200468)
-  * Added README.postfix which explains how to integrate spamassassin with
-    postfix for incoming tagging.
-  * Spamd supports unix sockets (Closes: #204853)
-
- -- Jesus Climent <jesus.climent@xxxxxxxxxxxxx>  Thu,  7 Aug 2003 22:39:30 
+0000
-
-spamassassin (2.59pre2.60cvs20030619-1) experimental; urgency=low
-
-  * Pre-release 2.60 packages. Use at own risk! :-) (Hence, experimental)
-  * Also experimental since the scores in this release are very
-    sub-optimal. You will probably want to use a higher threshold, as
-    all the negative scoring tests have been removed.
-  * This upload is to facilitate the transition of maintenance (temporarily)
-    to Jesus Climent <jesus.climent@xxxxxxxxxxxxx> (Added to the
-    Uploaders: field)
-  * New upstream version includes:
-      Better rules to thwart new spam tactics (Closes: #192953)
-      Fix some bugs relating to autolearning (Closes: #191371)
-      Fix problem with reloading and syslog-ng (Closes: #191837)
-      More verbose error from spamassassin -r (Closes: #192133, #197881)
-      Improved configurability of headers (Closes: #178648, #193872)
-      Able to add charset to safe reports (Closes: #183810)
-  * Added a few more "default" options to spamd in /etc/default/spamassassin
-  * Fixed spamc's manpage to refer to spamd(8) not spamd(1) (Closes: #197880)
-  * Added doc on integrating spamassassin sitewide with Exim3 from
-    John Girash <girash@xxxxxxxxxxxxxxxxxx> (Closes: #196706)
-  * Added example configuration for gnus from Andreas Kneib 
-    <Andreas.Kneib@xxxxxxxxxxx> (Closes: #196557)
-  * Noted the perl5.6->perl5.8 upgrade bug in README.Debian
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Thu, 19 Jun 2003 21:02:34 -0400
-
-spamassassin (2.55-2) unstable; urgency=medium
-
-  * Really fix warnings in spamassassin.config (D'oh!)
-    (Closes: #194989, #195076, #195076, #195335)
-  * Set TMPDIR in init script (Closes: #195290)
-  * urgency=medium because 2.55-1 is 9 days old, and testing deserves 2.55
-    soon, and these changes are fairly simple
-  * Updated french debconf templates (Closes: #195011)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Fri, 30 May 2003 23:57:06 -0400
-
-spamassassin (2.55-1) unstable; urgency=low
-
-  * New upstream release
-  * Fix warning in spamassassin.config (Closes: #193770)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Tue, 20 May 2003 17:53:18 -0400
-
-spamassassin (2.54-3) unstable; urgency=low
-
-  * Handle the possibility of debconf not being installed when
-    spamassassin.preinst is run. (Why didn't lintian catch this?)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Sat, 17 May 2003 18:38:58 -0400
-
-spamassassin (2.54-2) unstable; urgency=low
-
-  * Improves debconf handling of upgrade from previous versions (like
-      woody). (Closes: #191872, #192721)
-  * Rewritten spamassassin.config in perl
-  * This no longer bends over backwards to fix stuff I broke in 2.11
-    (which was never in a stable release, and is over a year old)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Wed, 14 May 2003 18:39:53 -0400
-
-spamassassin (2.54-1) unstable; urgency=low
-
-  * New upstream release
-      Include improved Bayes documentation (Closes: #185221)
-      Updates documentation in USAGE.gz (Closes: #185763)
-      Better scores (Closes: #191280)
-      Added rule TOO_MANY_MUA (Closes: #190380)
-      Fixed pyzor reporting (Closes: #184574)
-  * Tightened up logcheck messages, for use in
-    /etc/logcheck/ignore.d.paranoid (Closes: #187742)
-  * Applied patch from Andre Luis Lopes to fix pt_BR tranlations.
-      (Closes: #187745)
-  * Added french debconf translation (From Christian Perrier
-      <bubulle@xxxxxxxxxx>) (Closes: #190113)
-  * Added automatic call to debconf-updatepo in debian/rules
-  * Added example .muttrc snippet (Closes: #192713)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Wed, 14 May 2003 00:24:42 -0400
-
-spamassassin (2.53-1) unstable; urgency=low
-
-  * New upstream release (Closes: #185887)
-      Fixes false positives in SUBJ_ALL_CAPS from KOI8 mail (Closes:
-       #168682)
-      Fixes problems with --syslog-socket=none (Closes: #179925)
-      Fixes --nouser-config (Closes: #164284)
-      base64 and utf-8 no longer penalized (Closes: #165393)
-      spamd now does setgid in addition to setuid (Closes: #182869)
-      sa-learn docs explain ham as non-spam (Closes: #183286)
-      Fixes some Bayes corruption
-  * Fixes logcheck format. (Closes: #182838)
-  * Added -m option by default. (Closes: #183323)
-  * Added po-debconf support (Patch from Andre Luis Lopes
-    <andrelop@xxxxxxxxx>) (Closes: #184126)
-  * Added a debian/watch file for uscan
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Thu,  3 Apr 2003 19:23:43 -0500
-
-spamassassin (2.50-1) unstable; urgency=low
-
-  * New upstream release: (Closes: #181836)
-      Bayesian learner component
-      Better scores (Closes: #177317)
-      New (and improved!) report format
-      Bugfixes!
-      Closes: #179641, #166567, #180115, #180117, #164367, #161067,
-      #165428, #165731, #170881, #154812, #163179, #164960, #161696,
-      #163297, #163328
-       
-  * Added rules/STATISTICS.txt to /usr/share/doc/spamassassin (Closes: #179799)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Wed, 26 Feb 2003 22:58:58 -0500
-
-spamassassin (2.44-1) unstable; urgency=low
-
-  * New upstream release (mainly bugfixes) (Closes: #160206)
-  * Acknowledge NMU (Closes: #178936)
-  * Bumped priority of debconf question to high
-    (Closes: #167451, #167452, #169751
-  * Removed dependency on libnet-smtp-server-perl (Closes: #175129)
-  * Fixed debian/rules CFLAGS with patch from <tino.keitel@xxxxxx>
-    (Closes: #176659)
-  * Fix lintian warning:
-    "W: spamassassin: init-script-suggests-versioned-depends postinst"
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Fri, 31 Jan 2003 19:19:25 -0500
-
-spamassassin (2.43-1.1) unstable; urgency=high
-
-  * Non-maintainer upload at maintainer request
-  * Apply patch for overflow as reported to BUGTRAQ
-    "SpamAssassin / spamc+BSMTP remote buffer overflow"
-    (spamd/libspamc.c)
-  * Depending on how spamc is built, this may or may not be
-    exploitable
-
- -- Matt Zimmerman <mdz@xxxxxxxxxx>  Wed, 29 Jan 2003 11:08:12 -0500
-
-spamassassin (2.43-1) unstable; urgency=low
-
-  * New upstream release
-  * The -m option is no longer recommended. It is buggy.
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Tue, 15 Oct 2002 23:18:01 -0400
-
-spamassassin (2.42-1) unstable; urgency=low
-
-  * New upstream release
-    (Closes: #160309, #160901, #162013, #159704, #163143, #156263)
-      Various AWL fixes
-      -m fixed (better)
-      Various misc bug fixes.
-  * Added SENT_BY_AFBACKUP and SENT_BY_APTLC to 65_debian.cf
-    (Closes: #155527, #155634)
-  * Added --oknodo's in /etc/init.d/spamassassin (Closes: #161981)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Fri,  4 Oct 2002 18:18:10 -0400
-
-spamassassin (2.41-2) unstable; urgency=low
-
-  * Applies perl-5.8 / -m patch for spamd.
-    (Closes: #159826, #159038, #159984)
-  * Adds debconf note for removal of spamproxyd (Closes: #159930)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Sat,  7 Sep 2002 11:23:40 -0400
-
-spamassassin (2.41-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Thu,  5 Sep 2002 18:07:13 -0400
-
-spamassassin (2.40-1) unstable; urgency=low
-
-  * New upstream release:
-    Spamproxyd removed -- WILL BREAK CONFIGS -- sorry! (Closes: #156938)
-    Spamassassin will no longer deliver mail, only filter (-P flag by
-     default/can't negate)
-    all_spam_to improved to be smarter (Closes: #151320)
-    config option to avoid checking dns before use (Closes: #153245)
-
-  * Init script will not fail on stop if spamd not running
-    (Closes: #158913)
-  * Logcheck files fixed (symlinks removed, messages updated)
-    (Closes: #146221, #155295)
-  * "N16" fix applied. (Will be in upstream 2.41)
-  * Added link to dman's exim integration stuff in README.Debian
-    (Closes: #151526)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Tue,  3 Sep 2002 01:47:17 -0400
-
-spamassassin (2.31-2) unstable; urgency=low
-
-  * Changed Recommends: spamc to Depends: spamc
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Tue, 25 Jun 2002 13:38:15 -0400
-
-spamassassin (2.31-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Thu, 20 Jun 2002 23:09:42 -0400
-
-spamassassin (2.30-2) unstable; urgency=low
-
-  * Changed init script to use /var/run/spamd.pid
-  * Fixed logcheck file to match setuid succeeded messages
-  * Split spamc into a separate package. Let the bug reports begin!
-    (Closes: #137140)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Mon, 17 Jun 2002 14:49:38 -0400
-
-spamassassin (2.30-1) unstable; urgency=low
-
-  * New upstream release (Closes: #140300, #147625, #144482, #143316,
-    #146588, #13977)
-  * Added debconf e-mails to whitelist (Closes: #147465)
-  * Added depends on libtime-hires-perl
-  * Moved to section mail (interpreters doesn't make sense - spamassassin
-    isn't just a perl module)
-  * Removed README.Upgrade. I doubt anyone still uses 1.15
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Sat, 15 Jun 2002 01:24:15 -0400
-
-spamassassin (2.20-2) unstable; urgency=low
-
-  * Added depends on libnet-smtp-server-perl (Closes: #145297). Depending on
-    the outcome of bug 119517, this may be downgraded to a Recommends:.
-  * Removed extra empty dir /usr/share/spamassassin (Closes: #145323)
-  * Added recommends: for libmailtools-perl (Closes: #143935)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Fri, 10 May 2002 20:37:08 -0400
-
-spamassassin (2.20-1) unstable; urgency=medium
-
-  * New upstream release. (Closess: #140300, #140910, #143324, #134669,
-    #136329, #140422, #140910)
-  * This fixes the "razor 1.20-1 bug" (143324)
-  * New features. Yay! (including the -S (short-ciruit) flag for spamd)
-  * Urgency=medium to beat razor 1.20-1 to woody.
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Sat, 20 Apr 2002 00:05:40 -0400
-
-spamassassin (2.11-4) unstable; urgency=medium
-
-  * "Fixes" configuration files "problem"/"bug." I'm really not happy with
-    putting upstream rules and scores in /etc/spamassassin. But I guess I
-    don't have a choice. Do I? (Closes: #141484)
-  * Fixes pathes in Mail::SpamAssassin::Conf docs. (Closes: #141172)
-  * Fixes "spelling" mistake in description. (Closes #141512)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Sun,  7 Apr 2002 22:02:29 -0400
-
-spamassassin (2.11-3) unstable; urgency=low
-
-  * Fixes, and undoes previous damage relating to the logcheck bug (Closes:
-    #140773)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Tue,  2 Apr 2002 17:57:17 -0500
-
-spamassassin (2.11-2) unstable; urgency=low
-
-  * Fixes the logcheck bug (Closes: #139201)
-  * Set SUBJ_FULL_OF_8BITS to 0 (Closes: #140344)
-  * Set RCVD_IN_ORBZ to 0 (Closes: #139204)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Sat, 30 Mar 2002 14:48:22 -0500
-
-spamassassin (2.11-1) unstable; urgency=medium
-
-  * New upstream release (mainly saner scores)
-  * Fixed description in user_prefs file to be less confusing (Closes:
-    #136648)
-  * urgency=medium since the last upload never quite got to testing
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Mon,  4 Mar 2002 19:23:08 -0500
-
-spamassassin (2.10-1) unstable; urgency=medium
-
-  * New upstream release
-    Closes: #131442, #131317, #133026, #131438, #131193, #136047, #134660,
-    #134557
-  * New features: _HITS_ and _REQD_ in subject_tag display number
-    of hits/required hits, more tests, etc.
-  * Fixed minor dependency thing (Closes: #131797)
-  * Included logcheck files (Closes: #131161)
-  * Actually added README.Upgrade (Closes: #131188)
-  * Fixed some postrm to purge old files (from 1.5)
-  * Added a line to /etc/init.d/spamassassin to clarify (stupid)
-    misconceptions (Closes: #134566)
-  * Moved manpages to their proper place (ie. .3perl and .8)
-  * Included (fixed) check_whitelist in examples dir (Closes: #135383)
-  * Put daemons in /usr/sbin (Closes: #135703)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Sun, 17 Feb 2002 19:49:28 -0500
-
-spamassassin (2.01-1) unstable; urgency=low
-
-  * New upstream release (lots of new features!)
-    Closes: #129738, #130260, #126461, #123630, #123886, #123889, #128415
-  * Added Debian specific config.  (Closes: #126073)
-  * Moved spamd to boot up earlier than exim (i.e. 19)  (Closes #131028)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Sat, 26 Jan 2002 17:24:05 -0500
-
-spamassassin (1.5-5) unstable; urgency=low
-
-  * Fixed postinst (Closes: #123954)
-  * Fixed typo in init. (I really need to learn to spel!) (Closes: #124077)
-  * Fixed the dpkg dependency to 1.8.1 (Closes: #123320 again!)
-  * Disables foreign character set tests by default (bug 126073, but
-    still have to deal with other half)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Sat, 22 Dec 2001 16:28:56 -0500
-
-spamassassin (1.5-4) unstable; urgency=low
-
-  * Fixed my (ahem...) little typo (that caused spamassassin to not work at
-    all) (Closes: #123721)
-  * Moved /etc/default/spamd.conf to /etc/default/spamassassin (Closes:
-    #123722)
-  * Fixed hang bug in spamassassin.cf (VERY_SUSP_RECIPS and
-    VERY_SUSP_CC_RECIPS)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Wed, 12 Dec 2001 21:09:21 -0500
-
-spamassassin (1.5-3) unstable; urgency=low
-
-  * Changed the regexp for SUBJ_HAS_UNIQ_ID so it doesn't get triggered on
-    stuff like "Subject: Broken: tar -zxvf" (Closes: #123196)
-  * Moved /usr/share/perl5/spamassassin.cf and .prefs to
-    /usr/share/spamassassin/ (Closes: #123475)
-  * Fixed "name" in init script to spamd (not spamassassin) like it was in
-    1.5-1 (Closes: #123545)
-  * Fixed -e option.  (Closes: #123551)
-  * Added Depends on dpkg >= 1.9.0  (I still don't know what version it
-    should be. (Closes: #123320 (again!)
-  * Got rid of the Conflicts and Replaces on libmail-spamassassin-perl.  I
-    figure everyone has upgraded by now, or can figure it out!
-  * Got rid of explicit razor depends, now just librazor-perl
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Tue, 11 Dec 2001 20:14:07 -0500
-
-spamassassin (1.5-2) unstable; urgency=low
-
-  * Added Build-Depends for ia64 (bind-dev)  (Closes some bug yet to be
-    filed)
-  * Clarfied README.Debian (Closes: #123194, #123240)
-  * Fixed word_in_dictionary bug
-  * Added warning to spamd users using an old version of dpkg
-    (Closes: #123320)
-  * Added mass-check to examples (for bug 123290)
-
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Mon, 10 Dec 2001 11:37:57 -0500
-
-spamassassin (1.5-1) unstable; urgency=low
+spamassassin (2.60-rc5-cvs+20030916-1) experimental; urgency=low
 
-  * Initial Release. (Closes: #120975)
+  * CVS packaged version
+  * A changelog to previous versions is not included. Please see the
+    official Debian packages for changelog information.
 
- -- Duncan Findlay <duncf@xxxxxxxxxx>  Fri,  7 Dec 2001 20:54:03 -0500
+ -- Anonymous CVS Builder <nobody@nowhere>  Tue, 16 Sep 2003 22:55:50 -0400

Index: control
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/debian/control,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -w -u -d -r1.9 -r1.10
--- control     21 Jun 2003 01:25:21 -0000      1.9
+++ control     17 Sep 2003 03:10:26 -0000      1.10
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Duncan Findlay <duncf@xxxxxxxxxx>
 Uploaders: Jesus Climent <jesus.climent@xxxxxxxxxxxxx>
-Build-Depends: debhelper (>= 4.1.16), perl (>= 5.6.0-16)
-Standards-Version: 3.5.7
+Build-Depends: debhelper (>= 4.1.16), perl (>= 5.6.0-16), libssl-dev
+Standards-Version: 3.6.1
 
 Package: spamassassin
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}, libhtml-parser-perl, spamc (>= 2.30)
 Recommends: libnet-dns-perl, libmailtools-perl
-Suggests: razor
+Suggests: razor, libio-socket-ssl-perl
 Provides: libmail-spamassassin-perl
 Description: Perl-based spam filter using text analysis
  spamassassin is a very powerful and fully configurable spam filter

Index: rules
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/debian/rules,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -w -u -d -r1.10 -r1.11
--- rules       10 Sep 2003 03:30:37 -0000      1.10
+++ rules       17 Sep 2003 03:10:26 -0000      1.11
@@ -29,9 +29,6 @@
 
 PERL = /usr/bin/perl
 
-PREFIX     = /usr
-SYSCONFDIR = /etc
-
 packagea = spamc
 packagei = spamassassin
 
@@ -43,9 +40,9 @@
        dh_testdir
 
        perl Makefile.PL INSTALLDIRS=vendor \
-         PREFIX=$(PREFIX) SYSCONFDIR=$(SYSCONFDIR) \
-         CONFDIR=$(SYSCONFDIR)/spamassassin \
-         DESTDIR=$(CURDIR)/debian/$(packagei) < /dev/null
+        DESTDIR=$(CURDIR)/debian/$(packagei) \
+        CONFDIR=/etc/spamassassin \
+        ENABLE_SSL=yes < /dev/null
 
        touch configure-stamp
 
@@ -68,7 +65,7 @@
        dh_clean
 
 debian/po/templates.pot: debian/spamassassin.templates
-       debconf-updatepo
+       -debconf-updatepo
 
 # Spamassassin ONLY
 
@@ -125,11 +122,11 @@
        dh_testdir -i
        dh_testroot -i
        dh_installdebconf -i
-       dh_installdocs -i
-       dh_installexamples -i
+       dh_installdocs -i -XCVS
+       dh_installexamples -i -XCVS
        dh_installinit -i -- defaults 19
        dh_installchangelogs Changes -i
-#      dh_link -i
+       dh_link -i
        dh_compress -i
        dh_fixperms -i
        dh_installdeb -i
@@ -168,7 +165,7 @@
 binary-arch: build-arch install-arch
        dh_testdir -a
        dh_testroot -a
-       dh_installdocs -a
+       dh_installdocs -a -XCVS
        dh_installman -a
        dh_installchangelogs Changes -a
        dh_strip -a

Index: spamassassin.docs
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/debian/spamassassin.docs,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -w -u -d -r1.3 -r1.4
--- spamassassin.docs   27 Feb 2003 21:41:40 -0000      1.3
+++ spamassassin.docs   17 Sep 2003 03:10:26 -0000      1.4
@@ -7,6 +7,7 @@
 sample-nonspam.txt
 sample-spam.txt
 debian/README.Upgrade
+debian/README.Exim3
 rules/STATISTICS.txt
 rules/STATISTICS-set1.txt
 rules/STATISTICS-set2.txt

Index: spamassassin.preinst
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/debian/spamassassin.preinst,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -w -u -d -r1.4 -r1.5
--- spamassassin.preinst        17 May 2003 22:47:44 -0000      1.4
+++ spamassassin.preinst        17 Sep 2003 03:10:26 -0000      1.5
@@ -7,5 +7,17 @@
     db_stop
 fi
 
+# We're still getting some wierdness with symlinks
+# Bug 201324
+if [ -h /etc/logcheck/ignore.d.server/spamassassin ] ; then
+    rm -f /etc/logcheck/ignore.d.server/spamassassin
+fi
+if [ -h /etc/logcheck/ignore.d.workstation/spamassassin ] ; then
+    rm -f /etc/logcheck/ignore.d.workstation/spamassassin
+fi
+if [ -h /etc/logcheck/ignore.d.paranoid/spamassassin ] ; then
+    rm -f /etc/logcheck/ignore.d.paranoid/spamassassin
+fi
+
 
 #DEBHELPER#

Index: spamassassin.templates
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/debian/spamassassin.templates,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -w -u -d -r1.4 -r1.5
--- spamassassin.templates      17 May 2003 22:14:36 -0000      1.4
+++ spamassassin.templates      17 Sep 2003 03:10:26 -0000      1.5
@@ -1,6 +1,6 @@
 Template: spamassassin/upgrade/2.40
 Type: note
-Description: Major changes to SpamAssassin mail stream integration
+_Description: Major changes to SpamAssassin mail stream integration
  spamassassin now takes the -P argument by default to act as a pipe
  instead of doing local delivery. If you have been using spamassassin
  (without the -P argument) to do local delivery, you will need to fix
@@ -17,7 +17,7 @@
 
 Template: spamassassin/upgrade/2.40w
 Type: note
-Description: Major changes to SpamAssassin mail stream integration
+_Description: Major changes to SpamAssassin mail stream integration
  As of version 2.40-1, spamproxyd is no longer available. (This was an
  upstream decision) It appears that spamproxyd is running, therefore,
  it is likely that this will cause problems. You will need to find
@@ -34,11 +34,9 @@
 
 Template: spamassassin/upgrade/2.42m
 Type: select
-Choices: Yes, No
-Choices-fr.ISO-8859-15: Oui, Non
-Choices-pt_BR.ISO-8859-1: Sim, Não
+_Choices: Yes, No
 Default: No
-Description: Delete config files in /etc/spamassassin?
+_Description: Delete config files in /etc/spamassassin?
  As of 2.42-1, rules files for spamassassin will be placed in
  /usr/share/spamassassin because of a tighter relationship between
  rule files and the version of spamassassin. You currently have
@@ -49,11 +47,9 @@
 
 Template: spamassassin/upgrade/2.42u
 Type: select
-Choices: Yes, No
-Choices-fr.ISO-8859-15: Oui, Non
-Choices-pt_BR.ISO-8859-1: Sim, Não
+_Choices: Yes, No
 Default: No
-Description: Delete out of date config files in /etc/spamassassin?
+_Description: Delete out of date config files in /etc/spamassassin?
  As of 2.42-1, rules files for spamassassin will be placed in
  /usr/share/spamassassin because of a tighter relationship between
  rule files and the version of spamassassin. You have not modified
@@ -63,18 +59,8 @@
 
 Template: spamassassin/upgrade/cancel
 Type: select
-Choices: Continue, Cancel
-Choices-fr.ISO-8859-15: Continuer, Abandonner
-Choices-pt_BR.ISO-8859-1: Continuar, Cancelar
+_Choices: Continue, Cancel
 Default: Continue
-Description: There may be errors on the upgrade.
+_Description: There may be errors on the upgrade.
  As previously indicated, you may experience errors after this upgrade. You
  may cancel now, and fix the problem, or you may continue.
-Description-fr.ISO-8859-15: Des erreurs sont possibles pendant la mise à jour.
- Comme cela a été signalé auparavant, vous pourriez être confronté à des
- erreurs lors de la mise à jour. Vous pouvez abandonner maintenant et
- corriger le problème ou continuer la mise à jour.
-Description-pt_BR.ISO-8859-1: Podem existir erros na atualização.
- Como indicado anteriormente, você pode encontrar erros depois desta
- atualização. Você pode cancelá-la agora e corrigir o problema ou pode
- continuar.

--- changelog.in DELETED ---

--- spamassassin.postrm DELETED ---



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf