From: Marcin Krol Date: Tue, 19 May 2020 08:24:40 +0000 (+0200) Subject: - updated to 3.4.4, removed obsolete sought rules X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=6ec5047cebd3898de8c124b4d7524d8c6d3ffec3;p=packages%2Fspamassassin.git - updated to 3.4.4, removed obsolete sought rules --- diff --git a/sought.conf b/sought.conf deleted file mode 100644 index f24d6c9..0000000 --- a/sought.conf +++ /dev/null @@ -1,47 +0,0 @@ -# http://wiki.apache.org/spamassassin/SoughtRules -CHANNELURL=sought.rules.yerp.org -KEYID=6C6191E3 -# Ignore everything below. -return 0 - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.1 (GNU/Linux) - -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 -=nK43 ------END PGP PUBLIC KEY BLOCK----- diff --git a/spamassassin.spec b/spamassassin.spec index 0b2dcbf..e91d45c 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -8,16 +8,15 @@ %define pdir Mail %define pnam SpamAssassin %define sa_version %(printf %d.%03d%03d $(echo %{version} | tr '.' ' ')) -%include /usr/lib/rpm/macros.perl Summary: A spam filter for email which can be invoked from mail delivery agents Summary(pl.UTF-8): Filtr antyspamowy, przeznaczony dla programów dostarczających pocztę (MDA) Name: spamassassin -Version: 3.4.2 -Release: 2 +Version: 3.4.4 +Release: 1 License: Apache v2.0 Group: Applications/Mail Source0: http://ftp.man.poznan.pl/pub/apache//spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2 -# Source0-md5: 4f4c38a7cd4ae3e3750895ae21d2fc78 +# Source0-md5: ce51fe5665d5838c56db6712846b58bb Source1: %{name}.sysconfig Source2: %{name}-spamd.init Source3: %{name}-default.rc @@ -25,7 +24,6 @@ Source4: %{name}-spamc.rc Source5: sa-update.sh Source6: sa-update.cron Source7: spamassassin-official.conf -Source8: sought.conf Patch0: bug_771408_perl_version Patch1: config-dir.patch URL: http://spamassassin.apache.org/ @@ -308,7 +306,6 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/spamassassin install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/spamassassin/sa-update.cron install %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.d/sa-update install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/spamassassin/channel.d -install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/spamassassin/channel.d # sa-update, sa-compile install -d $RPM_BUILD_ROOT/var/lib/spamassassin/{%{sa_version},compiled/%{sa_version}} @@ -421,7 +418,6 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/spamassassin/channels %dir %{_sysconfdir}/spamassassin/channel.d %{_sysconfdir}/spamassassin/channel.d/spamassassin-official.conf -%{_sysconfdir}/spamassassin/channel.d/sought.conf %attr(700,root,root) %dir %{_sysconfdir}/spamassassin/sa-update-keys %attr(700,root,root) %ghost %{_sysconfdir}/spamassassin/sa-update-keys/* %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/sa-update