[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/files/

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/files/

[Michael Orlitzky]

commit:     4596f450869040535ba44f83208a71c3377f975b
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Apr 22 07:39:37 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 01:21:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4596f450

mail-filter/opendkim: remove unused files

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/opendkim/files/opendkim-r1.service | 15 -------
 mail-filter/opendkim/files/opendkim.init.r3    | 55 --------------------------
 2 files changed, 70 deletions(-)

diff --git a/mail-filter/opendkim/files/opendkim-r1.service b/mail-filter/opendkim/files/opendkim-r1.service
deleted file mode 100644
index f2e937a6bf1..00000000000
--- a/mail-filter/opendkim/files/opendkim-r1.service
+++ /dev/null
@@ -1,15 +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]
-ExecStart=/usr/sbin/opendkim -f -x /etc/opendkim/opendkim.conf
-ExecReload=/bin/kill -USR1 $MAINPID
-RuntimeDirectory=opendkim
-RuntimeDirectoryMode=0750
-User=milter
-Group=milter
-
-[Install]
-WantedBy=multi-user.target

diff --git a/mail-filter/opendkim/files/opendkim.init.r3 b/mail-filter/opendkim/files/opendkim.init.r3
deleted file mode 100644
index bb8ac96f057..00000000000
--- a/mail-filter/opendkim/files/opendkim.init.r3
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CONFFILE=/etc/opendkim/${SVCNAME}.conf
-
-depend() {
-	use dns logger net
-	before mta
-}
-
-check_cfg() {
-
-	PIDFILE=$(sed -ne 's/^[[:space:]]*PidFile[[:space:]]\+//p' "${CONFFILE}")
-	local PIDDIR="${PIDFILE%/*}"
-	if [ ! -d  "${PIDDIR}" ] ; then
-		checkpath -q -d -o milter:milter -m 0755 "${PIDDIR}" || return 1
-	fi
-	if [ ! -f "${CONFFILE}" ] ; then
-		eerror "Configuration file ${CONFFILE} is missing"
-		return 1
-	fi
-	if [ -z "${PIDFILE}" ] ; then
-		eerror "Configuration file needs PidFile setting - recommend adding 'PidFile /var/run/opendkim/${SVCNAME}.pid' to ${CONFFILE}"
-		return 1
-	fi
-
-	if egrep -q '^[[:space:]]*Background[[:space:]]+no' "${CONFFILE}" ; then
-		eerror "${SVCNAME} service cannot run with Background key set to yes!"
-		return 1
-	fi
-}
-
-start() {
-	check_cfg || return 1
-	
-	# Remove stalled Unix socket if no other process is using it
-	local UNIX_SOCKET=$(sed -ne 's/^[[:space:]]*Socket[[:space:]]\+\(unix\|local\)://p' "${CONFFILE}")
-
-	if [ -S "${UNIX_SOCKET}" ] && ! fuser -s "${UNIX_SOCKET}"; then
-		rm "${UNIX_SOCKET}"
-	fi
-
-	ebegin "Starting OpenDKIM"
-	start-stop-daemon --start --pidfile "${PIDFILE}" \
-		--exec /usr/sbin/opendkim -- -x "${CONFFILE}"
-	eend $?
-}
-
-stop() {
-	check_cfg || return 1
-	ebegin "Stopping OpenDKIM"
-	start-stop-daemon --stop --pidfile "${PIDFILE}"
-	eend $?
-}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/files/

[Michael Orlitzky]

commit:     23d19d3e32cb1033301470afbbb80d89e9139a20
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon May  6 15:33:31 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon May  6 15:45:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d19d3e

mail-filter/opendkim: fix @runstatedir@ -> @RUNSTATEDIR@ in a patch.

Bug: https://bugs.gentoo.org/684956
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9b645ba0f0c..b4700e300ab 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

[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendkim/files/

[Michael Orlitzky]

commit:     200f7eb67c6ba3c6fedfa8b2ca73bbfd75ce5f76
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun May  5 12:24:34 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon May  6 15:46:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=200f7eb6

mail-filter/opendkim: remove unused files

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/opendkim/files/opendkim.init.r6    | 77 --------------------------
 mail-filter/opendkim/files/opendkim.service.r4 | 16 ------
 2 files changed, 93 deletions(-)

diff --git a/mail-filter/opendkim/files/opendkim.init.r6 b/mail-filter/opendkim/files/opendkim.init.r6
deleted file mode 100644
index 95aa971fd88..00000000000
--- 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 8c366007c00..00000000000
--- 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