3 files changed, 34 insertions, 2 deletions
diff --git a/spamassassin-courier/PKGBUILD b/spamassassin-courier/PKGBUILD
index 3980265db..58c88017e 100644
--- a/spamassassin-courier/PKGBUILD
+++ b/spamassassin-courier/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin-courier
 pkgver=3.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A mail filter to identify spam - patched for courier-mta."
 arch=('i686' 'x86_64')
 license=('APACHE' 'GPL2')
@@ -25,14 +25,20 @@ backup=('etc/mail/spamassassin/local.cf'
 install="${pkgname}.install"
 source=("https://www.us.apache.org/dist/${pkgname%-*}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
         'spamassassin.service'
+        'spamassassin-update.service'
+        'spamassassin-update.timer'
 	'AuthCourier.pm' # http://da.andaka.org/dl/AuthCourier.pm
 	'spamd.patch')
 validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
 sha512sums=('85e3d78bb885ad1d0bf2066d1bc919d6ad5e9f86795069397e7c28cc1ba02870566ec014c08c81f68e7ed03b7f60d2de0b9730b3415b35d848abde2c8920a28f'
             'SKIP'
             '7e44370e9433134816db51681de388618f8b00f27e9229b673ca7da5821b6bfc27dfc9f6f7387ef18d1d310ea03a4569f46cae3089bba91dd71692b9eee8c8e4'
+            'bd5a00a7b6aefa97c31b60de38afe6d2d8de11b6535e41c01a47d3e6269e043f048a281af80144de1528abe20a6becc4b3e673cabe4edd8f5921d5942d653227'
+            'a99c5ba2aca337798c1d0f4f895a7ef4b83658e11b274df2c2b402679c12bf7a8a9ee3d04cd71f77b2f97f2bda0e89410f4555e9cdcc1c2e9507d0efb28364b6'
             '56fd65798efea805dac6900528c9720e6af8c81d93c08ab99adedca1c63757334c7a1d4cabed0a427c447dc1bbf05ece6abb8be3a3cbaf19919c7a86729f99af'
 	    'c0333a744dc2e6e34e341dea4242c2a9337c015fe0e918ede1c24051f7f6992f260bb1329b86ae7d884d9287497c25eab13602a024be45e901d14d1faad74b3d')
+provides=("spamassassin=${pkgver}")
+conflicts=('spamassassin')
 
 prepare() {
   cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
@@ -68,7 +74,7 @@ package() {
   cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service"
+  install -D -m644 -t "${pkgdir}/usr/lib/systemd/system/" "${srcdir}/spamassassin.service" "${srcdir}/spamassassin-update.service" "${srcdir}/spamassassin-update.timer"
   install -d -o 182 -g 182 -m 755 "$pkgdir/var/lib/spamassassin"
   install -m444 -t "${pkgdir}/usr/share/perl5/vendor_perl/Mail/SpamAssassin/" "${srcdir}/AuthCourier.pm"
 
diff --git a/spamassassin-courier/spamassassin-update.service b/spamassassin-courier/spamassassin-update.service
new file mode 100644
index 000000000..1d944a2da
--- /dev/null
+++ b/spamassassin-courier/spamassassin-update.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=spamassassin housekeeping stuff
+
+[Service]
+#User=spamd
+#Group=spamd
+Type=oneshot
+
+# remove --allowplugins, if you do not want plugin updates from SA.
+ExecStart=/bin/sh -c '/usr/bin/vendor_perl/sa-update --allowplugins && {\
+ /usr/bin/vendor_perl/sa-compile --quiet;\
+ /usr/bin/systemctl -q --no-block try-restart spamassassin.service; }'
+SuccessExitStatus=1
+
+# uncomment the following ExecStart line to train SA's bayes filter
+# and specify the path to the mailbox that contains spam email(s)
+#ExecStart=/usr/bin/vendor_perl/sa-learn --spam <path_to_your_spam_mailbox>
diff --git a/spamassassin-courier/spamassassin-update.timer b/spamassassin-courier/spamassassin-update.timer
new file mode 100644
index 000000000..26d143a2f
--- /dev/null
+++ b/spamassassin-courier/spamassassin-update.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=spamassassin house keeping
+
+[Timer]
+OnCalendar=daily
+Persistent=true
+
+[Install]
+WantedBy=timers.target