From: Marcel Lorenz <marcel.lorenz@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] spamassassin: update to 3.4.1
Date: Thu, 17 Mar 2016 16:04:15 +0100 [thread overview]
Message-ID: <1458227055-17757-2-git-send-email-marcel.lorenz@ipfire.org> (raw)
In-Reply-To: <1458227055-17757-1-git-send-email-marcel.lorenz@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 28387 bytes --]
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
config/rootfiles/packages/spamassassin | 260 ++++++++++++++++++---------------
lfs/spamassassin | 12 +-
src/paks/spamassassin/install.sh | 35 +++++
src/paks/spamassassin/uninstall.sh | 28 ++++
src/paks/spamassassin/update.sh | 26 ++++
5 files changed, 234 insertions(+), 127 deletions(-)
create mode 100644 src/paks/spamassassin/install.sh
create mode 100644 src/paks/spamassassin/uninstall.sh
create mode 100644 src/paks/spamassassin/update.sh
diff --git a/config/rootfiles/packages/spamassassin b/config/rootfiles/packages/spamassassin
index b6b36b9..30d286f 100644
--- a/config/rootfiles/packages/spamassassin
+++ b/config/rootfiles/packages/spamassassin
@@ -1,98 +1,139 @@
etc/mail
#etc/mail/spamassassin
-#etc/mail/spamassassin/init.pre
-#etc/mail/spamassassin/local.cf
-#etc/mail/spamassassin/v310.pre
-#etc/mail/spamassassin/v312.pre
+etc/mail/spamassassin/init.pre
+etc/mail/spamassassin/local.cf
+etc/mail/spamassassin/v310.pre
+etc/mail/spamassassin/v312.pre
+etc/mail/spamassassin/v320.pre
+etc/mail/spamassassin/v330.pre
+etc/mail/spamassassin/v340.pre
+etc/mail/spamassassin/v341.pre
+usr/bin/sa-awl
+usr/bin/sa-check_spamd
+usr/bin/sa-compile
usr/bin/sa-learn
usr/bin/sa-update
usr/bin/spamassassin
usr/bin/spamc
usr/bin/spamd
-usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin
+#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin
usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/ArchiveIterator.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/AutoWhitelist.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/AICache.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/ArchiveIterator.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/AsyncLoop.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/AutoWhitelist.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Bayes
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Bayes.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Bayes/CombineChi.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Bayes/CombineNaiveBayes.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Bayes.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Bayes/CombineChi.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Bayes/CombineNaiveBayes.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/BayesStore
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/BayesStore.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/BayesStore/DBM.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/BayesStore/MySQL.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/BayesStore/PgSQL.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/BayesStore/SDBM.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/BayesStore/SQL.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Client.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/BayesStore.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/BayesStore/BDB.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/BayesStore/DBM.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/BayesStore/MySQL.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/BayesStore/PgSQL.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/BayesStore/Redis.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/BayesStore/SDBM.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/BayesStore/SQL.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Client.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Conf
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Conf.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Conf/LDAP.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Conf/Parser.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Conf/SQL.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Constants.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/DBBasedAddrList.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Dns.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/DnsResolver.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/EvalTests.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/HTML.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Locales.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Conf.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Conf/LDAP.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Conf/Parser.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Conf/SQL.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Constants.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/DBBasedAddrList.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Dns.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/DnsResolver.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/HTML.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Locales.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Locker
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Locker.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Locker/Flock.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Locker/UnixNFSSafe.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Locker/Win32.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Locker.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Locker/Flock.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Locker/UnixNFSSafe.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Locker/Win32.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Logger
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Logger.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Logger/File.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Logger/Stderr.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Logger/Syslog.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/MailingList.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Logger.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Logger/File.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Logger/Stderr.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Logger/Syslog.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/MailingList.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Message
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Message.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Message/Metadata
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Message/Metadata.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Message/Metadata/Received.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Message/Node.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/NetSet.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/PerMsgLearner.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/PerMsgStatus.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/PersistentAddrList.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Message.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Message/Metadata
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Message/Metadata.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Message/Metadata/Received.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Message/Node.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/NetSet.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/PerMsgLearner.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/PerMsgStatus.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/PersistentAddrList.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/AWL.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/AccessDB.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/AntiVirus.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/DCC.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/DKIM.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/DomainKeys.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/Hashcash.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/MIMEHeader.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/Pyzor.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/Razor2.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/RelayCountry.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/ReplaceTags.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/SPF.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/SpamCop.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/Test.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/TextCat.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/URIDNSBL.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/WhiteListSubject.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/PluginHandler.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Reporter.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/SQLBasedAddrList.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/SpamdForkScaling.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/SubProcBackChannel.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Timeout.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/ASN.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/AWL.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/AccessDB.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/AntiVirus.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/AskDNS.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/Bayes.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/BodyEval.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/Check.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/DCC.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/DKIM.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/DNSEval.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/FreeMail.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/HTMLEval.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/Hashcash.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/HeaderEval.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/ImageInfo.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/MIMEEval.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/MIMEHeader.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/PDFInfo.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/PhishTag.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/Pyzor.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/Razor2.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/RelayCountry.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/RelayEval.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/ReplaceTags.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/Reuse.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/SPF.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/Shortcircuit.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/SpamCop.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/Test.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/TextCat.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/TxRep.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/URIDNSBL.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/URIDetail.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/URIEval.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/URILocalBL.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/VBounce.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/WLBLEval.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Plugin/WhiteListSubject.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/PluginHandler.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/RegistryBoundaries.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Reporter.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/SQLBasedAddrList.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/SpamdForkScaling.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/SubProcBackChannel.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Timeout.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Util
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Util.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Util/DependencyInfo.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Util/Progress.pm
-#usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Util.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Util/DependencyInfo.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Util/Progress.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Util/ScopedTimer.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Util/TieOneStringHash.pm
+usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Util/TinyRedis.pm
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Mail/SpamAssassin
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Mail/SpamAssassin/.packlist
#usr/lib/perl5/site_perl/5.12.3/spamassassin-run.pod
+#usr/share/man/man1/sa-awl.1
+#usr/share/man/man1/sa-compile.1
#usr/share/man/man1/sa-learn.1
#usr/share/man/man1/sa-update.1
#usr/share/man/man1/spamassassin-run.1
@@ -100,12 +141,16 @@ usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin.pm
#usr/share/man/man1/spamc.1
#usr/share/man/man1/spamd.1
#usr/share/man/man3/Mail::SpamAssassin.3
+#usr/share/man/man3/Mail::SpamAssassin::AICache.3
#usr/share/man/man3/Mail::SpamAssassin::ArchiveIterator.3
+#usr/share/man/man3/Mail::SpamAssassin::AsyncLoop.3
#usr/share/man/man3/Mail::SpamAssassin::AutoWhitelist.3
#usr/share/man/man3/Mail::SpamAssassin::Bayes.3
#usr/share/man/man3/Mail::SpamAssassin::BayesStore.3
+#usr/share/man/man3/Mail::SpamAssassin::BayesStore::BDB.3
#usr/share/man/man3/Mail::SpamAssassin::BayesStore::MySQL.3
#usr/share/man/man3/Mail::SpamAssassin::BayesStore::PgSQL.3
+#usr/share/man/man3/Mail::SpamAssassin::BayesStore::Redis.3
#usr/share/man/man3/Mail::SpamAssassin::BayesStore::SQL.3
#usr/share/man/man3/Mail::SpamAssassin::Client.3
#usr/share/man/man3/Mail::SpamAssassin::Conf.3
@@ -124,26 +169,43 @@ usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin.pm
#usr/share/man/man3/Mail::SpamAssassin::PerMsgStatus.3
#usr/share/man/man3/Mail::SpamAssassin::PersistentAddrList.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::ASN.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::AWL.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::AccessDB.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::AntiVirus.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::AskDNS.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::AutoLearnThreshold.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::Bayes.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::BodyRuleBaseExtractor.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::Check.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::DCC.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::DKIM.3
-#usr/share/man/man3/Mail::SpamAssassin::Plugin::DomainKeys.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::DNSEval.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::Hashcash.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::MIMEEval.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::MIMEHeader.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::OneLineBodyRuleType.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::PDFInfo.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::PhishTag.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::Pyzor.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::Razor2.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::RelayCountry.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::ReplaceTags.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::Reuse.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::Rule2XSBody.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::SPF.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::Shortcircuit.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::SpamCop.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::Test.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::TextCat.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::TxRep.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::URIDNSBL.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::URIDetail.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::URILocalBL.3
+#usr/share/man/man3/Mail::SpamAssassin::Plugin::VBounce.3
#usr/share/man/man3/Mail::SpamAssassin::Plugin::WhiteListSubject.3
#usr/share/man/man3/Mail::SpamAssassin::PluginHandler.3
+#usr/share/man/man3/Mail::SpamAssassin::RegistryBoundaries.3
#usr/share/man/man3/Mail::SpamAssassin::SQLBasedAddrList.3
#usr/share/man/man3/Mail::SpamAssassin::SubProcBackChannel.3
#usr/share/man/man3/Mail::SpamAssassin::Timeout.3
@@ -153,51 +215,7 @@ usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin.pm
#usr/share/man/man3/Mail::SpamAssassin::Util::RegistrarBoundaries.3
#usr/share/man/man3/spamassassin-run.3
usr/share/spamassassin
-#usr/share/spamassassin/10_misc.cf
-#usr/share/spamassassin/20_advance_fee.cf
-#usr/share/spamassassin/20_anti_ratware.cf
-#usr/share/spamassassin/20_body_tests.cf
-#usr/share/spamassassin/20_compensate.cf
-#usr/share/spamassassin/20_dnsbl_tests.cf
-#usr/share/spamassassin/20_drugs.cf
-#usr/share/spamassassin/20_fake_helo_tests.cf
-#usr/share/spamassassin/20_head_tests.cf
-#usr/share/spamassassin/20_html_tests.cf
-#usr/share/spamassassin/20_meta_tests.cf
-#usr/share/spamassassin/20_net_tests.cf
-#usr/share/spamassassin/20_phrases.cf
-#usr/share/spamassassin/20_porn.cf
-#usr/share/spamassassin/20_ratware.cf
-#usr/share/spamassassin/20_uri_tests.cf
-#usr/share/spamassassin/23_bayes.cf
-#usr/share/spamassassin/25_accessdb.cf
-#usr/share/spamassassin/25_antivirus.cf
-#usr/share/spamassassin/25_body_tests_es.cf
-#usr/share/spamassassin/25_body_tests_pl.cf
-#usr/share/spamassassin/25_dcc.cf
-#usr/share/spamassassin/25_dkim.cf
-#usr/share/spamassassin/25_domainkeys.cf
-#usr/share/spamassassin/25_hashcash.cf
-#usr/share/spamassassin/25_pyzor.cf
-#usr/share/spamassassin/25_razor2.cf
-#usr/share/spamassassin/25_replace.cf
-#usr/share/spamassassin/25_spf.cf
-#usr/share/spamassassin/25_textcat.cf
-#usr/share/spamassassin/25_uribl.cf
-#usr/share/spamassassin/30_text_de.cf
-#usr/share/spamassassin/30_text_fr.cf
-#usr/share/spamassassin/30_text_it.cf
-#usr/share/spamassassin/30_text_nl.cf
-#usr/share/spamassassin/30_text_pl.cf
-#usr/share/spamassassin/30_text_pt_br.cf
-#usr/share/spamassassin/50_scores.cf
-#usr/share/spamassassin/60_awl.cf
-#usr/share/spamassassin/60_whitelist.cf
-#usr/share/spamassassin/60_whitelist_dkim.cf
-#usr/share/spamassassin/60_whitelist_spf.cf
-#usr/share/spamassassin/60_whitelist_subject.cf
#usr/share/spamassassin/languages
#usr/share/spamassassin/sa-update-pubkey.txt
-#usr/share/spamassassin/triplets.txt
#usr/share/spamassassin/user_prefs.template
etc/rc.d/init.d/spamassassin
diff --git a/lfs/spamassassin b/lfs/spamassassin
index 02d60fe..71bff23 100644
--- a/lfs/spamassassin
+++ b/lfs/spamassassin
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 3.1.3
+VER = 3.4.1
THISAPP = Mail-SpamAssassin-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = spamassassin
-PAK_VER = 2
+PAK_VER = 3
-DEPS = ""
+DEPS = "perl-NetAddr-IP"
###############################################################################
# Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 32ad78f3cdaddb02cdf0f55572604d07
+$(DL_FILE)_MD5 = 76eca1f38c11635d319e62c26d5b034b
install : $(TARGET)
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && yes 'n' | perl Makefile.PL
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/paks/spamassassin/install.sh b/src/paks/spamassassin/install.sh
new file mode 100644
index 0000000..f2dbfa9
--- /dev/null
+++ b/src/paks/spamassassin/install.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+restore_backup ${NAME}
+
+# Enable autostart for spamassassin
+ln -sf ../init.d/spamassassin /etc/rc.d/rc0.d/K22spamassassin
+ln -sf ../init.d/spamassassin /etc/rc.d/rc3.d/S44spamassassin
+ln -sf ../init.d/spamassassin /etc/rc.d/rc6.d/K22spamassassin
+
+#Set rights
+chmod -R 755 /etc/mail
+sa-update
diff --git a/src/paks/spamassassin/uninstall.sh b/src/paks/spamassassin/uninstall.sh
new file mode 100644
index 0000000..306dd4e
--- /dev/null
+++ b/src/paks/spamassassin/uninstall.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/etc/init.d/spammassassin stop
+make_backup ${NAME}
+remove_files
+rm -rfv /etc/rc.d/rc*.d/*amavisd
\ No newline at end of file
diff --git a/src/paks/spamassassin/update.sh b/src/paks/spamassassin/update.sh
new file mode 100644
index 0000000..89c40d0
--- /dev/null
+++ b/src/paks/spamassassin/update.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh
--
1.9.1
prev parent reply other threads:[~2016-03-17 15:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-17 15:04 [PATCH 1/2] new package: perl-NetAddr-IP 4.078 Marcel Lorenz
2016-03-17 15:04 ` Marcel Lorenz [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458227055-17757-2-git-send-email-marcel.lorenz@ipfire.org \
--to=marcel.lorenz@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox