gentoo resync : 05.04.2019

3 files changed, 45 insertions, 3 deletions

diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 34e5da0e7447..c99b9aaf1372 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -7,8 +7,9 @@ AUX spamassassin-3.4.2-bug_7631.patch 2022 BLAKE2B 33b67b585fdb2ce82b6e648564637
 AUX spamassassin-3.4.2-bug_7632.patch 673 BLAKE2B a819b0817efb745f1dc9d971fa476d9da355b72df41ffc58a7a505a5a2c1588ecee3e1dbe79c3a0d03ba04a6fc2e63bc018b49240da1417bb2a967925ed85e84 SHA512 adf9f78a60a95d16cf918e048c178986ec5543fb80a350d9419800b2bcc8fbcc8669967b77d9a85dfce7b67528fe9d816f5ca9a435444197f9ac1aa83d92fec3
 AUX spamassassin.service-r4 182 BLAKE2B c5813612e78602d6e67b527f07a8a38171422a638bf419135b34f950a036e899ee6d6a129413ab52ca737f18258265cad971a0b84057561b7012fbc390efd7e9 SHA512 35da6ed8baa1cfc13546b409ed65d18334410ee497f9609c89cd4993dc8084ed479ddc7658e72a52a9b79f1a73d4efba42148b7238678c17a2965f9ff6a608e9
 AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365adf515b85bf0d9912d240105579747f3834b7f72402a31b5be9b8ed0faf2545ae0a4ed46ebd3c7a90962f764fb5e8a SHA512 55b93ce1636505beabba21cd208541750ef448e952658b65d6e1447f92cec3a35e3d489d014a0229765117168cc03b4675652709f7ed9973be8fba84c10786dd
+AUX update-spamassassin-rules-r1.cron 1557 BLAKE2B f159c1dd8f00771c5232cfb653403621aad010100535cc1b3ef4b2e18592cad94762bb2e689a904befa319fe40ac2cbed8ab7592ca506134b71f5d5d9d43ed30 SHA512 cb2902fcdd37465b789abd4a45196787a90b90e90678b20a264799587134d992f7daa1a5bdd06261bf40dacb2c164a1fbc3a10986b6265f04e57ee42a3896bfe
 AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc05a3fc4724cfed74175d35d276e8ea257ee93abce1d56be8c2f957621c039a2ba7e25a368f339b9b80f8dd9865944320b SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5
 DIST Mail-SpamAssassin-3.4.2.tar.bz2 2700016 BLAKE2B a29b4cfce5e578c07ec54b2224191917dc45bcefff071f674c572fc905f1d6324827bcc21c338546bdea11140fc20474a16314218e2fd4fa685965b0e0078df8 SHA512 fe3d9d1d7b9fed3063549afd071066729f1f4d998be91ded1e5afc29bb37c7a298dc5f8f99a282b75435d317b5b5072a81393134ccfe059a73d953e26a9c3885
 EBUILD spamassassin-3.4.2-r2.ebuild 7607 BLAKE2B c1232716b004a956480f5bc87f4ff1266471424302f17836bb34922e81d2815a97c12e4a204c0444b89180c0254dcd9b7f8e8f093d366c55274da9bf2836c97b SHA512 2b3bbad6b186b9af4dc17a5c664120e6a413fbf885f6ed91530653c88b2a9b2046dc0563a5f3dbe81492abe3dab4b55235e9b5c7caee5eb201cfdfd9c0ed41ed
-EBUILD spamassassin-3.4.2-r5.ebuild 8686 BLAKE2B 64d562d875653d12b98267481c21487d6a8405cdad169c8f264f2595927512710c5d50faf282d97cf89360c4ee3cd45aad5f875932685b4bb05469c04e5319b5 SHA512 59c195e05533d8e6280e606d4f7a292739f8fccca33b7345ce3ac4c754d026cae25d63779d359da735b3dc10b75b4377098ee0be9b15e6c40ba1512ce1341809
+EBUILD spamassassin-3.4.2-r6.ebuild 8696 BLAKE2B 15119b4bea3d9df6d94274f9f977535abb032222eeb08cbc1bf33c6ac45baa931dd1bf13315469ffdf397bf567f56546039323409be321f86f3675bfb5ff3a85 SHA512 6dddf4ebdef75a6d1b19464c53d750d5060ad6d0a1e40f80dd13fac495fccc7a006b632a47a32993281c2be021bb343ed0e17b5928818c0e01307ac893a91f66
 MISC metadata.xml 807 BLAKE2B 14bf38e1888040ece6a48e7a8234917d5f9ae8d699995a0414520c0d262b91518c233ee3d3b1d13d7b5068fea8ec612bfee2a84ce825748e471b6ba6c25728b5 SHA512 2cc4534cdb5ed62612419a99a67e9e8e1867ba73a2daf957e3df8e7f2fd0bd058b7c9bb31fdfadb56d4001ce89e66d8f9da89d620e482d8f13502f288eb4136b
diff --git a/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron b/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron
new file mode 100644
index 000000000000..7c6990b847cf
--- /dev/null
+++ b/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron
@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+# Update SpamAssassin rules and reload daemons that use them.
+#
+
+# First, redirect stdout to /dev/null.
+exec 1>/dev/null
+
+# Try to update the rules.
+sa-update
+
+# Exit code 0: all new updates were installed.
+# Exit code 1: we were already up-to-date.
+# Exit code 3: some updates were installed, but some weren't.
+# Any other exit code indicates failure.
+if (( $? == 0 || $? == 3 )); then
+    # Compilation spits out its progress onto stderr.
+    sa-compile 2>/dev/null
+
+    # Do you run spamd or amavisd? Both daemons need to be reloaded
+    # in order to pick up the newly-updated rules.
+    if command -v rc-service 2>/dev/null; then
+        # OpenRC is installed. These "status" checks should succeed
+        # only when the daemon is running under OpenRC. We redirect
+        # stderr to hide the lecture that OpenRC gives you if you
+        # try this on a system running systemd.
+        rc-service spamd status 2>/dev/null && rc-service spamd reload
+        rc-service amavisd status 2>/dev/null && rc-service amavisd reload
+    fi
+
+    if command -v systemctl 2>/dev/null; then
+        # The systemctl (systemd) executable is installed, so try to
+        # use it to restart spamd and amavisd. These are safe to run
+        # if systemd is installed but not in use.  The is-active
+	# check is to keep systemctl from outputting warnings if
+	# amavisd is not installed (bug #681872).
+        systemctl try-restart spamassassin
+        systemctl is-active --quiet amavisd \
+            && systemctl try-reload-or-restart amavisd
+    fi
+fi
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r5.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild
index 2162b9ce2b61..8ea2c2e6acee 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.2-r5.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
 
 # The Makefile.PL script checks for dependencies, but only fails if a
@@ -196,7 +196,7 @@ src_install () {
 	if use cron; then
 		# Install the cron job if they want it.
 		exeinto /etc/cron.daily
-		newexe "${FILESDIR}/update-spamassassin-rules.cron" \
+		newexe "${FILESDIR}/update-spamassassin-rules-r1.cron" \
 			   update-spamassassin-rules
 	fi