Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2012-10-18 22:03:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spamassassin", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2012-07-12 14:55:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2012-10-18 22:03:30.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 26 13:37:00 UTC 2012 - [email protected] + +- replace iXhash with the inofficial, but recommended, version iXhash2 + +------------------------------------------------------------------- Old: ---- iXhash-1.5.5.tgz New: ---- iXhash2-2.05.tar.gz iXhash2-meta-rules.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spamassassin.spec ++++++ --- /var/tmp/diff_new_pack.zP8uwh/_old 2012-10-18 22:03:32.000000000 +0200 +++ /var/tmp/diff_new_pack.zP8uwh/_new 2012-10-18 22:03:32.000000000 +0200 @@ -16,10 +16,10 @@ # -%define ix_version 1.5.5 +%define ix_version 2.05 %define spd_version 2.20 -%define IXHASH iXhash-%{ix_version} +%define IXHASH iXhash2-%{ix_version} %define SPAMPD spampd-%{spd_version} Name: spamassassin @@ -32,7 +32,7 @@ Url: http://spamassassin.org/ Source: http://search.cpan.org/CPAN/authors/id/K/KM/KMCGRAIL/Mail-SpamAssassin-%{version}.tar.gz Source1: Mail-SpamAssassin-rules-%{version}.tar.bz2 -Source2: %{IXHASH}.tgz +Source2: %{IXHASH}.tar.gz Source3: %{SPAMPD}.tar.gz Source10: local.cf Source11: init.spamd @@ -47,6 +47,7 @@ Patch2: patch-URIDNSBL Patch3: patch-SQL_ASCII_SORT Patch6: bnc#582111.diff +Patch10: iXhash2-meta-rules.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} PreReq: %insserv_prereq %fillup_prereq @@ -77,6 +78,7 @@ Summary: Perl Modules For Using Spamassassin Within An Own Perl Script Group: Development/Libraries/Perl BuildRequires: perl +BuildRequires: perl-Error BuildRequires: perl-macros BuildRequires: perl(Archive::Tar) >= 1.23 BuildRequires: perl(Digest::SHA1) @@ -130,6 +132,7 @@ Recommends: perl(IO::Socket::SSL) Recommends: perl(DBI) Recommends: perl(Encode::Detect) +Recommends: cron Provides: perl-spamassassin = %version Obsoletes: perl-spamassassin < %version @@ -138,16 +141,18 @@ the filter rules. This package is required for the package "spamassassin", the commandline tool. -%package -n perl-Mail-SpamAssassin-Plugin-iXhash +%package -n perl-Mail-SpamAssassin-Plugin-iXhash2 Summary: The iXhash plugin for SpamAssassin Group: Development/Libraries/Perl Requires: perl-Mail-SpamAssassin = %version Version: %{ix_version} Release: 0 +Provides: perl-Mail-SpamAssassin-Plugin-iXhash = %{ix_version} +Obsoletes: perl-Mail-SpamAssassin-Plugin-iXhash < 2 %{perl_requires} -%description -n perl-Mail-SpamAssassin-Plugin-iXhash -This archive contains the iXhash plugin for the SpamAssassin spam filtering +%description -n perl-Mail-SpamAssassin-Plugin-iXhash2 +This archive contains the iXhash2 plugin for the SpamAssassin spam filtering software, along with an example config file. Basically the plugin provides a network-based test just as razor2, pyzor @@ -163,8 +168,7 @@ %patch2 -p0 %patch3 -p0 %patch6 -p0 -# fix wrong-file-end-of-line-encoding -dos2unix %{IXHASH}/CHANGELOG +%patch10 -p0 %build if [ -e t/data/whitelists/winxpnews.com ]; then @@ -193,15 +197,15 @@ %perl_make_install %perl_process_packlist %perl_gen_filelist -# remove %{_bindir} from filelist +# remove %%{_bindir} from filelist %{__sed} -i -e "/\/usr\/bin/d" %{name}.files -# package only %{_mandir}/man3 +# package only %%{_mandir}/man3 %{__sed} -i -e "s,%{_mandir}/man?,%{_mandir}/man3," %{name}.files # -## perl-Mail-SpamAssassin-Plugin-iXhash stuff +## perl-Mail-SpamAssassin-Plugin-iXhash2 stuff %{__install} -d $RPM_BUILD_ROOT/etc/mail/spamassassin -cp %{IXHASH}/iXhash/iXhash.pm $RPM_BUILD_ROOT%{perl_vendorlib}/Mail/SpamAssassin/Plugin -sed 's/^\(load.*iXhash\) .*$/\1/' %{IXHASH}/iXhash/iXhash.cf >$RPM_BUILD_ROOT/etc/mail/spamassassin/iXhash.cf +cp %{IXHASH}/iXhash2.pm $RPM_BUILD_ROOT%{perl_vendorlib}/Mail/SpamAssassin/Plugin +cp %{IXHASH}/iXhash2.cf $RPM_BUILD_ROOT/etc/mail/spamassassin/iXhash2.cf # ## spamassassin stuff %{__install} -d $RPM_BUILD_ROOT/etc/cron.daily/ @@ -281,24 +285,20 @@ %files -n perl-Mail-SpamAssassin -f %{name}.files %defattr(-,root,root) -%doc CREDITS Changes INSTALL LICENSE MANIFEST* NOTICE PACKAGING README +%doc CREDITS Changes LICENSE MANIFEST* NOTICE PACKAGING README %doc TRADEMARK UPGRADE USAGE sample-nonspam.txt sample-spam.txt %doc ldap sql %dir /etc/mail -#%dir /etc/cron.daily/ %config(noreplace) /etc/mail/spamassassin %config(noreplace) /etc/cron.daily/suse.cron-sa-update -%exclude /etc/mail/spamassassin/iXhash.cf +%exclude /etc/mail/spamassassin/iXhash2.cf %dir /usr/share/spamassassin /usr/share/spamassassin/* -%files -n perl-Mail-SpamAssassin-Plugin-iXhash +%files -n perl-Mail-SpamAssassin-Plugin-iXhash2 %defattr(-,root,root) %doc %{IXHASH}/CHANGELOG %{IXHASH}/LICENSE %{IXHASH}/README -%doc %{IXHASH}/WHERE_ARE_THE_OTHER_FILES -%doc %{IXHASH}/hashcheck -%doc %{IXHASH}/iXhash.eml -%config(noreplace) /etc/mail/spamassassin/iXhash.cf -%{perl_vendorlib}/Mail/SpamAssassin/Plugin/iXhash.pm +%config(noreplace) /etc/mail/spamassassin/iXhash2.cf +%{perl_vendorlib}/Mail/SpamAssassin/Plugin/iXhash2.pm %changelog ++++++ iXhash2-meta-rules.patch ++++++ diff -ur iXhash2-2.05.orig/iXhash2.cf iXhash2-2.05/iXhash2.cf --- iXhash2-2.05.orig/iXhash2.cf 2012-07-08 13:29:31.000000000 +0200 +++ iXhash2-2.05/iXhash2.cf 2012-09-26 13:41:11.874466944 +0200 @@ -1,20 +1,40 @@ # Note: loadplugin should really go into local.pre or so -loadplugin Mail::SpamAssassin::Plugin::iXhash2 iXhash2.pm +loadplugin Mail::SpamAssassin::Plugin::iXhash2 ifplugin Mail::SpamAssassin::Plugin::iXhash2 -ixhashdnsbl GENERIC_IXHASH generic.ixhash.net. -body GENERIC_IXHASH eval:check_ixhash('GENERIC_IXHASH') -tflags GENERIC_IXHASH net - -ixhashdnsbl NIXSPAM_IXHASH ix.dnsbl.manitu.net. -body NIXSPAM_IXHASH eval:check_ixhash('NIXSPAM_IXHASH') -tflags NIXSPAM_IXHASH net - -ixhashdnsbl SEM_IXHASH ixhash.spameatingmonkey.net. -body SEM_IXHASH eval:check_ixhash('SEM_IXHASH') -tflags SEM_IXHASH net +ixhashdnsbl __GENERIC_IXHASH generic.ixhash.net. +body __GENERIC_IXHASH eval:check_ixhash('GENERIC_IXHASH') +tflags __GENERIC_IXHASH net + +ixhashdnsbl __NIXSPAM_IXHASH ix.dnsbl.manitu.net. +body __NIXSPAM_IXHASH eval:check_ixhash('NIXSPAM_IXHASH') +tflags __NIXSPAM_IXHASH net + +ixhashdnsbl __SEM_IXHASH ixhash.spameatingmonkey.net. +body __SEM_IXHASH eval:check_ixhash('SEM_IXHASH') +tflags __SEM_IXHASH net + +ixhashdnsbl __HOSTEUROPE_IXHASH hosteurope.ixhash.net. +body __HOSTEUROPE_IXHASH eval:check_ixhash('HOSTEUROPE_IXHASH') +tflags __HOSTEUROPE_IXHASH net + +ixhashdnsbl __JUNKMAIL_IXHASH ixhash.junkemailfilter.com. +body __JUNKMAIL_IXHASH eval:check_ixhash('JUNKMAIL_IXHASH') +tflags __JUNKMAIL_IXHASH net + +meta IXHASH_X1 (__GENERIC_IXHASH + __NIXSPAM_IXHASH + __SEM_IXHASH + __HOSTEUROPE_IXHASH + __JUNKMAIL_IXHASH) == 1 +describe IXHASH_X1 iXhash listed on one server +score IXHASH_X1 1.5 + +meta IXHASH_X2 (__GENERIC_IXHASH + __NIXSPAM_IXHASH + __SEM_IXHASH + __HOSTEUROPE_IXHASH + __JUNKMAIL_IXHASH) == 2 +describe IXHASH_X2 iXhash listed on two servers +score IXHASH_X2 2.5 + +meta IXHASH_X3 (__GENERIC_IXHASH + __NIXSPAM_IXHASH + __SEM_IXHASH + __HOSTEUROPE_IXHASH + __JUNKMAIL_IXHASH) > 2 +describe IXHASH_X3 iXhash listed on more than two servers +score IXHASH_X3 3.5 endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
