gentoo resync : 07.05.2019

4 files changed, 2 insertions, 97 deletions

diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index c1aee006234b..f0b522471cd3 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,14 +1,12 @@
 AUX opendkim-2.10.3-gnutls-3.4.patch 1555 BLAKE2B 17a74a6487a514b967d35e77a0a6bb22733648b561b8eac31d95eed16b0faef82a047a1444626bd560b27bc8ed67dd17f9cadc82449d169fdfb6ed45b50644b1 SHA512 f159f7ef3dffe876ccb01cff5b8fbb599357765ff028ef1db28b7f3dba5e13579c7e9bac305fc36fc324fdad0697224f8caa66d27dd3a1085b5fca133365f4ef
-AUX opendkim-2.10.3-openrc.patch 10203 BLAKE2B e365ba4c0782dc03d8b5a32413b11b691fafe6859123f8da7daf882540b644069e1792a2b91743e8b00c85af2ba63c9556a4c7f90de4103ea712fe2a096e2b44 SHA512 97342811b4ce4957c4c375cda0edffc056a301348ee4e5dcf94d7425e69f4a91c1897a2e2b7219791fafa6eb731f8e3308aac2f3e1280738eb1d2e5b7d563e56
+AUX opendkim-2.10.3-openrc.patch 10203 BLAKE2B e825ae1258c82607eb6d10d5acc3246908868fd3d5703ba0044f93bdf51e5a95dbc39a1e3060855073d14c31da5cb3985afe81c526f592f56463bf698ce4c317 SHA512 34499044cb768d54c0c1653a62fb34c9815990d815c98ccfba22afc1ad9c837c6689ff17a3d1da1221d698c91ce9d77a1964d99055527dfd797f8d428e1db615
 AUX opendkim-2.10.3-openssl-1.1.1.patch 5889 BLAKE2B 288900a8cba7b4ccf376240485234a0d01720b96a874ac73a7b2f5f5a63f00a67f5a940d5657a702fc7c058989764fe52d17e6625ce96c7cf390cee6c9a29ed9 SHA512 63d0b27e4cde4aadc72320f3ea6b2ea3e45357c019b4fe0e473eb6010c0c6ed3e4ec9541448325848cdd52955943d2ba2527f9819f5e10d5953f085ba4663f85
 AUX opendkim-2.10.3-openssl-1.1.1.patch.r2 5966 BLAKE2B c0dcb757f1195e8a3fc055f5162b805bf5bb2fe7a6a7c24317cfc1f0ed05491803f2fefbc22e96409a339f9741cac5344044a1efadec1f3e3c87084b2c221ed6 SHA512 e532d0411bc6cf1f55bf2de1bad54dc29d19558b2c4ea27aa72f17738688d48f111c3662e88064169a78347144eae289b362bfa4849ab4d3b06ff97d439cce47
 AUX opendkim-r3.service 540 BLAKE2B ff968ae27fc0333dd2938e2990306df213b58debfbbce2ba4b267f4f17ea657fe55697e987b252d0f019ca5b0725d2f92a22ae583a24e273a39d905aed0d5304 SHA512 11b6efb1ab8bde75ce494cffc84ba4fa2f7ef8dc7f00b96172a43c5e35b14cea0e1cd712eb9a6caca8005e2c9f2e464de2f2b7ab1502394708224b116f195235
 AUX opendkim.confd 742 BLAKE2B 4061bd542c3993b1a1e4a24e7f51992b51380403490a5d0e011e5f0146f9785ebb521fcf5cb2f7731e0037d198a349b44866dd78d73e776112f3364d26368244 SHA512 db103c23d03bcc5919e795cd0bb6e9cfa6a0b8b65c55476fce8aaedfa539a707f0e2b7e10fc493e8a18ef9743b1f80bb97c1b3aaa8b6dc51646898ffdc0fff65
 AUX opendkim.init.r5 2200 BLAKE2B d617879b128d5de97cc7239865400ea0d12e438c5f13ac97fc663b33b3ce24a4fb8798d287cb4e7a932e2005226c38b4a0a83a4a10d6e047103a19102f625790 SHA512 220ba494b83189aceba304534d1538cc38414c82a522a9fa8211f9277bf22ae8787581b3913e2a267b766ad33bfa4ee005780ee744633f2c765d15696f5bd0cb
-AUX opendkim.init.r6 2295 BLAKE2B 3ce426713b88e714e3f25a4d33ce1f6602ef2ae7546bfe1802d9615202ecd84295b7a469836535a6ecad1c191604e96ee336ec5b6a988dd473fc312cdce43f5c SHA512 8267610aa10bf2cf1c72baf6fd010cdfcaa8f11ffd10ab42e781bfb4e0e992a758d3f198b4caf2a8f1d66672d5ce797da16f1518abed1b3af31bb7ed61c887ea
 AUX opendkim.service 439 BLAKE2B 203f8d5a55f9f08069eec0bac8b9af743e3c0414a927c47ae67533a94c67371aa12963c347361056939cc18492612f067102eca09166de6aa83d1b0541d4a8e6 SHA512 308edc70fdb0bd57b424e739412217fd8017b017e9b27bc0954dec55294d10d8b7713f6f191836b94aa49bf578bfb391dca748af0c8d9b72e14ebe1eae21e834
 AUX opendkim.service.conf 60 BLAKE2B 797a3947c9c984378955701252cc9d956c8398f1bba7696e7d5c052dd8103355dbf147ac05ae5b7f372867f2b330aaaf160e83709e440a9fc942e9069dbe7c2e SHA512 635e474464f81abe8444030b3cdc6e747298fc463bd02e4292e914ad622761f354b92921cd380387c8e9272435e1660de1a1cf8dbe34ded870e728ecc9e00246
-AUX opendkim.service.r4 629 BLAKE2B 9d2fe74576a4085b1c2f4c74c319e490d332d34cb32206bf6ccbd8001600c63cc6fdb193900ca70f5d83e77694da126f15c86a6391d6835f843bd1c3a1dd413c SHA512 a41dbb8e14a4fae7f314935f9f6aedb66efe2ad6ca95eefdf92244ce0c577b8b18fe90266bd38437d6a033040195db46b02c595f958d6b59850974ccc98a9dda
 DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
 EBUILD opendkim-2.10.3-r13.ebuild 7406 BLAKE2B faf1df82130ec9edeaff68c11b5dc2619b206af3001d5142083189c58bb6e73cac66785cc0ed983a0ddb194dd0a9cfb211e5f19ea3fb4333e35254fad4756161 SHA512 cd67d66da191109f40089bcbc0c9d959ce762003d1d773febb30bb3ee44f5e211eb2637cc40481d742a5ebfd626a0bf61a1a5f60ee87985bdce2cab00048b9fc
 EBUILD opendkim-2.10.3-r8.ebuild 7233 BLAKE2B 81c780d136560365a2a4eebf31901448cadec91616388ab9851c0bbd24dfff965c517cec5af73fd3adc4507708aba1c24d13d8905f7e5499c09ef4e6751171ee SHA512 385e2da6c53900a98f35a9839007f5dd7caa65fb9138599e1ced1639759fbb674223ecd2ccf8bddd4341334934440476112b07f280efabf345af8e0b77098815
diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch b/mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch
index 9b645ba0f0ce..b4700e300abc 100644
--- a/mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch
+++ b/mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch
@@ -279,7 +279,7 @@ index 735b924b..b70bfb46 100644
  Socket                  inet:8891@localhost
  
 +# To use a local socket instead, specify a path here. The "standard"
-+# location is under @runstatedir@/opendkim, and it's best to agree
++# location is under @RUNSTATEDIR@/opendkim, and it's best to agree
 +# on that directory so that various init systems can configure its
 +# permissions and ownership automatically.
 +#Socket                 local:@RUNSTATEDIR@/opendkim/opendkim.sock
diff --git a/mail-filter/opendkim/files/opendkim.init.r6 b/mail-filter/opendkim/files/opendkim.init.r6
deleted file mode 100644
index 95aa971fd88e..000000000000
--- a/mail-filter/opendkim/files/opendkim.init.r6
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-CONFFILE="/etc/opendkim/${RC_SVCNAME}.conf"
-required_files="${CONFFILE}"
-
-command="/usr/sbin/opendkim"
-pidfile="/run/${RC_SVCNAME}.pid"
-command_args="-P ${pidfile} -x ${CONFFILE} -p ${OPENDKIM_SOCKET}"
-
-depend() {
-	use dns logger net
-	before mta
-}
-
-check_cfg() {
-	#
-	# The opendkim.conf man page says,
-	#
-	#   For parameters that are Boolean in nature, only the first byte
-	#   of the value is processed... For negative values, the following
-	#   are accepted: "F", "f", "N", "n", "0".'
-	#
-	if grep --quiet '^[[:space:]]*Background[[:space:]]\+[FfNn0]' \
-			"${CONFFILE}"; then
-		eerror "${RC_SVCNAME} cannot run in the foreground!"
-		return 1
-	fi
-	if ! ${command} -n ${command_args}; then
-		eerror "Configuration check failed"
-		return 1
-	fi
-}
-
-start_pre() {
-	# If this isn't a restart, make sure that the user's config isn't
-	# busted before we try to start the daemon (this will produce
-	# better error messages than if we just try to start it blindly).
-	#
-	# If, on the other hand, this *is* a restart, then the stop_pre
-	# action will have ensured that the config is usable and we don't
-	# need to do that again.
-	if [ "${RC_CMD}" != "restart" ]; then
-		check_cfg || return $?
-	fi
-
-	if [ -S "${OPENDKIM_SOCKET}" ] && ! fuser -s "${OPENDKIM_SOCKET}"; then
-		# Remove stalled Unix socket if no other process is
-		# using it
-		if ! rm "${UNIX_SOCKET}"; then
-			eerror "failed to remove stale unix socket ${OPENDKIM_SOCKET}"
-			return 2
-		fi
-	fi
-
-	# This relies on the "local:" prefix being there, but the conf.d
-	# file explicitly states that it's not optional (contrary to what
-	# the opendkim(8) man page says).
-	if [ "${OPENDKIM_SOCKET#local:}" != "${OPENDKIM_SOCKET}" ]; then
-		# The socket begins with "local:"
-		OPENDKIM_SOCKET_PATH="${OPENDKIM_SOCKET#local:}"
-		OPENDKIM_SOCKET_DIR="${OPENDKIM_SOCKET_PATH%/*}"
-
-		# This is dangerous, but there's a big warning about it
-		# in the conf.d file.
-		checkpath --directory --owner opendkim "${OPENDKIM_SOCKET_DIR}"
-	fi
-}
-
-stop_pre() {
-	# If this is a restart, check to make sure the user's config
-	# isn't busted before we stop the running daemon.
-	if [ "${RC_CMD}" = "restart" ]; then
-		check_cfg || return $?
-	fi
-}
diff --git a/mail-filter/opendkim/files/opendkim.service.r4 b/mail-filter/opendkim/files/opendkim.service.r4
deleted file mode 100644
index 8c366007c009..000000000000
--- a/mail-filter/opendkim/files/opendkim.service.r4
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=DomainKeys Identified Mail (DKIM) Milter
-Documentation=man:opendkim(8) man:opendkim.conf(5) man:opendkim-genkey(8) man:opendkim-genzone(8) man:opendkim-testadsp(8) man:opendkim-testkey http://www.opendkim.org/docs.html
-After=network.target nss-lookup.target syslog.target
-
-[Service]
-ExecStartPre=/usr/sbin/opendkim -n -f -x /etc/opendkim/opendkim.conf -p $OPENDKIM_SOCKET
-ExecStart=/usr/sbin/opendkim -f -x /etc/opendkim/opendkim.conf -p $OPENDKIM_SOCKET
-ExecReload=/bin/kill -USR1 $MAINPID
-RuntimeDirectory=opendkim
-RuntimeDirectoryMode=0750
-User=opendkim
-Group=opendkim
-
-[Install]
-WantedBy=multi-user.target