[gentoo-commits] gentoo-x86 commit in mail-filter/dk-milter/files: dk-filter.init dk-filter.conf digest-dk-milter-0.6.0 gentoo.config.m4 digest-dk-milter-0.4.1 gentxt.sh site.config.m4 dk-milter-0.4.1-queueID.patch

[Alin Nastac (mrness)]

mrness      07/10/12 20:31:23

  Modified:             dk-filter.init dk-filter.conf
  Added:                digest-dk-milter-0.6.0 gentoo.config.m4
  Removed:              digest-dk-milter-0.4.1 gentxt.sh site.config.m4
                        dk-milter-0.4.1-queueID.patch
  Log:
  Redesign the ebuild taking dkim-milter as model (#178501). Add myself as maintainer. Add ~amd64 keyword.
  (Portage version: 2.1.3.9)

Revision  Changes    Path
1.4                  mail-filter/dk-milter/files/dk-filter.init

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dk-milter/files/dk-filter.init?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dk-milter/files/dk-filter.init?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dk-milter/files/dk-filter.init?r1=1.3&r2=1.4

Index: dk-filter.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/files/dk-filter.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dk-filter.init	20 Jul 2006 01:27:05 -0000	1.3
+++ dk-filter.init	12 Oct 2007 20:31:23 -0000	1.4
@@ -1,99 +1,47 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/files/dk-filter.init,v 1.3 2006/07/20 01:27:05 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/files/dk-filter.init,v 1.4 2007/10/12 20:31:23 mrness Exp $
 
 depend() {
-	# need net
 	use dns logger net
 }
-warn_msg() {
-	echo
-	ewarn "$1 parameter is not set!"
-	ewarn "dk-filter starts with"
-	ewarn "$1=${!1}"
-	ewarn "please set it in /etc/conf.d/dk-filter"
-	echo
-}
 
-die_msg() {
-	echo
-	eerror "please set paramter $1 in"
-	eerror "/etc/conf.d/dk-filter then start again"
-	echo
-}
+PIDFILE="/var/run/dk-filter/${SVCNAME}.pid"
 
 check_cfg() {
 
-	if [[ ! -f /etc/conf.d/dk-filter ]] ; then
-		eerror "/etc/conf.d/dk-filter is missing"
-		return 1
-	fi
-
-	source /etc/conf.d/dk-filter || {
-		eerror "Prolem sourcing /etc/conf.d/dk-filter"
-		eerror "Please correct them then start dk-filter again"
-		return 1
-	}
-
-	if [[ -z "${DK_FILTER_OPTS}" ]] ; then
-		die_msg DK_FILTER_OPTS
-		return 1
-	fi
-
-	if [[ -z "${SELECTOR}" ]] ; then
-		die_msg SELECTOR
+	if [ -z "${DAEMON_USER}" ] ; then
+		eerror "DAEMON_USER is unset"
 		return 1
 	fi
 
-	if [[ -z "${KEYPATH}" ]] ; then
-		die_msg KEYPATH
+	SOCKET_TYPE=${SOCKET_SPEC%%:*}
+	SOCKET_ADDRESS=${SOCKET_SPEC#*:}
+	if [ -z "${SOCKET_TYPE}" -o -z "${SOCKET_ADDRESS}" ]; then
+		eerror "SOCKET_SPEC is invalid"
 		return 1
 	fi
 
-	if [[ ! -f "${KEYPATH}" ]] ; then
-		echo
-		eerror "run gentxt.sh to generate a private key first"
-		eerror "then set KEYPATH in /etc/conf.d/dk-filter to"
-		eerror "the location of your private key"
-		echo
-		return 1
-	fi
-
-	if [[ -z "${SOCKETSPEC}" ]] ; then
-		SOCKETSPEC="inet:8025@localhost"
-		warn_msg SOCKETSPEC
-	fi
-
-	if [[ -z "${DOMAIN}" ]] ; then
-		DOMAIN=$(domainname)
-		warn_msg DOMAIN
+	if [[ " ${ADDITIONAL_OPTS} " == *" -"[fpP]" "* ]]; then
+			eerror "-f, -p or -P are not allowed in ADDITIONAL_OPTS"
+			return 1
 	fi
-
-	if [[ -z "${CANON}" ]] ; then
-		CANON="simple"
-		warn_msg CANON
-	fi
-
-	if [[ -z "${CANON}" ]] ; then
-		USER="milter"
-		warn_msg USER
-	fi
-
-	source /etc/conf.d/dk-filter
 }
 
 start() {
+	local SOCKET_TYPE SOCKET_ADDRESS
 	check_cfg || return 1
-	einfo "DK_FILTER_OPTS: $DK_FILTER_OPTS"
-	ebegin "Starting DomainKeys Filter"
-	start-stop-daemon --start --quiet --background \
-		--exec /usr/bin/dk-filter -- ${DK_FILTER_OPTS}
+	
+	ebegin "Starting DomainKeys filter"
+	start-stop-daemon --start --pidfile "${PIDFILE}" \
+		--exec /usr/bin/dk-filter -- -u "${DAEMON_USER}" -p "${SOCKET_SPEC}" -P "${PIDFILE}" ${ADDITIONAL_OPTS} && \
+		[ "${SOCKET_TYPE}" != "local" -a "${SOCKET_TYPE}" != "unix" ] || chmod a+rwx "${SOCKET_ADDRESS}"
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping DomainKeys Filter"
-	start-stop-daemon --stop --quiet --name dk-filter
+	ebegin "Stopping DomainKeys filter"
+	start-stop-daemon --stop --pidfile "${PIDFILE}"
 	eend $?
 }



1.4                  mail-filter/dk-milter/files/dk-filter.conf

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dk-milter/files/dk-filter.conf?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dk-milter/files/dk-filter.conf?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dk-milter/files/dk-filter.conf?r1=1.3&r2=1.4

Index: dk-filter.conf
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/files/dk-filter.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dk-filter.conf	18 Jul 2006 00:55:39 -0000	1.3
+++ dk-filter.conf	12 Oct 2007 20:31:23 -0000	1.4
@@ -1,10 +1,7 @@
-# Additional options for the Domain Key Milter
-# see dk-filter(8) for more information.
-DK_FILTER_OPTS=""
-SOCKETSPEC="inet:8025@localhost"
-DOMAIN="example.com"
-SELECTOR="domainkey"
-KEYPATH="/etc/mail/dk-filter/$SELECTOR.private"
-USER="milter"
-CANON="nofws"
-DK_FILTER_OPTS="-u milter -l -p $SOCKETSPEC -c $CANON -d $DOMAIN -s $KEYPATH -S $SELECTOR"
+# dk-filter parameters; following ones are mandatory
+DAEMON_USER="milter"
+SOCKET_SPEC="local:/var/run/dk-filter/dk-filter.sock"
+
+# Additional options for the Domain Key Milter see dk-filter(8) for more information.
+ADDITIONAL_OPTS="-l -b v \
+	-C badsignature=reject,dnserror=tempfail,internal=tempfail,nosignature=accept,signaturemissing=reject"



1.1                  mail-filter/dk-milter/files/digest-dk-milter-0.6.0

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dk-milter/files/digest-dk-milter-0.6.0?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dk-milter/files/digest-dk-milter-0.6.0?rev=1.1&content-type=text/plain

Index: digest-dk-milter-0.6.0
===================================================================
MD5 f0fb37e503d34d13893c259867463dd8 dk-milter-0.6.0.tar.gz 350417
RMD160 aabc4fa34c4f6b3e03b39260471da5e91736b930 dk-milter-0.6.0.tar.gz 350417
SHA256 1114e9e548a341eda66da92fcca903d665e77763ee63d67e690606af4acce683 dk-milter-0.6.0.tar.gz 350417



1.1                  mail-filter/dk-milter/files/gentoo.config.m4

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dk-milter/files/gentoo.config.m4?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dk-milter/files/gentoo.config.m4?rev=1.1&content-type=text/plain

Index: gentoo.config.m4
===================================================================
define(`confNO_MAN_BUILD',`')
define(`confOPTIMIZE', `@@CFLAGS@@')
define(`confENVDEF', `@@ENVDEF@@')
define(`bld_USE_ARLIB', `true')



-- 
gentoo-commits@g.o mailing list