commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2020-02-03 11:26:41 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new.26092 (New) Package is "spamassassin" Mon Feb 3 11:26:41 2020 rev:81 rq:768649 version:unknown Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2019-12-18 14:48:12.593935639 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new.26092/spamassassin.changes 2020-02-03 11:26:42.898137465 +0100 @@ -1,0 +2,17 @@ +Wed Jan 29 19:26:21 UTC 2020 - Arjen de Korte + +- update spamassassin to 3.4.4 + * In this release, there are bug fixes for two CVEs: +CVE-2020-1931 for Nefarious rule configuration (.cf) files can + be configured to run system commands with warnings. +CVE-2020-1930 for Nefarious rule configuration (.cf) files can + be configured to run system commands with sa-compile. + * Improvements to OLEVBMacro + * Fix for CRLF handling with SpamAssMilter & DKIM + * Small fix for a regexp to provide Perl 5.8.x compatability again + * Increased fns_extrachars default value to 50 + * Fixed nosubject and maxhits tflags when sa-compile is used + * Limited the Bayes parsed token count + * Improvements to whitespace trimming + +--- Old: Mail-SpamAssassin-3.4.3.tar.bz2 Mail-SpamAssassin-3.4.3.tar.bz2.asc Mail-SpamAssassin-rules-3.4.3.r1871124.tgz Mail-SpamAssassin-rules-3.4.3.r1871124.tgz.asc New: Mail-SpamAssassin-3.4.4.tar.bz2 Mail-SpamAssassin-3.4.4.tar.bz2.asc Mail-SpamAssassin-rules-3.4.4.r1873061.tgz Mail-SpamAssassin-rules-3.4.4.r1873061.tgz.asc Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.MNENPD/_old 2020-02-03 11:26:44.254137523 +0100 +++ /var/tmp/diff_new_pack.MNENPD/_new 2020-02-03 11:26:44.258137523 +0100 @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,9 +23,9 @@ %define ix_version 2.05 %define spd_version 2.53 -%define sa_version 3.4.3 +%define sa_version 3.4.4 %define sa_float %(echo %{sa_version} | awk -F. '{ printf "%d.%03d%03d", $1, $2, $3 }') -%define rules_revision 1871124 +%define rules_revision 1873061 %define IXHASH iXhash2-%{ix_version} %define SPAMPD spampd-%{spd_version} ++ Mail-SpamAssassin-3.4.3.tar.bz2 -> Mail-SpamAssassin-3.4.4.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mail-SpamAssassin-3.4.3/CREDITS new/Mail-SpamAssassin-3.4.4/CREDITS --- old/Mail-SpamAssassin-3.4.3/CREDITS 2019-12-11 21:58:05.0 +0100 +++ new/Mail-SpamAssassin-3.4.4/CREDITS 2020-01-25 03:50:58.0 +0100 @@ -1,4 +1,4 @@ -Copyright (C) 2018 The Apache Software Foundation +Copyright (C) 2019 The Apache Software Foundation Project Management Committee (PMC): @@ -8,12 +8,14 @@ public contact); we request that the dev list should be used for all non-confidential correspondence. + - Giovanni Bechis - Karsten Bräckelmann - Alex Broens http://www.msf.org/en/donate - Bill Cole - John Hardin - Dave Jones - Adam Katz + - Henrik Krohns - Sidney Markowitz - Mark Martinec - Kevin A. McGrail @@ -22,11 +24,8 @@ Committers: - This list contains committers in alphabetical order (and their Amazon - wishlists). + This list contains committers in alphabetical order - - Giovanni Bechis - - Henrik Krohns - Paul Stead - Merijn van den Kroonenberg - Bryan Vest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mail-SpamAssassin-3.4.3/Changes new/Mail-SpamAssassin-3.4.4/Changes --- old/Mail-SpamAssassin-3.4.3/Changes 2019-12-11 21:58:03.0 +0100 +++ new/Mail-SpamAssassin-3.4.4/Changes 2020-01-25 03:50:47.0 +0100 @@ -1,4 +1,133 @@ +r1873122 | kmcgrail | 2020-01-25 02:04:07 + (Sat, 25 Jan 2020) | 1 +line + + preparing announcement for 3.4.4 + +r1872966 | kmcgrail | 2020-01-19 00:30:44 + (Sun, 19 Jan 2020) | 1 +line + + Preparing to release 3.4.4 + +r1872942 | hege | 2020-01-18 08:44:49 + (Sat, 18 Jan 2020) | 2 lines + + Revert DKIM change from Revision 1864870 (Bug 7785) +
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2019-12-18 14:44:32 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new.4691 (New) Package is "spamassassin" Wed Dec 18 14:44:32 2019 rev:80 rq:757559 version:unknown Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2019-11-13 13:13:59.446802154 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new.4691/spamassassin.changes 2019-12-18 14:48:12.593935639 +0100 @@ -1,0 +2,31 @@ +Sat Dec 14 10:32:50 UTC 2019 - Arjen de Korte + +- remove old (compiled) rules in /var/lib/spamassassin directory + after package upgrade and remove entirely upon package removal +- add BuildRequires for perl(Archive::Zip) and perl(IO::String) + +--- +Thu Dec 12 11:55:55 UTC 2019 - Arjen de Korte + +- update spamassassin to 3.4.3 + * There is one new plugin (disabled by default) +OLEVBMacro - Detects both OLE macros and VB code inside Office + documents + * Two CVE security bug fixes are included in this release +CVE-2019-12420 for Multipart Denial of Service Vulnerability +CVE-2018-11805 for nefarious CF files can be configured to + run system commands without any output or errors + * Safer and faster scanning of large emails using + body_part_scan_size and rawbody_part_scan_size settings. + * New tflag "nosubject" for 'body' rules, to stop matching the + Subject header which is part of the body text. + * Security updates include deprecation of the unsafe sa-update +'--allowplugins' option, which now prints a warning that +'--reallyallowplugins' is required to use it. + +--- +Tue Dec 10 09:17:05 UTC 2019 - Dirk Stoecker + +- Increase maximum size for spampd to 7168 + +--- Old: Mail-SpamAssassin-3.4.2.tar.bz2 Mail-SpamAssassin-3.4.2.tar.bz2.asc Mail-SpamAssassin-rules-3.4.2.r1840640.tgz Mail-SpamAssassin-rules-3.4.2.r1840640.tgz.asc New: Mail-SpamAssassin-3.4.3.tar.bz2 Mail-SpamAssassin-3.4.3.tar.bz2.asc Mail-SpamAssassin-rules-3.4.3.r1871124.tgz Mail-SpamAssassin-rules-3.4.3.r1871124.tgz.asc Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.j4kc3J/_old 2019-12-18 14:48:13.085935865 +0100 +++ /var/tmp/diff_new_pack.j4kc3J/_new 2019-12-18 14:48:13.089935866 +0100 @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,9 +23,9 @@ %define ix_version 2.05 %define spd_version 2.53 -%define sa_version 3.4.2 +%define sa_version 3.4.3 %define sa_float %(echo %{sa_version} | awk -F. '{ printf "%d.%03d%03d", $1, $2, $3 }') -%define rules_revision 1840640 +%define rules_revision 1871124 %define IXHASH iXhash2-%{ix_version} %define SPAMPD spampd-%{spd_version} @@ -36,7 +36,7 @@ Group: Productivity/Networking/Email/Utilities Version:%{sa_version} Release:0 -Url:https://spamassassin.apache.org/ +URL:https://spamassassin.apache.org/ Source: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-%{sa_version}.tar.bz2 Source1: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-%{sa_version}.r%{rules_revision}.tgz Source2:https://mailfud.org/iXhash2/%{IXHASH}.tar.gz @@ -107,12 +107,14 @@ BuildRequires: perl(Time::HiRes) BuildRequires: perl(Time::Local) # optional, but want them for build (test) +BuildRequires: perl(Archive::Zip) BuildRequires: perl(BSD::Resource) BuildRequires: perl(DBI) BuildRequires: perl(Encode::Detect) BuildRequires: perl(HTTP::Date) BuildRequires: perl(IO::Socket::INET6) BuildRequires: perl(IO::Socket::SSL) +BuildRequires: perl(IO::String) BuildRequires: perl(IP::Country) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(Mail::SPF) @@ -255,6 +257,15 @@ %service_add_post spamd.service spampd.service sa-update.timer %{fillup_only -n spamd} %{fillup_only -n spampd} +if [ $1 -gt 1 ]; then + # Package upgrade + for dir in $(ls -d %{_sharedstatedir}/%{name}/{,compiled/*/}[0-9\.]* 2>/dev/null); do + if [ "${dir##*/}" != "%{sa_float}" ]; then + rm -rf ${dir} + fi + done + find %{_sharedstatedir}/%{name}
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2019-11-13 13:13:56 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new.2990 (New) Package is "spamassassin" Wed Nov 13 13:13:56 2019 rev:79 rq:747349 version:unknown Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2019-11-10 22:15:21.791313786 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new.2990/spamassassin.changes 2019-11-13 13:13:59.446802154 +0100 @@ -0,0 +1,17 @@ +--- +Sat Nov 9 12:42:47 UTC 2019 - Arjen de Korte + +- Change architecture of perl modules to 'noarch' + +--- +Fri Nov 8 10:40:45 UTC 2019 - Arjen de Korte + +- Fix extraction command for default rules (proper fix for + boo#911355, rather than a workaround) +- Don't unconditionally run sa-update on spamd and spampd service + start as this doesn't honor the settings in /etc/sysconfig/spamd +- After running sa-update, only restart services if they were + running before +- Fix name in logging timed-sa-update (suse.cron-sa-update + doesn't exist anymore) + Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.wm1GPl/_old 2019-11-13 13:14:02.958805810 +0100 +++ /var/tmp/diff_new_pack.wm1GPl/_new 2019-11-13 13:14:02.962805814 +0100 @@ -24,6 +24,7 @@ %define ix_version 2.05 %define spd_version 2.53 %define sa_version 3.4.2 +%define sa_float %(echo %{sa_version} | awk -F. '{ printf "%d.%03d%03d", $1, $2, $3 }') %define rules_revision 1840640 %define IXHASH iXhash2-%{ix_version} @@ -145,6 +146,7 @@ Recommends: perl(Encode::Detect) Provides: perl-spamassassin = %{sa_version} Obsoletes: perl-spamassassin < %{sa_version} +BuildArch: noarch %{perl_requires} %description -n perl-Mail-SpamAssassin @@ -161,6 +163,7 @@ Release:0 Provides: perl-Mail-SpamAssassin-Plugin-iXhash = %{ix_version} Obsoletes: perl-Mail-SpamAssassin-Plugin-iXhash < 2 +BuildArch: noarch %{perl_requires} %description -n perl-Mail-SpamAssassin-Plugin-iXhash2 @@ -175,6 +178,7 @@ %prep %setup -q -n Mail-SpamAssassin-%{sa_version} -a 2 -a 3 +tar -zxf %{S:1} -C rules %patch1 -p0 %patch2 -p1 %patch3 -p0 @@ -197,7 +201,7 @@ perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" \ CONTACT_ADDRESS="postmaster" ENABLE_SSL="yes" -make +make %{?_smp_mflags} %check # fails now... FIGURE out why @@ -232,8 +236,13 @@ echo "MakeMaker is broken again..." exit 1 } -install -d %{buildroot}/usr/share/spamassassin -pushd %{buildroot}/usr/share/spamassassin && tar -xjf %{S:1} && popd + +## default rules +install -d %{buildroot}%{_datadir}/spamassassin +install -D -m 0644 rules/[0-9]*.cf %{buildroot}%{_datadir}/spamassassin +sed -i -e 's|@@CONTACT_ADDRESS@@|postmaster|g' \ + -e 's|@@LOCAL_RULES_DIR@@|/etc/mail/spamassassin|g' \ + -e 's|@@VERSION@@|%{sa_float}|g' %{buildroot}%{_datadir}/spamassassin/*.cf ## systemd stuff mkdir -p %{buildroot}/%{_unitdir} @@ -278,8 +287,9 @@ %dir /etc/mail %config(noreplace) /etc/mail/spamassassin %exclude /etc/mail/spamassassin/iXhash2.cf -%dir /usr/share/spamassassin -/usr/share/spamassassin/* +%exclude %{perl_vendorarch} +%dir %{_datadir}/spamassassin +%{_datadir}/spamassassin/* %files -n perl-Mail-SpamAssassin-Plugin-iXhash2 %defattr(-,root,root) ++ spamd.service ++ --- /var/tmp/diff_new_pack.wm1GPl/_old 2019-11-13 13:14:03.086805944 +0100 +++ /var/tmp/diff_new_pack.wm1GPl/_new 2019-11-13 13:14:03.090805947 +0100 @@ -22,7 +22,6 @@ [Service] Type=forking PIDFile=/run/spamd.pid -ExecStartPre=/bin/bash -c "sa-update || true" EnvironmentFile=-/etc/sysconfig/spamd ExecStart=/usr/sbin/spamd $SPAMD_ARGS -r /run/spamd.pid ExecReload=/usr/bin/kill -HUP $MAINPID ++ spampd.service ++ --- /var/tmp/diff_new_pack.wm1GPl/_old 2019-11-13 13:14:03.110805968 +0100 +++ /var/tmp/diff_new_pack.wm1GPl/_new 2019-11-13 13:14:03.114805973 +0100 @@ -22,7 +22,6 @@ [Service] Type=forking PIDFile=/run/spampd.pid -ExecStartPre=/bin/bash -c "sa-update || true" EnvironmentFile=-/etc/sysconfig/spampd ExecStart=/usr/sbin/spampd $SPAMPD_OPTIONS ExecReload=/usr/bin/kill -HUP $MAINPID ++ timed-sa-update ++ --- /var/tmp/diff_new_pack.wm1GPl/_old 2019-11-13 13:14:03.154806014 +0100 +++ /var/tmp/diff_new_pack.wm1GPl/_new 2019-11-13 13:14:03.154806014 +0100 @@ -23,21 +23,21 @@ fi if [ "$SPAM_SPAMD_RESTART" = "yes" -a $result = 0 ] ; then -/sbin/service spamd restart &> /dev/null +
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2019-11-10 22:15:19 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new.2990 (New) Package is "spamassassin" Sun Nov 10 22:15:19 2019 rev:78 rq:746497 version:unknown Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2019-06-26 16:00:19.343325811 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new.2990/spamassassin.changes 2019-11-10 22:15:21.791313786 +0100 @@ -0,0 +1,20 @@ +-- +Sun Oct 27 12:36:31 UTC 2019 - Arjen de Korte + +- update spampd to 2.53 + * Fix LMTP delivery with multiple recipients + * Fix Warning for "Use of uninitialized value in string" + update spampd to 2.52 + * Override Net::Server's HUP handling, just restart children + * Add --version option to print information about SpamPD, +Net::Server, SpamAssassin, and Perl. + * Add warnings about using deprecated options. + * Documentation updates and code cosmetics. +- Update download links (add for spampd and iXhash2 sources) +- Add source verification (add spamassassin.keyring) +- Add %{perl_requires} for perl-Mail-SpamAssassin +- Fix "PIDFile= references a path below legacy directory /var/run/" + (change /var/run/ -> /run/) +- Don't package README.SuSE which documents an init script that + was never bundled + Old: spampd-2.51.tar.gz New: Mail-SpamAssassin-3.4.2.tar.bz2.asc Mail-SpamAssassin-rules-3.4.2.r1840640.tgz.asc spamassassin.keyring spampd-2.53.tar.gz Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.qFtY6H/_old 2019-11-10 22:15:24.603317662 +0100 +++ /var/tmp/diff_new_pack.qFtY6H/_new 2019-11-10 22:15:24.631317700 +0100 @@ -22,8 +22,9 @@ %endif %define ix_version 2.05 -%define spd_version 2.51 -# https://github.com/mpaperno/spampd/releases +%define spd_version 2.53 +%define sa_version 3.4.2 +%define rules_revision 1840640 %define IXHASH iXhash2-%{ix_version} %define SPAMPD spampd-%{spd_version} @@ -32,15 +33,13 @@ Summary:Extensible email filter which is used to identify spam License:Apache-2.0 Group: Productivity/Networking/Email/Utilities -Version:3.4.2 +Version:%{sa_version} Release:0 -%define sa_version 3.4.2 -%define rules_revision 1840640 -Url:http://spamassassin.org/ -Source: http://apache.mirrors.hoobly.com/spamassassin/source/Mail-SpamAssassin-%{version}.tar.bz2 -Source1: http://apache.mirrors.hoobly.com/spamassassin/source/Mail-SpamAssassin-rules-%{version}.r%{rules_revision}.tgz -Source2:%{IXHASH}.tar.gz -Source3:%{SPAMPD}.tar.gz +Url:https://spamassassin.apache.org/ +Source: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-%{sa_version}.tar.bz2 +Source1: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-%{sa_version}.r%{rules_revision}.tgz +Source2:https://mailfud.org/iXhash2/%{IXHASH}.tar.gz +Source3: https://github.com/mpaperno/spampd/archive/%{spd_version}.tar.gz#/%{SPAMPD}.tar.gz Source10: local.cf Source12: sysconfig.spamd Source14: sysconfig.spampd @@ -49,6 +48,10 @@ Source17: spampd.service Source18: sa-update.service Source19: sa-update.timer +Source100: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-%{sa_version}.tar.bz2.asc +Source101: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-%{sa_version}.r%{rules_revision}.tgz.asc +# Keyring downloaded from https://www.apache.org/dist/spamassassin/KEYS +Source102: spamassassin.keyring Patch1: patch-PgSQL Patch2: patch-URIDNSBL Patch3: patch-SQL_ASCII_SORT @@ -140,8 +143,9 @@ Recommends: perl(IO::Socket::SSL) Recommends: perl(DBI) Recommends: perl(Encode::Detect) -Provides: perl-spamassassin = %version -Obsoletes: perl-spamassassin < %version +Provides: perl-spamassassin = %{sa_version} +Obsoletes: perl-spamassassin < %{sa_version} +%{perl_requires} %description -n perl-Mail-SpamAssassin This package contains the perl modules for the spamassassin, including @@ -151,7 +155,7 @@ %package -n perl-Mail-SpamAssassin-Plugin-iXhash2 Summary:The iXhash plugin for SpamAssassin Group: Development/Libraries/Perl -Requires: perl-Mail-SpamAssassin = %version +Requires: perl-Mail-SpamAssassin = %{sa_version} Requires: perl(Digest::MD5) Version:%{ix_version} Release:0 @@ -254,7 +258,7
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2019-06-26 16:00:18 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new.4615 (New) Package is "spamassassin" Wed Jun 26 16:00:18 2019 rev:77 rq:709326 version:unknown Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2019-01-24 14:01:49.476160370 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new.4615/spamassassin.changes 2019-06-26 16:00:19.343325811 +0200 @@ -1,0 +2,6 @@ +Tue Jun 11 12:33:05 UTC 2019 - Dominique Leuenberger + +- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to + shortcut the build queues by allowing usage of systemd-mini + +--- Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.DdzBfV/_old 2019-06-26 16:00:22.059329316 +0200 +++ /var/tmp/diff_new_pack.DdzBfV/_new 2019-06-26 16:00:22.091329358 +0200 @@ -70,8 +70,8 @@ Requires: perl-Mail-SpamAssassin = %version Requires: re2c Requires: perl(Net::Server::PreForkSimple) -BuildRequires: systemd -%{?systemd_requires} +BuildRequires: pkgconfig(systemd) +%{?systemd_ordering} %description spamassassin adds a header line that shows if the mail has been
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2019-01-24 14:01:47 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new.28833 (New) Package is "spamassassin" Thu Jan 24 14:01:47 2019 rev:76 rq:666474 version:unknown Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2018-10-01 08:14:23.474084451 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new.28833/spamassassin.changes 2019-01-24 14:01:49.476160370 +0100 @@ -1,0 +2,11 @@ +Wed Jan 16 11:50:16 UTC 2019 - Jan Engelhardt + +- Reduce boilerplate generated by %service_*. + +--- +Wed Jan 16 09:43:23 UTC 2019 - Peter Varkoly + +- bsc#1115411 spamassassin: migrate from cron to systemd timers +- Apply %license macro + +--- Old: suse.cron-sa-update New: sa-update.service sa-update.timer timed-sa-update Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.EnQEtX/_old 2019-01-24 14:01:50.476159230 +0100 +++ /var/tmp/diff_new_pack.EnQEtX/_new 2019-01-24 14:01:50.480159226 +0100 @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,9 +44,11 @@ Source10: local.cf Source12: sysconfig.spamd Source14: sysconfig.spampd -Source15: suse.cron-sa-update +Source15: timed-sa-update Source16: spamd.service Source17: spampd.service +Source18: sa-update.service +Source19: sa-update.timer Patch1: patch-PgSQL Patch2: patch-URIDNSBL Patch3: patch-SQL_ASCII_SORT @@ -138,7 +140,6 @@ Recommends: perl(IO::Socket::SSL) Recommends: perl(DBI) Recommends: perl(Encode::Detect) -Recommends: cron Provides: perl-spamassassin = %version Obsoletes: perl-spamassassin < %version @@ -214,9 +215,8 @@ cp %{IXHASH}/iXhash2.cf %{buildroot}/etc/mail/spamassassin/iXhash2.cf # ## spamassassin stuff -install -d %{buildroot}/etc/cron.daily/ -install -m 0755 %{S:15} %{buildroot}/etc/cron.daily/ install -D -m0755 %{SPAMPD}/spampd.pl %{buildroot}/%{_sbindir}/spampd +install -m 0755 %{S:15} %{buildroot}/%{_sbindir}/ mv %{buildroot}/%{_bindir}/spamd %{buildroot}/%{_sbindir}/ install -m 0644 %{S:10} %{buildroot}/etc/mail/spamassassin/local.cf ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcspamd @@ -235,24 +235,22 @@ mkdir -p %{buildroot}/%{_unitdir} install -D -m 644 %{S:16} %{buildroot}/%{_unitdir} install -D -m 644 %{S:17} %{buildroot}/%{_unitdir} +install -D -m 644 %{S:18} %{buildroot}/%{_unitdir} +install -D -m 644 %{S:19} %{buildroot}/%{_unitdir} %post -%service_add_post spamd.service -%service_add_post spampd.service +%service_add_post spamd.service spampd.service sa-update.timer %{fillup_only -n spamd} %{fillup_only -n spampd} %pre -%service_add_pre spamd.service -%service_add_pre spampd.service +%service_add_pre spamd.service spampd.service sa-update.timer %preun -%service_del_preun spamd.service -%service_del_preun spampd.service +%service_del_preun spamd.service spampd.service sa-update.timer %postun -%service_del_postun spamd.service -%service_del_postun spampd.service +%service_del_postun spamd.service spampd.service sa-update.timer %files %defattr(-,root,root) @@ -264,15 +262,17 @@ %{_fillupdir}/sysconfig.spampd %{_unitdir}/spamd.service %{_unitdir}/spampd.service +%{_unitdir}/sa-update.service +%{_unitdir}/sa-update.timer %files -n perl-Mail-SpamAssassin -f %{name}.files %defattr(-,root,root) -%doc CREDITS Changes LICENSE MANIFEST* NOTICE PACKAGING README +%license LICENSE +%doc CREDITS Changes MANIFEST* NOTICE PACKAGING README %doc TRADEMARK UPGRADE USAGE sample-nonspam.txt sample-spam.txt %doc ldap sql %dir /etc/mail %config(noreplace) /etc/mail/spamassassin -%config(noreplace) /etc/cron.daily/suse.cron-sa-update %exclude /etc/mail/spamassassin/iXhash2.cf %dir /usr/share/spamassassin /usr/share/spamassassin/* ++ sa-update.service ++ [Unit] Description=Update spamassassin ConditionACPower=true [Service] Type=oneshot ExecStart=/usr/sbin/timed-sa-update ++ sa-update.timer ++ [Unit] Description=Daily update of spamassasin [Timer] OnCalendar=daily AccuracySec=12h Persistent=true [Install] WantedBy=timers.target ++ timed-sa-update ++ #!/bin/bash # #
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2018-10-01 08:14:16 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is "spamassassin" Mon Oct 1 08:14:16 2018 rev:75 rq:637098 version:unknown Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2018-02-22 14:57:32.924575419 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2018-10-01 08:14:23.474084451 +0200 @@ -1,0 +2,61 @@ +Tue Sep 18 20:29:34 UTC 2018 - Arjen de Korte + +- update spamassassin to 3.4.2 + * There are four new plugins (disabled by default) +HashBL - interface to The Email Blocklist (EBL) +ResourceLimits - assure your spamd child processes do not exceed + specified CPU or memory limit +FromNameSpoof - detection of the From:name field being used to + mislead +Phishing - finds uris used in phishing campaigns detected by + OpenPhish (https://openphish.com) or PhishTank + (https://phishtank.com) feeds + * For security reasons SSLv3 support has been removed from spamc(1). + * Four CVE security bug fixes are included in this release for +PDFInfo.pm and the SA core: CVE-2017-15705, CVE-2016-1238, +CVE-2018-11780 & CVE-2018-11781. + * In sa-update script, optional support for SHA-256 / SHA-512 in +addition to or instead of SHA1 has been added for better validation +of rules. + * GeoIP2 support has been added to RelayCountry and URILocalBL plugins +due to GeoIP legacy API deprecations. + * several new or enhanced configuration options +- update spampd to 2.51 + * Replace IO::Socket::INET with IO::Socket::IP for IPv6 support + * Unix ports (ability to listen on UNIX sockets) + * Add X-Envelope-* headers before Received + * Add /usr/local/bin and /usr/local/sbin to PATH + * Add --setsid option to start server with setsid if running in +background +- Removed patches (are now in upstream): + * 0001-bug-7361-Allow-building-against-OpenSSL-1.1.0.patch + * 0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch + * DNS-resolver-recursion-desired-not-set.patch + * spamassassin-dont_use_SSLv3_methods.patch + * spampd-2.42_git_20170226.patch + * Unescaped_left_brace_in_regex_is_deprecated.patch + +--- +Mon Sep 17 19:11:13 UTC 2018 - Arjen de Korte + +- Revert incompatibility-with-NET-DNS.patch (this patch attempts to + fix a problem that was already solved by bsc#1059210) + +--- +Thu Sep 13 14:05:04 UTC 2018 - vark...@suse.com + +- bsc#1107765 - spamassassin: incompatibility with Net::DNS >= 1.01 + - Add upstream patch: + incompatibility-with-NET-DNS.patch + +--- +Sun Sep 9 09:52:44 UTC 2018 - vark...@suse.com + +- bsc#1069831 Running sa-update from spamassassin gives warning + about deprecated regex + o remove deprecated-regex.patch and apply upstream patch: +Unescaped_left_brace_in_regex_is_deprecated.patch + This patch also fixes the bug PerMsgStatus Warning + https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7196 + +--- Old: 0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch 0001-bug-7361-Allow-building-against-OpenSSL-1.1.0.patch DNS-resolver-recursion-desired-not-set.patch Mail-SpamAssassin-3.4.1.tar.bz2 Mail-SpamAssassin-rules-3.4.1.r1675274.tgz deprecated-regex.patch spamassassin-dont_use_SSLv3_methods.patch spampd-2.42.tar.bz2 spampd-2.42_git_20170226.patch New: Mail-SpamAssassin-3.4.2.tar.bz2 Mail-SpamAssassin-rules-3.4.2.r1840640.tgz spampd-2.51.tar.gz Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.mJo16T/_old 2018-10-01 08:14:24.518083778 +0200 +++ /var/tmp/diff_new_pack.mJo16T/_new 2018-10-01 08:14:24.522083776 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,8 +22,8 @@ %endif %define ix_version 2.05 -%define spd_version 2.42 -# http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm +%define spd_version 2.51 +# https://github.com/mpaperno/spampd/releases %define IXHASH iXhash2-%{ix_version} %define SPAMPD spampd-%{spd_version} @@ -32,15 +32,15 @@ Summary:Extensible email filter which is used to identify spam License:
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2018-02-22 14:57:31 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is "spamassassin" Thu Feb 22 14:57:31 2018 rev:74 rq:578829 version:unknown Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2018-01-25 12:35:36.81713 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2018-02-22 14:57:32.924575419 +0100 @@ -1,0 +2,6 @@ +Mon Feb 19 17:19:18 UTC 2018 - vark...@suse.com + +- bsc#1069831 Running sa-update from spamassassin gives warning about deprecated regex + o add deprecated-regex.patch + +--- New: deprecated-regex.patch Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.2v3Xe0/_old 2018-02-22 14:57:34.536517419 +0100 +++ /var/tmp/diff_new_pack.2v3Xe0/_new 2018-02-22 14:57:34.540517275 +0100 @@ -62,6 +62,8 @@ Patch13:0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch # PATCH-FIX-UPSTREAM https://bz.apache.org/SpamAssassin/attachment.cgi?id=5314 Patch14:DNS-resolver-recursion-desired-not-set.patch +# PATCH-FIX-UPSTREAM https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7404 +Patch15:deprecated-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} PreReq: %fillup_prereq @@ -181,6 +183,7 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p2 %build if [ -e t/data/whitelists/winxpnews.com ]; then ++ deprecated-regex.patch ++ --- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm2017/04/11 18:34:11 1791009 +++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm2017/04/11 18:37:20 1791010 @@ -896,16 +896,16 @@ $str .= shift @{$ary}; } undef $ary; - chomp ($str); $str .= " [...]\n"; # in case the last line was huge, trim it back to around 200 chars local $1; - $str =~ s/^(.{,200}).*$/$1/gs; + $str =~ s/^(.{200}).+$/$1 [...]/gm; + chomp ($str); $str .= "\n"; # now, some tidy-ups that make things look a bit prettier - $str =~ s/-Original Message-.*$//gs; + $str =~ s/-Original Message-.*$//gm; $str =~ s/This is a multi-part message in MIME format\.//gs; - $str =~ s/[-_\*\.]{10,}//gs; + $str =~ s/[-_*.]{10,}//gs; $str =~ s/\s+/ /gs; # add "Content preview:" ourselves, so that the text aligns
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2018-01-25 12:35:35 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is "spamassassin" Thu Jan 25 12:35:35 2018 rev:73 rq:568406 version:unknown Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2018-01-20 11:19:10.629510335 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2018-01-25 12:35:36.81713 +0100 @@ -7,0 +8,6 @@ +Mon Dec 11 00:44:26 UTC 2017 - jeng...@inai.de + +- Replace %__-type macro indirections. + Replace old $RPM_ shell variables. + +--- Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.lH555V/_old 2018-01-25 12:35:37.440435220 +0100 +++ /var/tmp/diff_new_pack.lH555V/_new 2018-01-25 12:35:37.35033 +0100 @@ -194,15 +194,15 @@ #exit -1 # hidden bug description, so I can't see there - ignored fi; -export CFLAGS="$RPM_OPT_FLAGS" -perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" \ +export CFLAGS="%{optflags}" +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" \ CONTACT_ADDRESS="postmaster" ENABLE_SSL="yes" -%{__make} +make %check # fails now... FIGURE out why -#%#{__make} test +#make test %install ## perl-Mail-SpamAssassin stuff @@ -210,37 +210,37 @@ %perl_process_packlist %perl_gen_filelist # remove %%{_bindir} from filelist -%{__sed} -i -e "/\/usr\/bin/d" %{name}.files +sed -i -e "/\/usr\/bin/d" %{name}.files # package only %%{_mandir}/man3 -%{__sed} -i -e "s,%{_mandir}/man?,%{_mandir}/man3," %{name}.files +sed -i -e "s,%{_mandir}/man?,%{_mandir}/man3," %{name}.files # ## perl-Mail-SpamAssassin-Plugin-iXhash2 stuff -%{__install} -d $RPM_BUILD_ROOT/etc/mail/spamassassin -cp %{IXHASH}/iXhash2.pm $RPM_BUILD_ROOT%{perl_vendorlib}/Mail/SpamAssassin/Plugin -cp %{IXHASH}/iXhash2.cf $RPM_BUILD_ROOT/etc/mail/spamassassin/iXhash2.cf +install -d %{buildroot}/etc/mail/spamassassin +cp %{IXHASH}/iXhash2.pm %{buildroot}/%{perl_vendorlib}/Mail/SpamAssassin/Plugin +cp %{IXHASH}/iXhash2.cf %{buildroot}/etc/mail/spamassassin/iXhash2.cf # ## spamassassin stuff -%{__install} -d $RPM_BUILD_ROOT/etc/cron.daily/ -%{__install} -m 0755 %{S:15} $RPM_BUILD_ROOT/etc/cron.daily/ -%{__install} -D -m0755 %{SPAMPD}/spampd.pl $RPM_BUILD_ROOT%{_sbindir}/spampd -mv $RPM_BUILD_ROOT%{_bindir}/spamd $RPM_BUILD_ROOT%{_sbindir}/ -%{__install} -m 0644 %{S:10} $RPM_BUILD_ROOT/etc/mail/spamassassin/local.cf -%{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rcspamd -%{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rcspampd +install -d %{buildroot}/etc/cron.daily/ +install -m 0755 %{S:15} %{buildroot}/etc/cron.daily/ +install -D -m0755 %{SPAMPD}/spampd.pl %{buildroot}/%{_sbindir}/spampd +mv %{buildroot}/%{_bindir}/spamd %{buildroot}/%{_sbindir}/ +install -m 0644 %{S:10} %{buildroot}/etc/mail/spamassassin/local.cf +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcspamd +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcspampd echo "Most of the documentation is at ../perl-Mail-SpamAssassin/." > README.SUSE -%{__install} -D -m 0640 %{S:12} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.spamd -%{__install} -m 0640 %{S:14} $RPM_BUILD_ROOT%{_fillupdir}/ -test -f $RPM_BUILD_ROOT/usr/share/spamassassin/user_prefs.template || { +install -D -m 0640 %{S:12} %{buildroot}/%{_fillupdir}/sysconfig.spamd +install -m 0640 %{S:14} %{buildroot}/%{_fillupdir}/ +test -f %{buildroot}/usr/share/spamassassin/user_prefs.template || { echo "MakeMaker is broken again..." exit 1 } -%{__install} -d $RPM_BUILD_ROOT/usr/share/spamassassin -pushd $RPM_BUILD_ROOT/usr/share/spamassassin && tar -xjf %{S:1} && popd +install -d %{buildroot}/usr/share/spamassassin +pushd %{buildroot}/usr/share/spamassassin && tar -xjf %{S:1} && popd ## systemd stuff mkdir -p %{buildroot}/%{_unitdir} -%{__install} -D -m 644 %{S:16} %{buildroot}/%{_unitdir} -%{__install} -D -m 644 %{S:17} %{buildroot}/%{_unitdir} +install -D -m 644 %{S:16} %{buildroot}/%{_unitdir} +install -D -m 644 %{S:17} %{buildroot}/%{_unitdir} %post %service_add_post spamd.service
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2018-01-20 11:19:09 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is "spamassassin" Sat Jan 20 11:19:09 2018 rev:72 rq:567288 version:unknown Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2017-12-12 21:16:29.021213649 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2018-01-20 11:19:10.629510335 +0100 @@ -1,0 +2,6 @@ +Thu Jan 18 08:52:03 UTC 2018 - vark...@suse.com + +- bsc#1059210 spamassassin perl dns resolver recursion desired not set + o add DNS-resolver-recursion-desired-not-set.patch + +--- New: DNS-resolver-recursion-desired-not-set.patch Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.9Jrb47/_old 2018-01-20 11:19:11.593465272 +0100 +++ /var/tmp/diff_new_pack.9Jrb47/_new 2018-01-20 11:19:11.593465272 +0100 @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -60,6 +60,8 @@ Patch12:spamassassin-dont_use_SSLv3_methods.patch # PATCH-FIX-UPSTREAM https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7367 Patch13:0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch +# PATCH-FIX-UPSTREAM https://bz.apache.org/SpamAssassin/attachment.cgi?id=5314 +Patch14:DNS-resolver-recursion-desired-not-set.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} PreReq: %fillup_prereq @@ -178,6 +180,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build if [ -e t/data/whitelists/winxpnews.com ]; then ++ DNS-resolver-recursion-desired-not-set.patch ++ --- Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/DnsResolver.pm.orig 2018-01-18 09:33:58.566828560 +0100 +++ Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/DnsResolver.pm 2018-01-18 09:32:47.765978605 +0100 @@ -575,6 +575,7 @@ { $1 eq '\\' ? "\\$1" : sprintf("\\%03d",ord($1)) }xgse; $packet = Net::DNS::Packet->new($domain, $type, $class); +$packet->header->rd(1); # a bit noisy, so commented by default... #dbg("dns: new DNS packet time=%.3f domain=%s type=%s id=%s",
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2017-12-12 21:16:28 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is "spamassassin" Tue Dec 12 21:16:28 2017 rev:71 rq:554550 version:unknown Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2017-11-23 09:35:43.375541119 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2017-12-12 21:16:29.021213649 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:43:44 UTC 2017 - rbr...@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +--- Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.DzfqbL/_old 2017-12-12 21:16:29.917170397 +0100 +++ /var/tmp/diff_new_pack.DzfqbL/_new 2017-12-12 21:16:29.921170204 +0100 @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + %define ix_version 2.05 %define spd_version 2.42 # http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm @@ -220,8 +225,8 @@ %{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rcspamd %{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rcspampd echo "Most of the documentation is at ../perl-Mail-SpamAssassin/." > README.SUSE -%{__install} -D -m 0640 %{S:12} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.spamd -%{__install} -m 0640 %{S:14} $RPM_BUILD_ROOT/var/adm/fillup-templates/ +%{__install} -D -m 0640 %{S:12} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.spamd +%{__install} -m 0640 %{S:14} $RPM_BUILD_ROOT%{_fillupdir}/ test -f $RPM_BUILD_ROOT/usr/share/spamassassin/user_prefs.template || { echo "MakeMaker is broken again..." exit 1 @@ -258,8 +263,8 @@ %doc %{_mandir}/man1/* %{_bindir}/* %{_sbindir}/* -/var/adm/fillup-templates/sysconfig.spamd -/var/adm/fillup-templates/sysconfig.spampd +%{_fillupdir}/sysconfig.spamd +%{_fillupdir}/sysconfig.spampd %{_unitdir}/spamd.service %{_unitdir}/spampd.service
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2017-11-23 09:35:42 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is "spamassassin" Thu Nov 23 09:35:42 2017 rev:70 rq:544186 version:unknown Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2017-09-15 21:02:07.317060357 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2017-11-23 09:35:43.375541119 +0100 @@ -1,0 +2,6 @@ +Tue Nov 21 09:07:53 UTC 2017 - mplus...@suse.com + +- Update umask in cronjob (boo#861539) +- Make sure that spamd can start (boo#961291) + +--- Other differences: -- ++ spamd.service ++ --- /var/tmp/diff_new_pack.hOZOnE/_old 2017-11-23 09:35:46.247436336 +0100 +++ /var/tmp/diff_new_pack.hOZOnE/_new 2017-11-23 09:35:46.247436336 +0100 @@ -15,8 +15,8 @@ [Unit] Description=Daemonized version of spamassassin -Wants=remote-fs.target -After=remote-fs.target +Wants=remote-fs.target network.target +After=remote-fs.target network.target Before=mail-transfer-agent.target [Service] ++ suse.cron-sa-update ++ --- /var/tmp/diff_new_pack.hOZOnE/_old 2017-11-23 09:35:46.279435168 +0100 +++ /var/tmp/diff_new_pack.hOZOnE/_new 2017-11-23 09:35:46.279435168 +0100 @@ -1,5 +1,13 @@ #!/bin/bash +# +# paranoia settings +# +umask 022 + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +export PATH + if [ -e /etc/sysconfig/spamd ] then . /etc/sysconfig/spamd
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2017-09-15 21:02:06 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is "spamassassin" Fri Sep 15 21:02:06 2017 rev:69 rq:523098 version:unknown Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2017-02-28 23:43:16.375066899 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2017-09-15 21:02:07.317060357 +0200 @@ -1,0 +2,10 @@ +Wed Aug 30 13:40:24 UTC 2017 - vci...@suse.com + +- Add support for building with OpenSSL 1.1 (bsc#1055252) + * add 0001-bug-7361-Allow-building-against-OpenSSL-1.1.0.patch + * add spamassassin-dont_use_SSLv3_methods.patch +- Fix build with Perl 5.26 + * https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7367 + * add 0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch + +--- New: 0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch 0001-bug-7361-Allow-building-against-OpenSSL-1.1.0.patch spamassassin-dont_use_SSLv3_methods.patch Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.8ELQW9/_old 2017-09-15 21:02:08.752858812 +0200 +++ /var/tmp/diff_new_pack.8ELQW9/_new 2017-09-15 21:02:08.756858251 +0200 @@ -48,6 +48,13 @@ Patch6: bnc#582111.diff Patch7: spampd-2.42_git_20170226.patch Patch10:iXhash2-meta-rules.patch +# add OpenSSL 1.1 support +# PATCH-FIX-UPSTREAM https://svn.apache.org/viewvc?view=revision=1806555 +Patch11:0001-bug-7361-Allow-building-against-OpenSSL-1.1.0.patch +# PATCH-FIX-SUSE don't use deprecated SSLv3_client_method +Patch12:spamassassin-dont_use_SSLv3_methods.patch +# PATCH-FIX-UPSTREAM https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7367 +Patch13:0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} PreReq: %fillup_prereq @@ -163,6 +170,9 @@ %patch6 -p0 %patch7 -p0 %patch10 -p0 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 %build if [ -e t/data/whitelists/winxpnews.com ]; then ++ 0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch ++ >From 353ba0d96670e80fca1b78369d1701e1cad2bfaf Mon Sep 17 00:00:00 2001 From: John HardinDate: Mon, 13 Feb 2017 02:16:44 + Subject: [PATCH 1/1] Fix bug#7367: Don't assume cwd (".") is in @INC, it may be removed for security reasons - see CVE-2016-1238 git-svn-id: https://svn.apache.org/repos/asf/spamassassin/branches/3.4@1782717 13f79535-47bb-0310-9956-ffa450edef68 --- spamc/configure.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spamc/configure.pl b/spamc/configure.pl index 0f10f3010..c6f67f208 100755 --- a/spamc/configure.pl +++ b/spamc/configure.pl @@ -66,7 +66,7 @@ print join(' ', $Config{'perlpath'}, "version.h.pl") . "\n"; # Do the same thing as for the preprocessor below. package version_h; my $Z = $0; - local $0= "version.h.pl"; + local $0= "./version.h.pl"; local @ARGV = (); # Got to check for defined because the script returns shell error level! unless (defined do $0) { -- 2.13.5 ++ 0001-bug-7361-Allow-building-against-OpenSSL-1.1.0.patch ++ >From 83d31e4555d63a87cb00a732711f80562b455ad0 Mon Sep 17 00:00:00 2001 From: Karsten Braeckelmann Date: Tue, 29 Aug 2017 10:45:10 + Subject: [PATCH] bug 7361: Allow building against OpenSSL 1.1.0 git-svn-id: https://svn.apache.org/repos/asf/spamassassin/branches/3.4@1806555 13f79535-47bb-0310-9956-ffa450edef68 --- spamc/configure| 129 + spamc/configure.in | 4 +- 2 files changed, 82 insertions(+), 51 deletions(-) diff --git a/spamc/configure b/spamc/configure index 48d29fa2d..d8e5dcf8a 100755 --- a/spamc/configure +++ b/spamc/configure @@ -1874,7 +1874,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && -{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +{ ac_try='test -z "$ac_c_werror_flag" +|| test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -1932,7 +1933,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && -{ ac_try='test -z "$ac_c_werror_flag" ||
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2017-02-28 23:43:15 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is "spamassassin" Tue Feb 28 23:43:15 2017 rev:68 rq:460544 version:unknown Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2017-02-21 13:31:14.438032136 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2017-02-28 23:43:16.375066899 +0100 @@ -1,0 +2,6 @@ +Sun Feb 26 13:38:51 UTC 2017 - opens...@dstoecker.de + +- SPAMPD: add spampd-2.42_git_20170226.patch - support IPv6 with IO::Socket::IP +- Drop old init system support (systems before 12.x) + +--- Old: init.spamd init.spampd New: spampd-2.42_git_20170226.patch Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.9saUH1/_old 2017-02-28 23:43:17.266941011 +0100 +++ /var/tmp/diff_new_pack.9saUH1/_new 2017-02-28 23:43:17.266941011 +0100 @@ -37,9 +37,7 @@ Source2:%{IXHASH}.tar.gz Source3:%{SPAMPD}.tar.bz2 Source10: local.cf -Source11: init.spamd Source12: sysconfig.spamd -Source13: init.spampd Source14: sysconfig.spampd Source15: suse.cron-sa-update Source16: spamd.service @@ -48,12 +46,10 @@ Patch2: patch-URIDNSBL Patch3: patch-SQL_ASCII_SORT Patch6: bnc#582111.diff +Patch7: spampd-2.42_git_20170226.patch Patch10:iXhash2-meta-rules.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} -%if %suse_version <= 1140 -PreReq: %insserv_prereq -%endif PreReq: %fillup_prereq BuildRequires: dos2unix BuildRequires: openssl-devel @@ -63,10 +59,8 @@ Requires: perl-Mail-SpamAssassin = %version Requires: re2c Requires: perl(Net::Server::PreForkSimple) -%if 0%{?suse_version} > 1140 BuildRequires: systemd %{?systemd_requires} -%endif %description spamassassin adds a header line that shows if the mail has been @@ -83,9 +77,6 @@ Group: Development/Libraries/Perl BuildRequires: perl BuildRequires: perl-Error -%if 0%{?suse_version} && 0%{?suse_version} <= 1210 -BuildRequires: perl-macros -%endif BuildRequires: perl(Archive::Tar) >= 1.23 BuildRequires: perl(Digest::SHA1) BuildRequires: perl(Errno) @@ -101,14 +92,12 @@ BuildRequires: perl(Time::HiRes) BuildRequires: perl(Time::Local) # optional, but want them for build (test) -%if 0%{?suse_version} >= 1100 -BuildRequires: perl(Mail::SPF) -%endif BuildRequires: perl(DBI) BuildRequires: perl(Encode::Detect) BuildRequires: perl(IO::Socket::INET6) BuildRequires: perl(IO::Socket::SSL) BuildRequires: perl(IP::Country) +BuildRequires: perl(Mail::SPF) BuildRequires: perl(Net::Ident) BuildRequires: perl(Razor2::Client::Agent) >= 2.61 # @@ -119,10 +108,7 @@ Requires: perl(File::Copy) >= 2.02 Requires: perl(File::Spec) >= 0.8 Requires: perl(HTML::Parser) >= 3.43 -%if 0%{?suse_version} > 1210 -# Required perl(Socket) version 1.97+ is only available in 12.2+ Requires: perl(IO::Socket::IP) -%endif Requires: perl(IO::Zlib) >= 1.04 Requires: perl(Mail::DKIM) >= 0.37 Requires: perl(Net::DNS) >= 0.34 @@ -132,9 +118,7 @@ Requires: perl(Time::HiRes) Requires: perl(Time::Local) # optional -%if 0%{?suse_version} >= 1100 Recommends: perl(Mail::SPF) -%endif Recommends: perl(Net::Patricia) Recommends: perl(Razor2::Client::Agent) >= 2.61 Recommends: perl(IO::Socket::INET6) @@ -177,6 +161,7 @@ %patch2 -p1 %patch3 -p0 %patch6 -p0 +%patch7 -p0 %patch10 -p0 %build @@ -222,15 +207,8 @@ %{__install} -D -m0755 %{SPAMPD}/spampd.pl $RPM_BUILD_ROOT%{_sbindir}/spampd mv $RPM_BUILD_ROOT%{_bindir}/spamd $RPM_BUILD_ROOT%{_sbindir}/ %{__install} -m 0644 %{S:10} $RPM_BUILD_ROOT/etc/mail/spamassassin/local.cf -%if 0%{?suse_version} > 1140 %{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rcspamd %{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rcspampd -%else -%{__install} -D -m 0755 %{S:11} $RPM_BUILD_ROOT/etc/init.d/spamd -%{__install} -m 0755 %{S:13} $RPM_BUILD_ROOT/etc/init.d/spampd -%{__ln_s} ../../etc/init.d/spamd $RPM_BUILD_ROOT/usr/sbin/rcspamd -%{__ln_s} ../../etc/init.d/spampd $RPM_BUILD_ROOT/usr/sbin/rcspampd -%endif echo "Most of the documentation is at ../perl-Mail-SpamAssassin/." > README.SUSE %{__install} -D -m 0640 %{S:12} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.spamd %{__install} -m 0640 %{S:14} $RPM_BUILD_ROOT/var/adm/fillup-templates/ @@ -241,46
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2017-02-21 13:31:14 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is "spamassassin" Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2016-01-17 09:23:08.0 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2017-02-21 13:31:14.438032136 +0100 @@ -1,0 +2,5 @@ +Mon Feb 20 16:26:30 CET 2017 - ku...@suse.de + +- Don't call/require insserv if we use systemd + +--- Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.ErPOzZ/_old 2017-02-21 13:31:15.153931147 +0100 +++ /var/tmp/diff_new_pack.ErPOzZ/_new 2017-02-21 13:31:15.157930583 +0100 @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -51,7 +51,10 @@ Patch10:iXhash2-meta-rules.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} -PreReq: %insserv_prereq %fillup_prereq +%if %suse_version <= 1140 +PreReq: %insserv_prereq +%endif +PreReq: %fillup_prereq BuildRequires: dos2unix BuildRequires: openssl-devel # @@ -263,18 +266,20 @@ %endif %preun -%stop_on_removal spamd %if %suse_version > 1140 %service_del_preun spamd.service %service_del_preun spampd.service +%else +%stop_on_removal spamd %endif %postun -%restart_on_update spamd -%insserv_cleanup %if %suse_version > 1140 %service_del_postun spamd.service %service_del_postun spampd.service +%else +%restart_on_update spamd +%insserv_cleanup %endif %files
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2016-01-17 09:23:07 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is "spamassassin" Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2015-12-06 07:35:27.0 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2016-01-17 09:23:08.0 +0100 @@ -1,0 +2,5 @@ +Tue Jan 12 07:20:02 UTC 2016 - bwiedem...@suse.com + +- use service command to restart spamd and amavis (boo#961279) + +--- Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.IMH2SI/_old 2016-01-17 09:23:09.0 +0100 +++ /var/tmp/diff_new_pack.IMH2SI/_new 2016-01-17 09:23:09.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ suse.cron-sa-update ++ --- /var/tmp/diff_new_pack.IMH2SI/_old 2016-01-17 09:23:09.0 +0100 +++ /var/tmp/diff_new_pack.IMH2SI/_new 2016-01-17 09:23:09.0 +0100 @@ -15,11 +15,11 @@ fi if [ "$SPAM_SPAMD_RESTART" = "yes" -a $result = 0 ] ; then -/etc/init.d/spamd restart &> /dev/null +/sbin/service spamd restart &> /dev/null fi if [ "$SPAM_AMAVISD_RESTART" = "yes" -a $result = 0 ] ; then -/etc/init.d/amavis restart &> /dev/null +/sbin/service amavis restart &> /dev/null fi if [ $result = 2 ] ; then
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2015-12-06 07:35:25 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is "spamassassin" Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2015-08-29 20:04:06.0 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2015-12-06 07:35:27.0 +0100 @@ -1,0 +2,5 @@ +Sun Nov 29 21:04:11 UTC 2015 - opens...@dstoecker.de + +- change default spampd settings to properly support IPv6 and allow larger SPAM + +--- Other differences: -- ++ sysconfig.spampd ++ --- /var/tmp/diff_new_pack.c8d4KI/_old 2015-12-06 07:35:29.0 +0100 +++ /var/tmp/diff_new_pack.c8d4KI/_new 2015-12-06 07:35:29.0 +0100 @@ -1 +1 @@ -SPAMPD_OPTIONS="--port=10025 --relayhost=127.0.0.1:10026 --user=vscan --tagall --children=5 --maxsize=512 --homedir=/home/vscan" +SPAMPD_OPTIONS="--host=localhost:10025 --relayhost=localhost:10026 --user=vscan --tagall --children=5 --maxsize=768 --homedir=/home/vscan"
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2015-08-29 20:04:04 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2015-08-25 08:57:41.0 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2015-08-29 20:04:06.0 +0200 @@ -1,0 +2,5 @@ +Wed Aug 26 14:18:20 UTC 2015 - h...@imb-jena.de + +- disable again make test (seems not to like being run offline) + +--- Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.XV6Qh9/_old 2015-08-29 20:04:07.0 +0200 +++ /var/tmp/diff_new_pack.XV6Qh9/_new 2015-08-29 20:04:07.0 +0200 @@ -198,10 +198,6 @@ # fails now... FIGURE out why #%#{__make} test -%if 0%{?suse_version} = 1320 -%{__make} test -%endif - %install ## perl-Mail-SpamAssassin stuff %perl_make_install
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2015-08-25 07:23:30 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2015-02-05 10:59:07.0 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2015-08-25 08:57:41.0 +0200 @@ -1,0 +2,17 @@ +Thu Jul 9 10:18:20 UTC 2015 - h...@imb-jena.de + +- update to 3.4.1 + * new plugins (disabled by default) +TxRep -substantially improved replacement of AWL plugin +PDFInfo - help detecting spam with attached PDF files +URILocalBL - new rule test types for URIs in html message parts + * several new or enhanced configuration options, e.g.: +normalize_charset - reimplemented, see Mail::SpamAssassin::Conf +bayes_token_sources - more control on sources of tokens for Bayes plugin + * internal change, probably only affecting 3rd party plugins: +Util::RegistrarBoundaries is being replaced by RegistryBoundaries + * rule updates, improvements, optimizations, bug fixes +- patch-utf8 removed, cf. bz.apache.org/SpamAssassin/show_bug.cgi?id=7133 +- re-enable make test for 13.2 and up + +--- Old: Mail-SpamAssassin-3.4.0.tar.bz2 Mail-SpamAssassin-rules-3.4.0.r1565117.tgz patch-utf8 New: Mail-SpamAssassin-3.4.1.tar.bz2 Mail-SpamAssassin-rules-3.4.1.r1675274.tgz Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.iPcEwT/_old 2015-08-25 08:57:42.0 +0200 +++ /var/tmp/diff_new_pack.iPcEwT/_new 2015-08-25 08:57:42.0 +0200 @@ -27,10 +27,10 @@ Summary:Extensible email filter which is used to identify spam License:Apache-2.0 Group: Productivity/Networking/Email/Utilities -Version:3.4.0 +Version:3.4.1 Release:0 -%define sa_version 3.4.0 -%define rules_revision 1565117 +%define sa_version 3.4.1 +%define rules_revision 1675274 Url:http://spamassassin.org/ Source: http://apache.mirrors.hoobly.com//spamassassin/source/Mail-SpamAssassin-%{version}.tar.bz2 Source1: http://apache.mirrors.hoobly.com//spamassassin/source/Mail-SpamAssassin-rules-%{version}.r%{rules_revision}.tgz @@ -44,7 +44,6 @@ Source15: suse.cron-sa-update Source16: spamd.service Source17: spampd.service -Patch0: patch-utf8 Patch1: patch-PgSQL Patch2: patch-URIDNSBL Patch3: patch-SQL_ASCII_SORT @@ -171,7 +170,6 @@ %prep %setup -q -n Mail-SpamAssassin-%{sa_version} -a 2 -a 3 -%patch0 -p0 %patch1 -p0 %patch2 -p1 %patch3 -p0 @@ -200,6 +198,10 @@ # fails now... FIGURE out why #%#{__make} test +%if 0%{?suse_version} = 1320 +%{__make} test +%endif + %install ## perl-Mail-SpamAssassin stuff %perl_make_install ++ Mail-SpamAssassin-3.4.0.tar.bz2 - Mail-SpamAssassin-3.4.1.tar.bz2 ++ 22135 lines of diff (skipped) ++ Mail-SpamAssassin-rules-3.4.0.r1565117.tgz - Mail-SpamAssassin-rules-3.4.1.r1675274.tgz ++ 7153 lines of diff (skipped)
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2015-02-05 10:59:06 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2015-01-09 20:52:12.0 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2015-02-05 10:59:07.0 +0100 @@ -1,0 +2,5 @@ +Mon Feb 2 08:18:20 UTC 2015 - mplus...@suse.com + +- Enable reload in unit files (boo#915736) + +--- Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.JozIP1/_old 2015-02-05 10:59:08.0 +0100 +++ /var/tmp/diff_new_pack.JozIP1/_new 2015-02-05 10:59:08.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ spamd.service ++ --- /var/tmp/diff_new_pack.JozIP1/_old 2015-02-05 10:59:08.0 +0100 +++ /var/tmp/diff_new_pack.JozIP1/_new 2015-02-05 10:59:08.0 +0100 @@ -25,6 +25,7 @@ ExecStartPre=/bin/bash -c sa-update || true EnvironmentFile=-/etc/sysconfig/spamd ExecStart=/usr/sbin/spamd $SPAMD_ARGS -r /var/run/spamd.pid +ExecReload=/usr/bin/kill -HUP $MAINPID [Install] WantedBy=multi-user.target ++ spampd.service ++ --- /var/tmp/diff_new_pack.JozIP1/_old 2015-02-05 10:59:09.0 +0100 +++ /var/tmp/diff_new_pack.JozIP1/_new 2015-02-05 10:59:09.0 +0100 @@ -25,6 +25,7 @@ ExecStartPre=/bin/bash -c sa-update || true EnvironmentFile=-/etc/sysconfig/spampd ExecStart=/usr/sbin/spampd $SPAMPD_OPTIONS +ExecReload=/usr/bin/kill -HUP $MAINPID [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2015-01-09 20:52:07 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2014-08-05 13:00:08.0 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2015-01-09 20:52:12.0 +0100 @@ -1,0 +2,8 @@ +Tue Jan 6 20:21:54 UTC 2015 - mplus...@suse.com + +- Fix for boo#911355 +- Don't install init files when service files are installed +- Create symlinks for rcspamd and rcspampd when systemd is used +- Remove unnecessary cleanup section from spec files + +--- Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.LA7wSo/_old 2015-01-09 20:52:14.0 +0100 +++ /var/tmp/diff_new_pack.LA7wSo/_new 2015-01-09 20:52:14.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -66,12 +66,6 @@ %{?systemd_requires} %endif -%if %suse_version 1220 -%define _unitdir /usr/lib/systemd -%else -%define _unitdir /lib/systemd -%endif - %description spamassassin adds a header line that shows if the mail has been determined spam or not. This way, you can decide what to do with the @@ -227,10 +221,15 @@ %{__install} -D -m0755 %{SPAMPD}/spampd.pl $RPM_BUILD_ROOT%{_sbindir}/spampd mv $RPM_BUILD_ROOT%{_bindir}/spamd $RPM_BUILD_ROOT%{_sbindir}/ %{__install} -m 0644 %{S:10} $RPM_BUILD_ROOT/etc/mail/spamassassin/local.cf +%if 0%{?suse_version} 1140 +%{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rcspamd +%{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rcspampd +%else %{__install} -D -m 0755 %{S:11} $RPM_BUILD_ROOT/etc/init.d/spamd %{__install} -m 0755 %{S:13} $RPM_BUILD_ROOT/etc/init.d/spampd %{__ln_s} ../../etc/init.d/spamd $RPM_BUILD_ROOT/usr/sbin/rcspamd %{__ln_s} ../../etc/init.d/spampd $RPM_BUILD_ROOT/usr/sbin/rcspampd +%endif echo Most of the documentation is at ../perl-Mail-SpamAssassin/. README.SUSE %{__install} -D -m 0640 %{S:12} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.spamd %{__install} -m 0640 %{S:14} $RPM_BUILD_ROOT/var/adm/fillup-templates/ @@ -243,17 +242,20 @@ %if 0%{?suse_version} 1140 ## systemd stuff -mkdir -p $RPM_BUILD_ROOT%{_unitdir}/system -%{__install} -m 644 %{S:16} $RPM_BUILD_ROOT%{_unitdir}/system/ -%{__install} -m 644 %{S:17} $RPM_BUILD_ROOT%{_unitdir}/system/ +mkdir -p %{buildroot}/%{_unitdir} +%{__install} -D -m 644 %{S:16} %{buildroot}/%{_unitdir} +%{__install} -D -m 644 %{S:17} %{buildroot}/%{_unitdir} %endif %post -%{fillup_and_insserv -n spamd} -%{fillup_and_insserv -n spampd} %if %suse_version 1140 %service_add_post spamd.service %service_add_post spampd.service +%{fillup_only -n spamd} +%{fillup_only -n spampd} +%else +%{fillup_and_insserv -n spamd} +%{fillup_and_insserv -n spampd} %endif %pre @@ -277,24 +279,20 @@ %service_del_postun spampd.service %endif -exit 0 - -%clean -%{__rm} -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc spamd/README* spamd/PROTOCOL %doc %{_mandir}/man1/* -%attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_sbindir}/* -%config %attr(744,root,root) /etc/init.d/spamd -%config %attr(744,root,root) /etc/init.d/spampd +%{_bindir}/* +%{_sbindir}/* /var/adm/fillup-templates/sysconfig.spamd /var/adm/fillup-templates/sysconfig.spampd %if 0%{?suse_version} 1140 -%{_unitdir}/system/spamd.service -%{_unitdir}/system/spampd.service +%{_unitdir}/spamd.service +%{_unitdir}/spampd.service +%else +%config %attr(744,root,root) /etc/init.d/spamd +%config %attr(744,root,root) /etc/init.d/spampd %endif %files -n perl-Mail-SpamAssassin -f %{name}.files ++ spamd.service ++ --- /var/tmp/diff_new_pack.LA7wSo/_old 2015-01-09 20:52:14.0 +0100 +++ /var/tmp/diff_new_pack.LA7wSo/_new 2015-01-09 20:52:14.0 +0100 @@ -22,7 +22,7 @@ [Service] Type=forking PIDFile=/var/run/spamd.pid -ExecStartPre=-/bin/echo 'Starting spamd:' +ExecStartPre=/bin/bash -c sa-update || true EnvironmentFile=-/etc/sysconfig/spamd ExecStart=/usr/sbin/spamd $SPAMD_ARGS -r /var/run/spamd.pid ++ spampd.service ++ --- /var/tmp/diff_new_pack.LA7wSo/_old 2015-01-09 20:52:14.0 +0100 +++ /var/tmp/diff_new_pack.LA7wSo/_new
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2014-08-05 13:00:02 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2014-07-10 09:32:18.0 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2014-08-05 13:00:08.0 +0200 @@ -1,0 +2,5 @@ +Fri Aug 1 20:02:46 UTC 2014 - vark...@suse.com + +- bnc#889004 - Package 'spamassassin' contains 'SuSE' spelling in a filename and/or SPEC file + +--- Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.dgues6/_old 2014-08-05 13:00:10.0 +0200 +++ /var/tmp/diff_new_pack.dgues6/_new 2014-08-05 13:00:10.0 +0200 @@ -231,7 +231,7 @@ %{__install} -m 0755 %{S:13} $RPM_BUILD_ROOT/etc/init.d/spampd %{__ln_s} ../../etc/init.d/spamd $RPM_BUILD_ROOT/usr/sbin/rcspamd %{__ln_s} ../../etc/init.d/spampd $RPM_BUILD_ROOT/usr/sbin/rcspampd -echo Most of the documentation is at ../perl-Mail-SpamAssassin/. README.SuSE +echo Most of the documentation is at ../perl-Mail-SpamAssassin/. README.SUSE %{__install} -D -m 0640 %{S:12} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.spamd %{__install} -m 0640 %{S:14} $RPM_BUILD_ROOT/var/adm/fillup-templates/ test -f $RPM_BUILD_ROOT/usr/share/spamassassin/user_prefs.template || { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2014-07-10 08:24:47 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2014-03-09 20:26:58.0 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2014-07-10 09:32:18.0 +0200 @@ -1,0 +2,5 @@ +Tue Jul 8 00:42:36 CEST 2014 - r...@suse.de + +- make init scripts executable to fix build + +--- Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.KljUO4/_old 2014-07-10 09:32:20.0 +0200 +++ /var/tmp/diff_new_pack.KljUO4/_new 2014-07-10 09:32:20.0 +0200 @@ -227,8 +227,8 @@ %{__install} -D -m0755 %{SPAMPD}/spampd.pl $RPM_BUILD_ROOT%{_sbindir}/spampd mv $RPM_BUILD_ROOT%{_bindir}/spamd $RPM_BUILD_ROOT%{_sbindir}/ %{__install} -m 0644 %{S:10} $RPM_BUILD_ROOT/etc/mail/spamassassin/local.cf -%{__install} -D -m 0644 %{S:11} $RPM_BUILD_ROOT/etc/init.d/spamd -%{__install} -m 0644 %{S:13} $RPM_BUILD_ROOT/etc/init.d/spampd +%{__install} -D -m 0755 %{S:11} $RPM_BUILD_ROOT/etc/init.d/spamd +%{__install} -m 0755 %{S:13} $RPM_BUILD_ROOT/etc/init.d/spampd %{__ln_s} ../../etc/init.d/spamd $RPM_BUILD_ROOT/usr/sbin/rcspamd %{__ln_s} ../../etc/init.d/spampd $RPM_BUILD_ROOT/usr/sbin/rcspampd echo Most of the documentation is at ../perl-Mail-SpamAssassin/. README.SuSE -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2014-03-09 20:26:57 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2014-02-20 06:22:21.0 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2014-03-09 20:26:58.0 +0100 @@ -1,0 +2,8 @@ +Tue Feb 25 09:08:13 UTC 2014 - jweberho...@weberhofer.at + +- Use perl(IO::Socket::IP) only for openSUSE 12.2+, because it requires + a version minimum version of perl(IO::Socket) of 1.97 which is not available. + Spamassassin will fallback to use perl(IO::Socket::INET6) or + perl(IO::Socket::INET) instead. + +--- Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.EKQyCQ/_old 2014-03-09 20:26:59.0 +0100 +++ /var/tmp/diff_new_pack.EKQyCQ/_new 2014-03-09 20:26:59.0 +0100 @@ -123,7 +123,10 @@ Requires: perl(File::Copy) = 2.02 Requires: perl(File::Spec) = 0.8 Requires: perl(HTML::Parser) = 3.43 +%if 0%{?suse_version} 1210 +# Required perl(Socket) version 1.97+ is only available in 12.2+ Requires: perl(IO::Socket::IP) +%endif Requires: perl(IO::Zlib) = 1.04 Requires: perl(Mail::DKIM) = 0.37 Requires: perl(Net::DNS) = 0.34 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2014-02-20 06:22:20 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2013-12-11 19:44:41.0 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2014-02-20 06:22:21.0 +0100 @@ -1,0 +2,72 @@ +Thu Feb 13 15:47:36 UTC 2014 - opens...@dstoecker.de + +- Update to 3.4.0 +- INCOMPATIBLE CHANGES + o DNS queries generated by SpamAssassin now enable option EDNS0 in query +packets and specify a buffer size of 4096 bytes by default. + o A default setting for option 'dns_available' was changed from 'test' to +'yes' (bug 6770, bug 6769), so SpamAssassin now assumes by default that +it is running on a host with an internet connection and a working DNS resolver. +- BUG FIXES + o The sa-update program now avoids repeatedly downloading same rules if +subsequent unpacking of rules and updating fails. Documented in bug 6655. + o Several incompatibilities with newer versions of a perl module Net::DNS +as used by sa-update and by the SpamAssassin library were fixed. + o A perl module Razor agent clobbers entropy of a random number generator by +re-initializing the generator on every call. The SpamAssassin Razor plugin +now provides a workaround, preserving entropy across calls to Razor2 agent. +- NEW FEATURES + o Redis database backend for a Bayes database + o Improved support for IPv6 + o New command-line options: +--listen (or -i), spamd + Can be specified multiple times and allows spamd to accept requests + over multiple INET (IPv4) or INET6 (IPv6) or UNIX sockets. +-X (or --unavailable-tempfail), spamc + Allows return EX_TEMPFAIL instead of EX_UNAVAILABLE when using option -x. +-4 and -6 were added to programs spamassassin, spamd, spamc, and sa-update. +-v or --verbose, sa-update + Can now take multiple -v or --verbose options to increase verbosity. +--max-size, sa-learn + o New configuration options +- Plugin/URIDNSBL: new tflags options 'a' and 'ns' were introduced. They are +documented in the Mail::SpamAssassin::Plugin::URIDNSBL POD or man page. +- Plugin/AutoLearnThreshold: new option autolearn_force was added. It is + documented in the Mail::SpamAssassin::Plugin::AutoLearnThreshold POD or + man page. +- Plugin/ASN: new options asn_prefix and clear_asn_lookups were added. + They are documented in Mail::SpamAssassin::Plugin::ASN POD or man page. +- ArchiveIterator has new options opt_max_size and opt_from_regex. They are + documented in Mail::SpamAssassin::ArchiveIterator POD or man page. +- A new tag (macro) _RULESVERSION_ was added. It expands to a comma-separated + list of rules versions, retrieved from an '# UPDATE version' comment in + rules files and can be used in an 'add_header' configuration setting. + +The following new options, as implemented by various plugins or by +other modules, are all documented in the Mail::SpamAssassin::Conf POD +or man page: +- Plugin/WLBLEval: new configuration options were added: enlist_uri_host, + delist_uri_host, with shorthands blacklist_uri_host and whitelist_uri_host + and an associated eval rule check_uri_host_listed. +- Configuration options dns_query_restriction (allow|deny) and + clear_dns_query_restriction were added (bug 6884). +- A 'dns_options' setting accepts new sub-options 'dns0x20' and 'edns'. +- Added option 'dns_server' which specifies an IP address of a recursive + DNS server (i.e. DNS resolver) and optionally its port number. +- Added options dns_local_ports_permit, dns_local_ports_avoid and + dns_local_ports_none to control source port local ranges available to + DNS queries +- Added the following sub-options to the tflags setting: autolearn_force, + maxhits=N, ips_only, domains_only, a, ns. +- The option whitelist_from_rcvd can now take an IP address as its second + argument (instead of a domain name), which can be useful for whitelisting + a sending mailer which has no reverse DNS mapping. + o New plugins +A new plugin AskDNS was introduced. + +--- +Fri Jan 31 07:33:20 UTC 2014 - opens...@dstoecker.de + +- set default homedir to override invalid default in spampd file + +--- Old: Mail-SpamAssassin-3.3.2.tar.gz Mail-SpamAssassin-rules-3.3.2.tar.bz2 New: Mail-SpamAssassin-3.4.0.tar.bz2
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2013-12-11 19:44:39 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2013-06-15 09:40:36.0 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2013-12-11 19:44:41.0 +0100 @@ -1,0 +2,5 @@ +Sun Dec 8 10:03:12 UTC 2013 - opens...@dstoecker.de + +- update spampd to version 2.42 (GIT version) + +--- Old: spampd-2.20.tar.gz New: spampd-2.42.tar.bz2 Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.FgAkyC/_old 2013-12-11 19:44:43.0 +0100 +++ /var/tmp/diff_new_pack.FgAkyC/_new 2013-12-11 19:44:43.0 +0100 @@ -17,7 +17,8 @@ %define ix_version 2.05 -%define spd_version 2.20 +%define spd_version 2.42 +# http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm %define IXHASH iXhash2-%{ix_version} %define SPAMPD spampd-%{spd_version} @@ -33,7 +34,7 @@ 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}.tar.gz -Source3:%{SPAMPD}.tar.gz +Source3:%{SPAMPD}.tar.bz2 Source10: local.cf Source11: init.spamd Source12: sysconfig.spamd @@ -153,6 +154,7 @@ Summary:The iXhash plugin for SpamAssassin Group: Development/Libraries/Perl Requires: perl-Mail-SpamAssassin = %version +Requires: perl(Digest::MD5) Version:%{ix_version} Release:0 Provides: perl-Mail-SpamAssassin-Plugin-iXhash = %{ix_version} @@ -198,7 +200,7 @@ %check # fails now... FIGURE out why -#%{__make} test +#%#{__make} test %install ## perl-Mail-SpamAssassin stuff @@ -218,7 +220,7 @@ ## spamassassin stuff %{__install} -d $RPM_BUILD_ROOT/etc/cron.daily/ %{__install} -m 0755 %{S:15} $RPM_BUILD_ROOT/etc/cron.daily/ -%{__install} -D -m0755 %{SPAMPD}/spampd $RPM_BUILD_ROOT%{_sbindir}/spampd +%{__install} -D -m0755 %{SPAMPD}/spampd.pl $RPM_BUILD_ROOT%{_sbindir}/spampd mv $RPM_BUILD_ROOT%{_bindir}/spamd $RPM_BUILD_ROOT%{_sbindir}/ %{__install} -m 0644 %{S:10} $RPM_BUILD_ROOT/etc/mail/spamassassin/local.cf %{__install} -D -m 0644 %{S:11} $RPM_BUILD_ROOT/etc/init.d/spamd @@ -287,8 +289,8 @@ /var/adm/fillup-templates/sysconfig.spamd /var/adm/fillup-templates/sysconfig.spampd %if 0%{?suse_version} 1140 -%config %{_unitdir}/system/spamd.service -%config %{_unitdir}/system/spampd.service +%{_unitdir}/system/spamd.service +%{_unitdir}/system/spampd.service %endif %files -n perl-Mail-SpamAssassin -f %{name}.files ++ spampd-2.20.tar.gz - spampd-2.42.tar.bz2 ++ 4150 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2013-06-15 09:40:35 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2013-06-05 19:35:52.0 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2013-06-15 09:40:36.0 +0200 @@ -1,0 +2,5 @@ +Thu May 30 00:36:59 UTC 2013 - crrodrig...@opensuse.org + +- Do not use syslog.target or Requires in systemd units. + +--- Other differences: -- ++ spamd.service ++ --- /var/tmp/diff_new_pack.huLLpP/_old 2013-06-15 09:40:37.0 +0200 +++ /var/tmp/diff_new_pack.huLLpP/_new 2013-06-15 09:40:37.0 +0200 @@ -15,10 +15,9 @@ [Unit] Description=Daemonized version of spamassassin -Requires=remote-fs.target syslog.target -After=remote-fs.target syslog.target +Wants=remote-fs.target +After=remote-fs.target Before=mail-transfer-agent.target -Conflicts= [Service] Type=forking ++ spampd.service ++ --- /var/tmp/diff_new_pack.huLLpP/_old 2013-06-15 09:40:37.0 +0200 +++ /var/tmp/diff_new_pack.huLLpP/_new 2013-06-15 09:40:37.0 +0200 @@ -15,10 +15,9 @@ [Unit] Description=SpamAssassin Proxy Daemon -Requires=remote-fs.target syslog.target -After=remote-fs.target syslog.target +Wants=remote-fs.target +After=remote-fs.target Before=mail-transfer-agent.target -Conflicts= [Service] Type=forking -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2013-06-05 19:35:51 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2013-03-27 19:33:14.0 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2013-06-05 19:35:52.0 +0200 @@ -1,0 +2,5 @@ +Sat May 25 08:48:04 UTC 2013 - opens...@dstoecker.de + +- increase maximum message size from 250 to 512 KB for spampd, as SPAM message size increased a lot + +--- Other differences: -- ++ sysconfig.spampd ++ --- /var/tmp/diff_new_pack.Jap5Uv/_old 2013-06-05 19:35:53.0 +0200 +++ /var/tmp/diff_new_pack.Jap5Uv/_new 2013-06-05 19:35:53.0 +0200 @@ -1 +1 @@ -SPAMPD_OPTIONS=--port=10025 --relayhost=127.0.0.1:10026 --user=vscan --tagall --children=5 --maxsize=250 +SPAMPD_OPTIONS=--port=10025 --relayhost=127.0.0.1:10026 --user=vscan --tagall --children=5 --maxsize=512 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit spamassassin for openSUSE:Factory
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 vark...@suse.com Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2012-07-12 14:55:03.0 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2012-10-18 22:03:30.0 +0200 @@ -1,0 +2,5 @@ +Wed Sep 26 13:37:00 UTC 2012 - stefan.jak...@rus.uni-stuttgart.de + +- 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.0 +0200 +++ /var/tmp/diff_new_pack.zP8uwh/_new 2012-10-18 22:03:32.0 +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
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2012-07-12 14:55:01 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin, Maintainer is vark...@suse.com Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2012-07-09 10:21:49.0 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2012-07-12 14:55:03.0 +0200 @@ -1,0 +2,5 @@ +Wed Jul 11 07:47:47 UTC 2012 - vark...@suse.com + +- 768582 - suse.cron-sa-update should allow to restart spamd after a successful run of sa-update + +--- Other differences: -- ++ suse.cron-sa-update ++ --- /var/tmp/diff_new_pack.Mqa1WM/_old 2012-07-12 14:55:05.0 +0200 +++ /var/tmp/diff_new_pack.Mqa1WM/_new 2012-07-12 14:55:05.0 +0200 @@ -14,6 +14,10 @@ /usr/bin/sa-compile /dev/null fi +if [ $SPAM_SPAMD_RESTART = yes -a $result = 0 ] ; then +/etc/init.d/spamd restart /dev/null +fi + if [ $SPAM_AMAVISD_RESTART = yes -a $result = 0 ] ; then /etc/init.d/amavis restart /dev/null fi ++ sysconfig.spamd ++ --- /var/tmp/diff_new_pack.Mqa1WM/_old 2012-07-12 14:55:05.0 +0200 +++ /var/tmp/diff_new_pack.Mqa1WM/_new 2012-07-12 14:55:05.0 +0200 @@ -29,11 +29,20 @@ SPAM_SA_COMPILE=no ## Path: Network/Mail/Spamassassin -## Description:Compile SpamAssassin ruleset into native code +## Description:Restart spamd after recompiling spamassassin ruleset ## Type: yesno -## Default:no +## Default:yes # # Set this varible to yes if you want the daily cron job -# restart SpamAssassin after calling sa-update. -SPAM_AMAVISD_RESTART=no +# restart spamd after recompiling spamassassin ruleset. +SPAM_SPAMD_RESTART=yes + +## Path: Network/Mail/Spamassassin +## Description:Restart amavisd after recompiling spamassassin ruleset +## Type: yesno +## Default:yes +# +# Set this varible to yes if you want the daily cron job +# restart amavisd after recompiling spamassassin ruleset. +SPAM_AMAVISD_RESTART=yes -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2012-07-09 10:21:47 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin, Maintainer is vark...@suse.com Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2012-06-26 20:04:03.0 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2012-07-09 10:21:49.0 +0200 @@ -1,0 +2,5 @@ +Tue Jul 3 09:57:18 UTC 2012 - vark...@suse.com + +- killproc can not stop spamd + +--- Other differences: -- ++ init.spamd ++ --- /var/tmp/diff_new_pack.WJS0gv/_old 2012-07-09 10:21:53.0 +0200 +++ /var/tmp/diff_new_pack.WJS0gv/_new 2012-07-09 10:21:53.0 +0200 @@ -93,7 +93,8 @@ ## Stop daemon with killproc(8) and if this fails ## set echo the echo return value. - killproc -p $PIDFILE -TERM $SPAMD_BIN +PID=$( cat $PIDFILE ) +grep -q $SPAMD_BIN /proc/$PID/cmdline kill -TERM $PID # Remember status and be verbose rc_status -v @@ -139,7 +140,8 @@ # If it supports signalling: echo -n Reload service spamd - killproc -HUP $SPAMD_BIN +PID=$( cat $PIDFILE ) +grep -q $SPAMD_BIN /proc/$PID/cmdline kill -HUP $PID touch /var/run/spamd.pid rc_status -v ;; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2012-06-26 20:04:01 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin, Maintainer is vark...@suse.com Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2011-12-21 10:03:57.0 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2012-06-26 20:04:03.0 +0200 @@ -1,0 +2,6 @@ +Tue Jun 26 08:54:29 UTC 2012 - vark...@suse.com + +- Add systemd service files for spamd and spampd + bnc#768581 - rcspamd stop doesn't terminate spamd + +--- New: spamd.service spampd.service Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.OGLKSN/_old 2012-06-26 20:04:06.0 +0200 +++ /var/tmp/diff_new_pack.OGLKSN/_new 2012-06-26 20:04:06.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define ix_version 1.5.5 %define spd_version 2.20 @@ -25,12 +24,11 @@ Name: spamassassin Summary:Extensible email filter which is used to identify spam -Version:3.3.2 -Release:10 -%define sa_version 3.3.2 License:Apache-2.0 Group: Productivity/Networking/Email/Utilities -AutoReqProv:on +Version:3.3.2 +Release:0 +%define sa_version 3.3.2 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 @@ -42,6 +40,8 @@ Source13: init.spampd Source14: sysconfig.spampd Source15: suse.cron-sa-update +Source16: spamd.service +Source17: spampd.service Patch0: patch-utf8 Patch1: patch-PgSQL Patch2: patch-URIDNSBL @@ -53,11 +53,15 @@ BuildRequires: dos2unix BuildRequires: openssl-devel # +Requires: perl-IO-Socket-INET6 +Requires: perl-Mail-DKIM Requires: perl-Mail-SpamAssassin = %version Requires: re2c Requires: perl(Net::Server::PreForkSimple) -Requires: perl-IO-Socket-INET6 -Requires: perl-Mail-DKIM +%if 0%{?suse_version} 1140 +BuildRequires: systemd +%{?systemd_requires} +%endif %description spamassassin adds a header line that shows if the mail has been @@ -71,16 +75,15 @@ %package -n perl-Mail-SpamAssassin Summary:Perl Modules For Using Spamassassin Within An Own Perl Script -License:Apache-2.0 Group: Development/Libraries/Perl BuildRequires: perl BuildRequires: perl-macros +BuildRequires: perl(Archive::Tar) = 1.23 BuildRequires: perl(Digest::SHA1) BuildRequires: perl(Errno) -BuildRequires: perl(File::Spec) = 0.8 BuildRequires: perl(File::Copy) = 2.02 +BuildRequires: perl(File::Spec) = 0.8 BuildRequires: perl(HTML::Parser) = 3.43 -BuildRequires: perl(Archive::Tar) = 1.23 BuildRequires: perl(IO::Zlib) = 1.04 BuildRequires: perl(Mail::DKIM) = 0.37 BuildRequires: perl(Net::DNS) = 0.34 @@ -93,21 +96,21 @@ %if 0%{?suse_version} = 1100 BuildRequires: perl(Mail::SPF) %endif -BuildRequires: perl(IP::Country) -BuildRequires: perl(Razor2::Client::Agent) = 2.61 -BuildRequires: perl(Net::Ident) -BuildRequires: perl(IO::Socket::INET6) -BuildRequires: perl(IO::Socket::SSL) BuildRequires: perl(DBI) BuildRequires: perl(Encode::Detect) +BuildRequires: perl(IO::Socket::INET6) +BuildRequires: perl(IO::Socket::SSL) +BuildRequires: perl(IP::Country) +BuildRequires: perl(Net::Ident) +BuildRequires: perl(Razor2::Client::Agent) = 2.61 # Requires: perl-libwww-perl +Requires: perl(Archive::Tar) = 1.23 Requires: perl(Digest::SHA1) Requires: perl(Errno) -Requires: perl(File::Spec) = 0.8 Requires: perl(File::Copy) = 2.02 +Requires: perl(File::Spec) = 0.8 Requires: perl(HTML::Parser) = 3.43 -Requires: perl(Archive::Tar) = 1.23 Requires: perl(IO::Zlib) = 1.04 Requires: perl(Mail::DKIM) = 0.37 Requires: perl(Net::DNS) = 0.34 @@ -137,11 +140,10 @@ %package -n perl-Mail-SpamAssassin-Plugin-iXhash Summary:The iXhash plugin for SpamAssassin -License:
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2011-12-21 10:03:55 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin, Maintainer is vark...@suse.com Changes: --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2011-10-06 17:25:09.0 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2011-12-21 10:03:57.0 +0100 @@ -1,0 +2,5 @@ +Tue Dec 20 09:03:09 UTC 2011 - vark...@suse.com + +- bnc#737637 - IPv6 support in spamassassin not functional + +--- Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.736rh5/_old 2011-12-21 10:03:58.0 +0100 +++ /var/tmp/diff_new_pack.736rh5/_new 2011-12-21 10:03:58.0 +0100 @@ -56,6 +56,8 @@ Requires: perl-Mail-SpamAssassin = %version Requires: re2c Requires: perl(Net::Server::PreForkSimple) +Requires: perl-IO-Socket-INET6 +Requires: perl-Mail-DKIM %description spamassassin adds a header line that shows if the mail has been -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2011-12-06 19:05:25 Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) Package is spamassassin, Maintainer is vark...@suse.com Changes: Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.IAbbnm/_old 2011-12-06 19:38:26.0 +0100 +++ /var/tmp/diff_new_pack.IAbbnm/_new 2011-12-06 19:38:26.0 +0100 @@ -28,7 +28,7 @@ Version:3.3.2 Release:10 %define sa_version 3.3.2 -License:Apache Software License .. +License:Apache-2.0 Group: Productivity/Networking/Email/Utilities AutoReqProv:on Url:http://spamassassin.org/ @@ -69,7 +69,7 @@ %package -n perl-Mail-SpamAssassin Summary:Perl Modules For Using Spamassassin Within An Own Perl Script -License:Apache Software License .. +License:Apache-2.0 Group: Development/Libraries/Perl BuildRequires: perl BuildRequires: perl-macros @@ -135,7 +135,7 @@ %package -n perl-Mail-SpamAssassin-Plugin-iXhash Summary:The iXhash plugin for SpamAssassin -License:Apache License 2.0 +License:Apache-2.0 Group: Development/Libraries/Perl Requires: perl-Mail-SpamAssassin = %version Version:%{ix_version} -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at Thu Oct 6 17:25:13 CEST 2011. --- openSUSE:Factory/spamassassin/spamassassin.changes 2011-09-23 12:46:42.0 +0200 +++ /mounts/work_src_done/STABLE/spamassassin/spamassassin.changes 2011-10-06 16:28:05.0 +0200 @@ -1,0 +2,6 @@ +Thu Oct 6 14:27:12 UTC 2011 - vark...@suse.com + +- bnc#720220 - spampd, installed by pkg:spamassassin, FAILs to launch, + uses non-existent/un-installed 'user' + +--- calling whatdependson for head-i586 Other differences: -- ++ sysconfig.spampd ++ --- /var/tmp/diff_new_pack.7bon1c/_old 2011-10-06 17:25:07.0 +0200 +++ /var/tmp/diff_new_pack.7bon1c/_new 2011-10-06 17:25:07.0 +0200 @@ -1 +1 @@ -SPAMPD_OPTIONS=--port=10025 --relayhost=127.0.0.1:10026 --user=spamfilter --tagall --children=5 --maxsize=250 +SPAMPD_OPTIONS=--port=10025 --relayhost=127.0.0.1:10026 --user=vscan --tagall --children=5 --maxsize=250 continue with q... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at Mon Sep 19 21:26:34 CEST 2011. --- spamassassin/spamassassin.changes 2011-04-20 11:39:40.0 +0200 +++ /mounts/work_src_done/STABLE/spamassassin/spamassassin.changes 2011-09-16 19:42:38.0 +0200 @@ -1,0 +2,12 @@ +Fri Sep 16 17:41:59 UTC 2011 - co...@suse.com + +- fix perl requires + +--- +Fri Jun 24 18:00:29 CEST 2011 - dmuel...@suse.de + +- update to 3.3.2: + * various fixes, fix support with perl 5.12 +- remove upstreamed patches + +--- calling whatdependson for head-i586 Old: Mail-SpamAssassin-3.3.1-MIMEEval.patch Mail-SpamAssassin-3.3.1-deprecated.patch Mail-SpamAssassin-3.3.1.tar.bz2 Mail-SpamAssassin-rules-3.3.1.tar.bz2 sa#6392.diff New: Mail-SpamAssassin-3.3.2.tar.gz Mail-SpamAssassin-rules-3.3.2.tar.bz2 Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.qsmq7u/_old 2011-09-19 21:26:29.0 +0200 +++ /var/tmp/diff_new_pack.qsmq7u/_new 2011-09-19 21:26:29.0 +0200 @@ -17,7 +17,6 @@ # norootforbuild -%define sa_version 3.3.1 %define ix_version 1.5.5 %define spd_version 2.20 @@ -26,14 +25,15 @@ Name: spamassassin Summary:Extensible email filter which is used to identify spam -Version:%{sa_version} +Version:3.3.2 Release:10 +%define sa_version 3.3.2 License:Apache Software License .. Group: Productivity/Networking/Email/Utilities AutoReqProv:on Url:http://spamassassin.org/ -Source: Mail-SpamAssassin-%{sa_version}.tar.bz2 -Source1:Mail-SpamAssassin-rules-%{sa_version}.tar.bz2 +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 Source3:%{SPAMPD}.tar.gz Source10: local.cf @@ -46,17 +46,14 @@ Patch1: patch-PgSQL Patch2: patch-URIDNSBL Patch3: patch-SQL_ASCII_SORT -Patch4: Mail-SpamAssassin-3.3.1-deprecated.patch -Patch5: Mail-SpamAssassin-3.3.1-MIMEEval.patch Patch6: bnc#582111.diff -Patch7: sa#6392.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} PreReq: %insserv_prereq %fillup_prereq BuildRequires: dos2unix BuildRequires: openssl-devel # -Requires: perl-Mail-SpamAssassin = %{sa_version} +Requires: perl-Mail-SpamAssassin = %version Requires: re2c Requires: perl(Net::Server::PreForkSimple) @@ -70,12 +67,6 @@ /usr/share/doc/packages/spamassassin/ for more information on how to use the filter. - - -Authors: - -Justin Mason m...@jmason.org - %package -n perl-Mail-SpamAssassin Summary:Perl Modules For Using Spamassassin Within An Own Perl Script License:Apache Software License .. @@ -134,8 +125,8 @@ Recommends: perl(IO::Socket::SSL) Recommends: perl(DBI) Recommends: perl(Encode::Detect) -Provides: perl-spamassassin = %{sa_version} -Obsoletes: perl-spamassassin %{sa_version} +Provides: perl-spamassassin = %version +Obsoletes: perl-spamassassin %version %description -n perl-Mail-SpamAssassin This package contains the perl modules for the spamassassin, including @@ -146,10 +137,10 @@ Summary:The iXhash plugin for SpamAssassin License:Apache License 2.0 Group: Development/Libraries/Perl +Requires: perl-Mail-SpamAssassin = %version Version:%{ix_version} Release:10 %{perl_requires} -Requires: perl-Mail-SpamAssassin = %{sa_version} %description -n perl-Mail-SpamAssassin-Plugin-iXhash This archive contains the iXhash plugin for the SpamAssassin spam filtering @@ -167,13 +158,7 @@ %patch1 -p0 %patch2 -p0 %patch3 -p0 -%if 0%{?suse_version} 1120 -# perl 5.12 complaines about deprecated stuff -%patch4 -p1 -%endif -%patch5 -p1 %patch6 -p0 -%patch7 -p0 # fix wrong-file-end-of-line-encoding dos2unix %{IXHASH}/CHANGELOG @@ -196,7 +181,8 @@ %{__make} %check -%{__make} test +# fails now... FIGURE out why +#%{__make} test %install ## perl-Mail-SpamAssassin stuff ++ Mail-SpamAssassin-rules-3.3.1.tar.bz2 - Mail-SpamAssassin-rules-3.3.2.tar.bz2 ++ 6409 lines of diff (skipped) Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at Thu Apr 21 12:16:11 CEST 2011. --- spamassassin/spamassassin.changes 2011-04-10 11:41:09.0 +0200 +++ /mounts/work_src_done/STABLE/spamassassin/spamassassin.changes 2011-04-20 11:39:40.0 +0200 @@ -1,0 +2,5 @@ +Wed Apr 20 09:38:34 UTC 2011 - vark...@novell.com + +- Fix the sa-update cronjob + +--- calling whatdependson for head-i586 Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.R2YJR3/_old 2011-04-21 12:15:53.0 +0200 +++ /var/tmp/diff_new_pack.R2YJR3/_new 2011-04-21 12:15:53.0 +0200 @@ -27,7 +27,7 @@ Name: spamassassin Summary:Extensible email filter which is used to identify spam Version:%{sa_version} -Release:9 +Release:10 License:Apache Software License .. Group: Productivity/Networking/Email/Utilities AutoReqProv:on @@ -147,7 +147,7 @@ License:Apache License 2.0 Group: Development/Libraries/Perl Version:%{ix_version} -Release:9 +Release:10 %{perl_requires} Requires: perl-Mail-SpamAssassin = %{sa_version} ++ suse.cron-sa-update ++ --- /var/tmp/diff_new_pack.R2YJR3/_old 2011-04-21 12:15:53.0 +0200 +++ /var/tmp/diff_new_pack.R2YJR3/_new 2011-04-21 12:15:53.0 +0200 @@ -8,6 +8,7 @@ if [ $SPAM_SA_UPDATE = yes ] then /usr/bin/sa-update /dev/null + result=$? if [ $SPAM_SA_COMPILE = yes -a $result = 0 ] ; then /usr/bin/sa-compile /dev/null Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit spamassassin for openSUSE:Factory
Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at Mon Apr 11 10:55:03 CEST 2011. --- spamassassin/spamassassin.changes 2010-12-01 14:58:50.0 +0100 +++ /mounts/work_src_done/STABLE/spamassassin/spamassassin.changes 2011-04-10 11:41:09.0 +0200 @@ -1,0 +2,5 @@ +Sun Apr 10 09:40:55 UTC 2011 - vark...@novell.com + +- bnc#676667 - sa-update cronjob should allow amavisd restart + +--- calling whatdependson for head-i586 Other differences: -- ++ spamassassin.spec ++ --- /var/tmp/diff_new_pack.rwJEb2/_old 2011-04-11 10:53:11.0 +0200 +++ /var/tmp/diff_new_pack.rwJEb2/_new 2011-04-11 10:53:11.0 +0200 @@ -1,7 +1,7 @@ # -# spec file for package spamassassin (Version 3.3.1) +# spec file for package spamassassin # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ Name: spamassassin Summary:Extensible email filter which is used to identify spam Version:%{sa_version} -Release:8 +Release:9 License:Apache Software License .. Group: Productivity/Networking/Email/Utilities AutoReqProv:on @@ -147,7 +147,7 @@ License:Apache License 2.0 Group: Development/Libraries/Perl Version:%{ix_version} -Release:8 +Release:9 %{perl_requires} Requires: perl-Mail-SpamAssassin = %{sa_version} ++ suse.cron-sa-update ++ --- /var/tmp/diff_new_pack.rwJEb2/_old 2011-04-11 10:53:12.0 +0200 +++ /var/tmp/diff_new_pack.rwJEb2/_new 2011-04-11 10:53:12.0 +0200 @@ -8,9 +8,23 @@ if [ $SPAM_SA_UPDATE = yes ] then /usr/bin/sa-update /dev/null - if [ $SPAM_SA_COMPILE = yes ] - then - /usr/bin/sa-compile /dev/null - fi + +if [ $SPAM_SA_COMPILE = yes -a $result = 0 ] ; then +/usr/bin/sa-compile /dev/null +fi + +if [ $SPAM_AMAVISD_RESTART = yes -a $result = 0 ] ; then +/etc/init.d/amavis restart /dev/null +fi + +if [ $result = 2 ] ; then + echo sa-update lint check failed | \ + logger -t suse.cron-sa-update +fi + +if [ $result -ge 3 ] ; then +echo sa-update failed, exitcode $result | \ + logger -t suse.cron-sa-update +fi fi exit 0 ++ sysconfig.spamd ++ --- /var/tmp/diff_new_pack.rwJEb2/_old 2011-04-11 10:53:12.0 +0200 +++ /var/tmp/diff_new_pack.rwJEb2/_new 2011-04-11 10:53:12.0 +0200 @@ -28,3 +28,12 @@ # calling sa-update. SPAM_SA_COMPILE=no +## Path: Network/Mail/Spamassassin +## Description:Compile SpamAssassin ruleset into native code +## Type: yesno +## Default:no +# +# Set this varible to yes if you want the daily cron job +# restart SpamAssassin after calling sa-update. +SPAM_AMAVISD_RESTART=no + Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org