[arch-commits] Commit in spamassassin/repos (14 files)

Florian Pritz bluewind at archlinux.org
Thu Aug 20 21:35:22 UTC 2015


    Date: Thursday, August 20, 2015 @ 23:35:22
  Author: bluewind
Revision: 244455

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  spamassassin/repos/extra-i686/PKGBUILD
    (from rev 244454, spamassassin/trunk/PKGBUILD)
  spamassassin/repos/extra-i686/net-dns-1.01-compat.patch
    (from rev 244454, spamassassin/trunk/net-dns-1.01-compat.patch)
  spamassassin/repos/extra-i686/spamassassin.install
    (from rev 244454, spamassassin/trunk/spamassassin.install)
  spamassassin/repos/extra-i686/spamassassin.service
    (from rev 244454, spamassassin/trunk/spamassassin.service)
  spamassassin/repos/extra-x86_64/PKGBUILD
    (from rev 244454, spamassassin/trunk/PKGBUILD)
  spamassassin/repos/extra-x86_64/net-dns-1.01-compat.patch
    (from rev 244454, spamassassin/trunk/net-dns-1.01-compat.patch)
  spamassassin/repos/extra-x86_64/spamassassin.install
    (from rev 244454, spamassassin/trunk/spamassassin.install)
  spamassassin/repos/extra-x86_64/spamassassin.service
    (from rev 244454, spamassassin/trunk/spamassassin.service)
Deleted:
  spamassassin/repos/extra-i686/PKGBUILD
  spamassassin/repos/extra-i686/spamassassin.install
  spamassassin/repos/extra-i686/spamassassin.service
  spamassassin/repos/extra-x86_64/PKGBUILD
  spamassassin/repos/extra-x86_64/spamassassin.install
  spamassassin/repos/extra-x86_64/spamassassin.service

----------------------------------------+
 /PKGBUILD                              |  130 +++++++++++++++++++++++++++++++
 /spamassassin.install                  |   64 +++++++++++++++
 /spamassassin.service                  |   24 +++++
 extra-i686/PKGBUILD                    |   62 --------------
 extra-i686/net-dns-1.01-compat.patch   |   14 +++
 extra-i686/spamassassin.install        |   32 -------
 extra-i686/spamassassin.service        |   12 --
 extra-x86_64/PKGBUILD                  |   62 --------------
 extra-x86_64/net-dns-1.01-compat.patch |   14 +++
 extra-x86_64/spamassassin.install      |   32 -------
 extra-x86_64/spamassassin.service      |   12 --
 11 files changed, 246 insertions(+), 212 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-08-20 21:34:26 UTC (rev 244454)
+++ extra-i686/PKGBUILD	2015-08-20 21:35:22 UTC (rev 244455)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <bluewind at xinu.at>
-# Contributor: Dale Blount <dale at archlinux.org>
-# Contributor: Manolis Tzanidakis
-pkgname=spamassassin
-pkgver=3.4.1
-pkgrel=1
-pkgdesc="A mail filter to identify spam."
-arch=('i686' 'x86_64')
-license=('APACHE')
-url="http://spamassassin.apache.org"
-depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl'
-         'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http'
-         'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay')
-makedepends=('razor' 'perl-dbi')
-optdepends=('razor: to identify collaborately-flagged spam')
-backup=('etc/mail/spamassassin/local.cf'
-        'etc/mail/spamassassin/init.pre'
-        'etc/mail/spamassassin/v310.pre'
-        'etc/mail/spamassassin/v312.pre'
-        'etc/mail/spamassassin/v320.pre'
-        'etc/mail/spamassassin/v330.pre')
-install="${pkgname}.install"
-source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
-        'spamassassin.service')
-validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
-md5sums=('76eca1f38c11635d319e62c26d5b034b'
-         'SKIP'
-         '8adce028f25387ac3bc4dba697d209ed')
-
-prepare() {
-  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
-
-  sed -i t/sa_compile.t \
-	  -e 's#^my $temp_binpath = $Config{sitebinexp};#my $temp_binpath = "/bin/site_perl/";#'
-}
-
-build() {
-  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
-
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \
-      CONTACT_ADDRESS=root at localhost ENABLE_SSL=yes PERL_TAINT=no
-  make 
-}
-
-check() {
-  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
-
-  # parallel tests cause lots of failures; disable for now
-  #export HARNESS_OPTIONS="j$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/')"
-
-  make test
-}
-
-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 -o 182 -g 182 -m 755 "$pkgdir/var/lib/spamassassin"
-}

Copied: spamassassin/repos/extra-i686/PKGBUILD (from rev 244454, spamassassin/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-08-20 21:35:22 UTC (rev 244455)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Manolis Tzanidakis
+pkgname=spamassassin
+pkgver=3.4.1
+pkgrel=2
+pkgdesc="A mail filter to identify spam."
+arch=('i686' 'x86_64')
+license=('APACHE')
+url="http://spamassassin.apache.org"
+depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl'
+         'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http'
+         'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay')
+makedepends=('razor' 'perl-dbi')
+optdepends=('razor: to identify collaborately-flagged spam')
+backup=('etc/mail/spamassassin/local.cf'
+        'etc/mail/spamassassin/init.pre'
+        'etc/mail/spamassassin/v310.pre'
+        'etc/mail/spamassassin/v312.pre'
+        'etc/mail/spamassassin/v320.pre'
+        'etc/mail/spamassassin/v330.pre')
+install="${pkgname}.install"
+source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
+        'spamassassin.service' net-dns-1.01-compat.patch)
+validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
+md5sums=('76eca1f38c11635d319e62c26d5b034b'
+         'SKIP'
+         '8adce028f25387ac3bc4dba697d209ed'
+         '63458976671c35f423bd4e8033cfff3a')
+
+prepare() {
+  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+
+  sed -i t/sa_compile.t \
+	  -e 's#^my $temp_binpath = $Config{sitebinexp};#my $temp_binpath = "/bin/site_perl/";#'
+
+  patch -i "$srcdir/net-dns-1.01-compat.patch" -p3
+}
+
+build() {
+  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+
+  # install module in vendor directories.
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \
+      CONTACT_ADDRESS=root at localhost ENABLE_SSL=yes PERL_TAINT=no
+  make 
+}
+
+check() {
+  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+
+  # parallel tests cause lots of failures; disable for now
+  #export HARNESS_OPTIONS="j$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/')"
+
+  make test
+}
+
+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 -o 182 -g 182 -m 755 "$pkgdir/var/lib/spamassassin"
+}

Copied: spamassassin/repos/extra-i686/net-dns-1.01-compat.patch (from rev 244454, spamassassin/trunk/net-dns-1.01-compat.patch)
===================================================================
--- extra-i686/net-dns-1.01-compat.patch	                        (rev 0)
+++ extra-i686/net-dns-1.01-compat.patch	2015-08-20 21:35:22 UTC (rev 244455)
@@ -0,0 +1,14 @@
+https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7223
+
+--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm	2015/07/20 18:23:18	1691991
++++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm	2015/07/20 18:24:48	1691992
+@@ -592,6 +592,9 @@
+   };
+ 
+   if ($packet) {
++    # RD flag needs to be set explicitly since Net::DNS 1.01, Bug 7223	
++    $packet->header->rd(1);
++
+   # my $udp_payload_size = $self->{res}->udppacketsize;
+     my $udp_payload_size = $self->{conf}->{dns_options}->{edns};
+     if ($udp_payload_size && $udp_payload_size > 512) {

Deleted: extra-i686/spamassassin.install
===================================================================
--- extra-i686/spamassassin.install	2015-08-20 21:34:26 UTC (rev 244454)
+++ extra-i686/spamassassin.install	2015-08-20 21:35:22 UTC (rev 244455)
@@ -1,32 +0,0 @@
-setup_user() {
-	getent group spamd  &>/dev/null || groupadd -g 182 spamd  >/dev/null
-	getent passwd spamd &>/dev/null || useradd -u 182 -d /var/lib/spamassassin -g spamd -s /bin/false spamd >/dev/null
-
-	if [[ -d /var/lib/spamassassin ]]; then
-		chown spamd:spamd /var/lib/spamassassin
-	fi
-
-	true
-}
-
-post_install() {
-	echo "You must run 'sa-update' to install spam rules before use."
-	setup_user
-}
-
-post_upgrade() {
-	setup_user
-	if  [ "$(vercmp $2 3.4)" -lt 0 ]; then
-		echo '/var/lib/spamassassin is now owned by the spamd user. spamassassin.service'
-		echo 'will also run under that user. You may need to adjust your setup.'
-	fi
-
-	# Compile rules, if rules have previously been compiled, and it's possible
-	if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]; then
-		echo "Detected compiled rules, running sa-compile..."
-		sa-compile > /dev/null 2>&1
-	fi
-
-	true
-}
-

Copied: spamassassin/repos/extra-i686/spamassassin.install (from rev 244454, spamassassin/trunk/spamassassin.install)
===================================================================
--- extra-i686/spamassassin.install	                        (rev 0)
+++ extra-i686/spamassassin.install	2015-08-20 21:35:22 UTC (rev 244455)
@@ -0,0 +1,32 @@
+setup_user() {
+	getent group spamd  &>/dev/null || groupadd -g 182 spamd  >/dev/null
+	getent passwd spamd &>/dev/null || useradd -u 182 -d /var/lib/spamassassin -g spamd -s /bin/false spamd >/dev/null
+
+	if [[ -d /var/lib/spamassassin ]]; then
+		chown spamd:spamd /var/lib/spamassassin
+	fi
+
+	true
+}
+
+post_install() {
+	echo "You must run 'sa-update' to install spam rules before use."
+	setup_user
+}
+
+post_upgrade() {
+	setup_user
+	if  [ "$(vercmp $2 3.4)" -lt 0 ]; then
+		echo '/var/lib/spamassassin is now owned by the spamd user. spamassassin.service'
+		echo 'will also run under that user. You may need to adjust your setup.'
+	fi
+
+	# Compile rules, if rules have previously been compiled, and it's possible
+	if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]; then
+		echo "Detected compiled rules, running sa-compile..."
+		sa-compile > /dev/null 2>&1
+	fi
+
+	true
+}
+

Deleted: extra-i686/spamassassin.service
===================================================================
--- extra-i686/spamassassin.service	2015-08-20 21:34:26 UTC (rev 244454)
+++ extra-i686/spamassassin.service	2015-08-20 21:35:22 UTC (rev 244455)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Spamassassin daemon
-After=syslog.target network.target
-
-[Service]
-ExecStart=/usr/bin/vendor_perl/spamd -x -u spamd -g spamd
-StandardOutput=null
-StandardError=null
-Restart=always
-
-[Install]
-WantedBy=multi-user.target

Copied: spamassassin/repos/extra-i686/spamassassin.service (from rev 244454, spamassassin/trunk/spamassassin.service)
===================================================================
--- extra-i686/spamassassin.service	                        (rev 0)
+++ extra-i686/spamassassin.service	2015-08-20 21:35:22 UTC (rev 244455)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Spamassassin daemon
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/bin/vendor_perl/spamd -x -u spamd -g spamd
+StandardOutput=null
+StandardError=null
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-08-20 21:34:26 UTC (rev 244454)
+++ extra-x86_64/PKGBUILD	2015-08-20 21:35:22 UTC (rev 244455)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <bluewind at xinu.at>
-# Contributor: Dale Blount <dale at archlinux.org>
-# Contributor: Manolis Tzanidakis
-pkgname=spamassassin
-pkgver=3.4.1
-pkgrel=1
-pkgdesc="A mail filter to identify spam."
-arch=('i686' 'x86_64')
-license=('APACHE')
-url="http://spamassassin.apache.org"
-depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl'
-         'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http'
-         'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay')
-makedepends=('razor' 'perl-dbi')
-optdepends=('razor: to identify collaborately-flagged spam')
-backup=('etc/mail/spamassassin/local.cf'
-        'etc/mail/spamassassin/init.pre'
-        'etc/mail/spamassassin/v310.pre'
-        'etc/mail/spamassassin/v312.pre'
-        'etc/mail/spamassassin/v320.pre'
-        'etc/mail/spamassassin/v330.pre')
-install="${pkgname}.install"
-source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
-        'spamassassin.service')
-validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
-md5sums=('76eca1f38c11635d319e62c26d5b034b'
-         'SKIP'
-         '8adce028f25387ac3bc4dba697d209ed')
-
-prepare() {
-  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
-
-  sed -i t/sa_compile.t \
-	  -e 's#^my $temp_binpath = $Config{sitebinexp};#my $temp_binpath = "/bin/site_perl/";#'
-}
-
-build() {
-  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
-
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \
-      CONTACT_ADDRESS=root at localhost ENABLE_SSL=yes PERL_TAINT=no
-  make 
-}
-
-check() {
-  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
-
-  # parallel tests cause lots of failures; disable for now
-  #export HARNESS_OPTIONS="j$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/')"
-
-  make test
-}
-
-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 -o 182 -g 182 -m 755 "$pkgdir/var/lib/spamassassin"
-}

Copied: spamassassin/repos/extra-x86_64/PKGBUILD (from rev 244454, spamassassin/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-08-20 21:35:22 UTC (rev 244455)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Manolis Tzanidakis
+pkgname=spamassassin
+pkgver=3.4.1
+pkgrel=2
+pkgdesc="A mail filter to identify spam."
+arch=('i686' 'x86_64')
+license=('APACHE')
+url="http://spamassassin.apache.org"
+depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl'
+         'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http'
+         'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay')
+makedepends=('razor' 'perl-dbi')
+optdepends=('razor: to identify collaborately-flagged spam')
+backup=('etc/mail/spamassassin/local.cf'
+        'etc/mail/spamassassin/init.pre'
+        'etc/mail/spamassassin/v310.pre'
+        'etc/mail/spamassassin/v312.pre'
+        'etc/mail/spamassassin/v320.pre'
+        'etc/mail/spamassassin/v330.pre')
+install="${pkgname}.install"
+source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
+        'spamassassin.service' net-dns-1.01-compat.patch)
+validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
+md5sums=('76eca1f38c11635d319e62c26d5b034b'
+         'SKIP'
+         '8adce028f25387ac3bc4dba697d209ed'
+         '63458976671c35f423bd4e8033cfff3a')
+
+prepare() {
+  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+
+  sed -i t/sa_compile.t \
+	  -e 's#^my $temp_binpath = $Config{sitebinexp};#my $temp_binpath = "/bin/site_perl/";#'
+
+  patch -i "$srcdir/net-dns-1.01-compat.patch" -p3
+}
+
+build() {
+  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+
+  # install module in vendor directories.
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \
+      CONTACT_ADDRESS=root at localhost ENABLE_SSL=yes PERL_TAINT=no
+  make 
+}
+
+check() {
+  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+
+  # parallel tests cause lots of failures; disable for now
+  #export HARNESS_OPTIONS="j$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/')"
+
+  make test
+}
+
+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 -o 182 -g 182 -m 755 "$pkgdir/var/lib/spamassassin"
+}

Copied: spamassassin/repos/extra-x86_64/net-dns-1.01-compat.patch (from rev 244454, spamassassin/trunk/net-dns-1.01-compat.patch)
===================================================================
--- extra-x86_64/net-dns-1.01-compat.patch	                        (rev 0)
+++ extra-x86_64/net-dns-1.01-compat.patch	2015-08-20 21:35:22 UTC (rev 244455)
@@ -0,0 +1,14 @@
+https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7223
+
+--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm	2015/07/20 18:23:18	1691991
++++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm	2015/07/20 18:24:48	1691992
+@@ -592,6 +592,9 @@
+   };
+ 
+   if ($packet) {
++    # RD flag needs to be set explicitly since Net::DNS 1.01, Bug 7223	
++    $packet->header->rd(1);
++
+   # my $udp_payload_size = $self->{res}->udppacketsize;
+     my $udp_payload_size = $self->{conf}->{dns_options}->{edns};
+     if ($udp_payload_size && $udp_payload_size > 512) {

Deleted: extra-x86_64/spamassassin.install
===================================================================
--- extra-x86_64/spamassassin.install	2015-08-20 21:34:26 UTC (rev 244454)
+++ extra-x86_64/spamassassin.install	2015-08-20 21:35:22 UTC (rev 244455)
@@ -1,32 +0,0 @@
-setup_user() {
-	getent group spamd  &>/dev/null || groupadd -g 182 spamd  >/dev/null
-	getent passwd spamd &>/dev/null || useradd -u 182 -d /var/lib/spamassassin -g spamd -s /bin/false spamd >/dev/null
-
-	if [[ -d /var/lib/spamassassin ]]; then
-		chown spamd:spamd /var/lib/spamassassin
-	fi
-
-	true
-}
-
-post_install() {
-	echo "You must run 'sa-update' to install spam rules before use."
-	setup_user
-}
-
-post_upgrade() {
-	setup_user
-	if  [ "$(vercmp $2 3.4)" -lt 0 ]; then
-		echo '/var/lib/spamassassin is now owned by the spamd user. spamassassin.service'
-		echo 'will also run under that user. You may need to adjust your setup.'
-	fi
-
-	# Compile rules, if rules have previously been compiled, and it's possible
-	if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]; then
-		echo "Detected compiled rules, running sa-compile..."
-		sa-compile > /dev/null 2>&1
-	fi
-
-	true
-}
-

Copied: spamassassin/repos/extra-x86_64/spamassassin.install (from rev 244454, spamassassin/trunk/spamassassin.install)
===================================================================
--- extra-x86_64/spamassassin.install	                        (rev 0)
+++ extra-x86_64/spamassassin.install	2015-08-20 21:35:22 UTC (rev 244455)
@@ -0,0 +1,32 @@
+setup_user() {
+	getent group spamd  &>/dev/null || groupadd -g 182 spamd  >/dev/null
+	getent passwd spamd &>/dev/null || useradd -u 182 -d /var/lib/spamassassin -g spamd -s /bin/false spamd >/dev/null
+
+	if [[ -d /var/lib/spamassassin ]]; then
+		chown spamd:spamd /var/lib/spamassassin
+	fi
+
+	true
+}
+
+post_install() {
+	echo "You must run 'sa-update' to install spam rules before use."
+	setup_user
+}
+
+post_upgrade() {
+	setup_user
+	if  [ "$(vercmp $2 3.4)" -lt 0 ]; then
+		echo '/var/lib/spamassassin is now owned by the spamd user. spamassassin.service'
+		echo 'will also run under that user. You may need to adjust your setup.'
+	fi
+
+	# Compile rules, if rules have previously been compiled, and it's possible
+	if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]; then
+		echo "Detected compiled rules, running sa-compile..."
+		sa-compile > /dev/null 2>&1
+	fi
+
+	true
+}
+

Deleted: extra-x86_64/spamassassin.service
===================================================================
--- extra-x86_64/spamassassin.service	2015-08-20 21:34:26 UTC (rev 244454)
+++ extra-x86_64/spamassassin.service	2015-08-20 21:35:22 UTC (rev 244455)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Spamassassin daemon
-After=syslog.target network.target
-
-[Service]
-ExecStart=/usr/bin/vendor_perl/spamd -x -u spamd -g spamd
-StandardOutput=null
-StandardError=null
-Restart=always
-
-[Install]
-WantedBy=multi-user.target

Copied: spamassassin/repos/extra-x86_64/spamassassin.service (from rev 244454, spamassassin/trunk/spamassassin.service)
===================================================================
--- extra-x86_64/spamassassin.service	                        (rev 0)
+++ extra-x86_64/spamassassin.service	2015-08-20 21:35:22 UTC (rev 244455)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Spamassassin daemon
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/bin/vendor_perl/spamd -x -u spamd -g spamd
+StandardOutput=null
+StandardError=null
+Restart=always
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list