Hello community, here is the log from the commit of package spamassassin checked in at Tue Jun 6 22:25:58 CEST 2006. -------- --- spamassassin/spamassassin.changes 2006-05-29 16:11:55.000000000 +0200 +++ spamassassin/spamassassin.changes 2006-06-06 16:47:42.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Jun 6 16:43:42 CEST 2006 - varkoly@suse.de + +- update to version 3.1.3: + * #181157: VUL-0: spamassassin: remote root + * 4879: add in pointer to the wiki to find out more about debug channels + + +------------------------------------------------------------------- Old: ---- Mail-SpamAssassin-3.1.2.tar.bz2 New: ---- Mail-SpamAssassin-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spamassassin.spec ++++++ --- /var/tmp/diff_new_pack.GDtTtQ/_old 2006-06-06 22:25:47.000000000 +0200 +++ /var/tmp/diff_new_pack.GDtTtQ/_new 2006-06-06 22:25:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package spamassassin (Version 3.1.2) +# spec file for package spamassassin (Version 3.1.3) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ Group: Productivity/Networking/Email/Utilities Provides: spamassassin URL: http://spamassassin.org/ -Version: 3.1.2 +Version: 3.1.3 Release: 1 Requires: perl-spamassassin = %version Autoreqprov: on @@ -154,6 +154,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -n spamassassin +* Tue Jun 06 2006 - varkoly@suse.de +- update to version 3.1.3: + * #181157: VUL-0: spamassassin: remote root + * 4879: add in pointer to the wiki to find out more about debug channels * Mon May 29 2006 - dmueller@suse.de - update to version 3.1.2: * bug 4802: implement DKIM plugin, including whitelist_from_dkim support ++++++ Mail-SpamAssassin-3.1.2.tar.bz2 -> Mail-SpamAssassin-3.1.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mail-SpamAssassin-3.1.2/MANIFEST new/Mail-SpamAssassin-3.1.3/MANIFEST --- old/Mail-SpamAssassin-3.1.2/MANIFEST 2006-05-24 22:07:30.000000000 +0200 +++ new/Mail-SpamAssassin-3.1.3/MANIFEST 2006-06-06 16:20:16.000000000 +0200 @@ -370,7 +370,6 @@ t/data/whitelists/register.com_password t/data/whitelists/ryanairmail.com t/data/whitelists/sf.net -t/data/whitelists/winxpnews.com t/data/whitelists/yahoo-inc.com t/db_awl_path.t t/db_based_whitelist.t diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mail-SpamAssassin-3.1.2/lib/Mail/SpamAssassin.pm new/Mail-SpamAssassin-3.1.3/lib/Mail/SpamAssassin.pm --- old/Mail-SpamAssassin-3.1.2/lib/Mail/SpamAssassin.pm 2006-05-25 19:02:01.000000000 +0200 +++ new/Mail-SpamAssassin-3.1.3/lib/Mail/SpamAssassin.pm 2006-06-01 16:39:22.000000000 +0200 @@ -94,20 +94,20 @@ @site_rules_path }; -$VERSION = "3.001002"; # update after release (same format as perl $]) +$VERSION = "3.001003"; # 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-05-25 09:58:05 -0700 (Thu, 25 May 2006) $ updated by SVN'))[1]; +$SUB_VERSION = (split(/\s+/,'$LastChangedDate: 2006-06-01 07:35:36 -0700 (Thu, 01 Jun 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: 409413 $ updated by SVN}[1])); + ('r' . qw{$LastChangedRevision: 410869 $ updated by SVN}[1])); } sub Version { @@ -1353,14 +1353,15 @@ $fname = $self->{userprefs_filename}; $fname ||= $self->first_existing_path (@default_userprefs_path); - if (defined $fname) { - if (!-f $fname && !$self->{dont_copy_prefs} && !$self->create_default_prefs($fname)) { + if (!$self->{dont_copy_prefs}) { + # bug 4932: if the userprefs path doesn't exist, we need to make it, so + # just use the last entry in the array as the default path. + $fname ||= $self->sed_path($default_userprefs_path[-1]); + + if (!-f $fname && !$self->create_default_prefs($fname)) { warn "config: failed to create default user preference file $fname\n"; } } - else { - warn "config: could not find userprefs file\n"; - } $self->{config_text} .= $self->read_cf ($fname, 'user prefs file'); } @@ -1472,18 +1473,19 @@ $fname ||= $self->first_existing_path (@default_userstate_dir); - if (defined $fname) { - if (!$self->{dont_copy_prefs}) { - dbg("config: using \"$fname\" for user state dir"); - } - - if (!-d $fname) { - # not being able to create the *dir* is not worth a warning at all times - eval { mkpath($fname, 0, 0700) } or dbg("config: mkdir $fname failed: $@ $!\n"); - } + # bug 4932: use the last default_userstate_dir entry if none of the others + # already exist + $fname ||= $self->sed_path($default_userstate_dir[-1]); + + if (!$self->{dont_copy_prefs}) { + dbg("config: using \"$fname\" for user state dir"); } - else { - info("config: can not determine userstate dir\n"); + + # bug 4932: we always want to make the userstate directory, even if + # dont_copy_prefs is true for things like bayes, awl, etc. + if (!-d $fname) { + # not being able to create the *dir* is not worth a warning at all times + eval { mkpath($fname, 0, 0700) } or dbg("config: mkdir $fname failed: $@ $!\n"); } $fname; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mail-SpamAssassin-3.1.2/rules/v312.pre new/Mail-SpamAssassin-3.1.3/rules/v312.pre --- old/Mail-SpamAssassin-3.1.2/rules/v312.pre 2006-05-24 22:07:29.000000000 +0200 +++ new/Mail-SpamAssassin-3.1.3/rules/v312.pre 2006-06-01 16:37:29.000000000 +0200 @@ -3,7 +3,7 @@ # See 'perldoc Mail::SpamAssassin::Conf' for details of what can be # tweaked. # -# This file was installed during the installation of SpamAssassin 3.2.0, +# This file was installed during the installation of SpamAssassin 3.1.2, # and contains plugin loading commands for the new plugins added in that # release. It will not be overwritten during future SpamAssassin installs, # so you can modify it to enable some disabled-by-default plugins below, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mail-SpamAssassin-3.1.2/spamassassin.spec new/Mail-SpamAssassin-3.1.3/spamassassin.spec --- old/Mail-SpamAssassin-3.1.2/spamassassin.spec 2006-05-24 22:07:30.000000000 +0200 +++ new/Mail-SpamAssassin-3.1.3/spamassassin.spec 2006-06-01 16:37:29.000000000 +0200 @@ -1,5 +1,5 @@ # the version in the tar name -%define real_version 3.1.2 +%define real_version 3.1.3 # the display version number %define version %{real_version} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Mail-SpamAssassin-3.1.2/spamd/spamd.raw new/Mail-SpamAssassin-3.1.3/spamd/spamd.raw --- old/Mail-SpamAssassin-3.1.2/spamd/spamd.raw 2006-05-24 22:07:29.000000000 +0200 +++ new/Mail-SpamAssassin-3.1.3/spamd/spamd.raw 2006-06-01 16:38:54.000000000 +0200 @@ -1716,19 +1716,22 @@ my ($name, $pwd, $uid, $gid, $quota, $comment, $gcos, $dir, $etc) = getpwnam($userid); - if (!$spamtest->{'paranoid'} && !defined($uid)) { - # if we are given a username, but can't look it up, maybe name - # services are down? let's break out here to allow them to get - # 'defaults' when we are not running paranoid - info("spamd: handle_user unable to find user: $userid\n"); - return 0; + if (!defined $uid) { + my $errmsg = "spamd: handle_user unable to find user: '$userid'\n"; + die $errmsg if $spamtest->{'paranoid'}; + # if we are given a username, but can't look it up, maybe name + # services are down? let's break out here to allow them to get + # 'defaults' when we are not running paranoid + info($errmsg); + return 0; } - # not sure if this is required, the documentation says it isn't - $uid =~ /^(\d+)$/ and $uid = $1; # de-taint - $gid =~ /^(\d+)$/ and $gid = $1; # de-taint - if ($setuid_to_user) { + + # not sure if this is required, the documentation says it isn't + $uid =~ /^(\d+)$/ and $uid = $1; # de-taint + $gid =~ /^(\d+)$/ and $gid = $1; # de-taint + $) = "$gid $gid"; # change eGID $> = $uid; # change eUID if ( !defined($uid) || ( $> != $uid and $> != ( $uid - 2**32 ) ) ) { @@ -1745,12 +1748,12 @@ # if ( $opt{'vpopmail'} ) { my $vpopdir = $dir; - $dir = `$vpopdir/bin/vuserinfo -d $username`; + $dir = `$vpopdir/bin/vuserinfo -d \Q$username\E`; if ($? != 0) { # # If vuserinfo failed $username could be an alias # - $dir = `$vpopdir/bin/valias $username`; + $dir = `$vpopdir/bin/valias \Q$username\E`; if ($? == 0 && $dir !~ /.+ -> &/) { $dir =~ s,.+ -> (/.+)/Maildir/,$1,; } else { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org