Hello community, here is the log from the commit of package spamassassin checked in at Thu Dec 7 21:29:06 CET 2006. -------- --- spamassassin/spamassassin.changes 2006-11-15 18:11:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/spamassassin/spamassassin.changes 2006-12-04 23:02:48.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 4 23:00:59 CET 2006 - dmueller@suse.de + +- update to "hot-fix" 3.1.7: + * fix sa-update failure when rule scores ae set + +------------------------------------------------------------------- Old: ---- Mail-SpamAssassin-3.1.6.tar.bz2 New: ---- Mail-SpamAssassin-3.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spamassassin.spec ++++++ --- /var/tmp/diff_new_pack.E5nFBc/_old 2006-12-07 21:28:45.000000000 +0100 +++ /var/tmp/diff_new_pack.E5nFBc/_new 2006-12-07 21:28:45.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package spamassassin (Version 3.1.6) +# spec file for package spamassassin (Version 3.1.7) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,8 +15,8 @@ License: The Apache Software License Group: Productivity/Networking/Email/Utilities URL: http://spamassassin.org/ -Version: 3.1.6 -Release: 12 +Version: 3.1.7 +Release: 1 Requires: perl-libwww-perl perl-IO-Zlib Requires: perl-spamassassin = %version Autoreqprov: on @@ -156,8 +156,11 @@ rm -rf $RPM_BUILD_ROOT %changelog -n spamassassin +* Mon Dec 04 2006 - dmueller@suse.de +- update to "hot-fix" 3.1.7: + * fix sa-update failure when rule scores ae set * Wed Nov 15 2006 - varkoly@suse.de -- fixing bug: 215722 – BUG in archive PgSQL.pm (SpamAssassin) +- fixing bug: 215722 BUG in archive PgSQL.pm (SpamAssassin) * Mon Oct 09 2006 - varkoly@suse.de - update to version 3.1.6: This is a maintenance release of the 3.1.x branch. * fixes to bug in date handling affecting DATE_IN_FUTURE_* ++++++ Mail-SpamAssassin-3.1.6.tar.bz2 -> Mail-SpamAssassin-3.1.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mail-SpamAssassin-3.1.6/Changes new/Mail-SpamAssassin-3.1.7/Changes --- old/Mail-SpamAssassin-3.1.6/Changes 2006-10-04 16:01:16.000000000 +0200 +++ new/Mail-SpamAssassin-3.1.7/Changes 2006-10-09 19:35:34.000000000 +0200 @@ -1,4 +1,20 @@ ------------------------------------------------------------------------ +r454083 | dos | 2006-10-08 05:55:22 +0000 (Sun, 08 Oct 2006) | 1 line + +bug 5119: revert r452712 change that breaks sa-update +------------------------------------------------------------------------ +r453304 | dos | 2006-10-05 17:59:08 +0000 (Thu, 05 Oct 2006) | 1 line + +3.1.7 devel cycle started +------------------------------------------------------------------------ +r452731 | dos | 2006-10-04 05:03:56 +0000 (Wed, 04 Oct 2006) | 1 line + +add contrib/check_spamd to MANIFEST +------------------------------------------------------------------------ +r452727 | dos | 2006-10-04 04:56:19 +0000 (Wed, 04 Oct 2006) | 1 line + +preparing to release 3.1.6 +------------------------------------------------------------------------ r452712 | dos | 2006-10-04 03:56:06 +0000 (Wed, 04 Oct 2006) | 1 line bug 5044: include local site config in sa-update lint checks diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mail-SpamAssassin-3.1.6/lib/Mail/SpamAssassin.pm new/Mail-SpamAssassin-3.1.7/lib/Mail/SpamAssassin.pm --- old/Mail-SpamAssassin-3.1.6/lib/Mail/SpamAssassin.pm 2006-10-04 16:01:48.000000000 +0200 +++ new/Mail-SpamAssassin-3.1.7/lib/Mail/SpamAssassin.pm 2006-10-09 19:35:00.000000000 +0200 @@ -95,20 +95,20 @@ @site_rules_path }; -$VERSION = "3.001006"; # update after release (same format as perl $]) -#$IS_DEVEL_BUILD = 1; # change for release versions +$VERSION = "3.001007"; # update after release (same format as perl $]) +# $IS_DEVEL_BUILD = 1; # change for release versions @ISA = qw(); # SUB_VERSION is now just <yyyy>-<mm>-<dd> -$SUB_VERSION = (split(/\s+/,'$LastChangedDate: 2006-10-03 21:56:19 -0700 (Tue, 03 Oct 2006) $ updated by SVN'))[1]; +$SUB_VERSION = (split(/\s+/,'$LastChangedDate: 2006-10-05 10:59:08 -0700 (Thu, 05 Oct 2006) $ updated by SVN'))[1]; # If you hacked up your SA, you should add a version_tag to your .cf files. # This variable should not be modified directly. @EXTRA_VERSION = qw(); if (defined $IS_DEVEL_BUILD && $IS_DEVEL_BUILD) { push(@EXTRA_VERSION, - ('r' . qw{$LastChangedRevision: 452727 $ updated by SVN}[1])); + ('r' . qw{$LastChangedRevision: 453304 $ updated by SVN}[1])); } sub Version { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mail-SpamAssassin-3.1.6/sa-update.raw new/Mail-SpamAssassin-3.1.7/sa-update.raw --- old/Mail-SpamAssassin-3.1.6/sa-update.raw 2006-10-04 16:01:16.000000000 +0200 +++ new/Mail-SpamAssassin-3.1.7/sa-update.raw 2006-10-09 19:34:35.000000000 +0200 @@ -18,7 +18,7 @@ # @LICENSE> my $VERSION = 'svn' . (split(/\s+/, - '$Id: sa-update.raw 452712 2006-10-04 03:56:06Z dos $'))[2]; + '$Id: sa-update.raw 454083 2006-10-08 05:55:22Z dos $'))[2]; my $PREFIX = '@@PREFIX@@'; # substituted at 'make' time my $DEF_RULES_DIR = '@@DEF_RULES_DIR@@'; # substituted at 'make' time @@ -362,19 +362,6 @@ } } -# --lint check the current site config before we download any updates so that -# a site with a broken config, with sa-update in a cron job, doesn't hammer -# the update servers continously downloading and then aborting the update when -# the lint check of the update (with the site config included) fails. -# Wait until now to do it since nothing above depends on a successful --lint. - -if (!lint_check_dir(File::Spec->catfile($opt{'updatedir'}, "doesnotexist"))) { - warn "error: lint check of current site config failed, cannot continue\n"; - dbg("diag: local site config must successfully lint before doing updates, ". - "exiting with code 2"); - exit 2; -} - my $res = Net::DNS::Resolver->new(); my $ua = LWP::UserAgent->new(); @@ -1200,6 +1187,7 @@ # "config" or otherwise be more terse. :( my $spamtest = new Mail::SpamAssassin( { rules_filename => $dir, + site_rules_filename => File::Spec->catfile($dir, "doesnotexist"), userprefs_filename => File::Spec->catfile($dir, "doesnotexist"), local_tests_only => 1, @@ -1387,8 +1375,6 @@ An exit code of C<1> means no fresh updates were available. -An exit code of C<2> means that a lint check of the current site config failed. - An exit code of C<4> or higher, indicates that errors occurred while attempting to download and extract updates. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mail-SpamAssassin-3.1.6/spamassassin.spec new/Mail-SpamAssassin-3.1.7/spamassassin.spec --- old/Mail-SpamAssassin-3.1.6/spamassassin.spec 2006-09-29 15:06:45.000000000 +0200 +++ new/Mail-SpamAssassin-3.1.7/spamassassin.spec 2006-10-09 19:34:35.000000000 +0200 @@ -1,5 +1,5 @@ # the version in the tar name -%define real_version 3.1.6 +%define real_version 3.1.7 # the display version number %define version %{real_version} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org