Pidfile now is in the opendkim.conf file rather than as a command line argument....

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index 32341837047ff985d6a5421d4c8b7b80fc9b1278..aeb00363ea5496ed670ce16a5e319102636f5bf7 100644 (file)
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/opendkim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.16 2010/06/07 23:07:52 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.17 2010/06/15 12:00:07 dragonheart Exp $
+
+  15 Jun 2010; Daniel Black <dragonheart@gentoo.org> opendkim-2.0.3.ebuild,
+  opendkim-2.0.4.ebuild, opendkim-2.1.0.ebuild, files/opendkim.init:
+  Pidfile now is in the opendkim.conf file rather than as a command line
+  argument. Command line arguement was removed in 2.1.0. Bug report as per
+  #323245 thanks to Guillaume Castagnino
 
 *opendkim-2.1.0 (07 Jun 2010)
 

diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 9da9aa5b3f0989cecff168273cf75786ffa6c0db..ff78746a87aebc8263a07ba87bcfc1feb9bfd471 100644 (file)
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,9 +1,9 @@
-AUX opendkim.init 1417 RMD160 df83c4df3b5a6eaa86ff21f8557bcb41fe5cbf2a SHA1 5d70122b00fd11f2a1b26537faca50bda7647f45 SHA256 a79ff9fed5ee3834aa905f6df613035b1121a3b3e264362a74558d315d3c30d9
+AUX opendkim.init 1403 RMD160 515d7ac2956c79602cad27a6866ee99f0bafc3d3 SHA1 f9b4134325607868b734720d36ae6945df79c433 SHA256 91d833fb67800f298a5ab876b38e1e6c02f0f7e13424b6fdc612a5494c8862ed
 DIST opendkim-2.0.3.tar.gz 964034 RMD160 964659db05799a555a5a5ba8427cc63044862abb SHA1 c26fcf1edd70f1aac767f687043b13a3597cb19d SHA256 7d2ef1e97f2b878ddd902ecf97763da60f439f799f4fc8ec5b0c8d216e84ee38
 DIST opendkim-2.0.4.tar.gz 965804 RMD160 30bf63ca214942b48d2d4d40f6b1971752ddbf52 SHA1 34b6e315bed100c11b073860406eb77ca320dc82 SHA256 ce1807613a9d194d3c0dce949f8e26bc7b2f1e1c6c908728cdec748c54cda40e
 DIST opendkim-2.1.0.tar.gz 1004640 RMD160 17d799c2dacfd0114addcd707817294ee49cc106 SHA1 fa19ffd96e0629abc65dd410eeb076429d5fd016 SHA256 70dca767cbd029f5c02879e0ccb399c6c886ae6bbb2c196f0775020c8cc2a039
-EBUILD opendkim-2.0.3.ebuild 5658 RMD160 7e9cd6b423417fa2876d4d59ce692b98a6097e56 SHA1 deca71cdb821e873e47fcbba52e430a71054c550 SHA256 78e913ac781113528270a7a774a5b3e0b5e762c545fe9f64cc12d3af1f04c2f8
-EBUILD opendkim-2.0.4.ebuild 5658 RMD160 d00e0d19fd674bf0c54ccd0e855a059a81567bb3 SHA1 fbae7747dae33e2caf427e3b1d60ea41bfeda277 SHA256 4d30f8227dbd81cb2d6a95df08caa962f0932d2e70ff4257055baa383ae63858
-EBUILD opendkim-2.1.0.ebuild 5695 RMD160 45495cb9dee7f444ef1ccfd9bce09e6f64ab4dad SHA1 916b714c897037130bc05ddd5e72d75c714804e7 SHA256 4a7571a54c0f72f142639ea821877bd371a3e1bfa506260ae9364fff7b130448
-MISC ChangeLog 3876 RMD160 9274ff22bd6f1cc3c1bdb8c73ce35c6b7cafeddf SHA1 65110ccbef542dc2f1b2d0de6afc65f710143901 SHA256 49a786e6e262c14852f557225a03bbbe42e8c1a068d1038ae5382430b2d73e09
+EBUILD opendkim-2.0.3.ebuild 5736 RMD160 d7713b03df6153e580fe8749253c538749e41275 SHA1 d3ea1826d28665e96f5c66e999255728ec345475 SHA256 d1c191ed2162dce6acf2f0562294f527bf64ff76b5f2aee3a7f5903003a05b39
+EBUILD opendkim-2.0.4.ebuild 5736 RMD160 ce7bf287659cac4780f752a8ef68d96e0f14247c SHA1 7aa3735fb93721fc8584736248f4f050c9b2680c SHA256 580cfbda211266594e83d5a0cedfbc31874d39084b4c3a6db03e0e197f8467d1
+EBUILD opendkim-2.1.0.ebuild 5776 RMD160 8dcd9883ac320a8414f440ae7d6164792f3b8762 SHA1 baf2c827d352a7b40fa91dfa70c43f8de408f6f5 SHA256 23fb3bc45a86cf38e48bdb908161060b1d88e2fe62965ef589cdfd5521058a67
+MISC ChangeLog 4211 RMD160 a2c7d3c332f9e5161eb3cdfe8bd6cd69c3bf1820 SHA1 862ede9ea7aeb488fcc27b918e52635d6fbf8249 SHA256 0527b56237e9a174a85817cfe08ba9c12c945702676170b5d974a91f1143380b
 MISC metadata.xml 1444 RMD160 25d767047ea540eeb22f7f2356e83548be5954f9 SHA1 a9d03f567205963ded4a26eb9f9b61f13c6a5b58 SHA256 8fb69e68d1fd09bde49461b53470ec8047de2fa2af497278a5fe514a3dd828f4

diff --git a/mail-filter/opendkim/files/opendkim.init b/mail-filter/opendkim/files/opendkim.init
index ddf3d55486102e9ee04667bc442364d5539cf20a..9e295f7398ed150bffa8486018575e1eecf630a1 100644 (file)
--- a/mail-filter/opendkim/files/opendkim.init
+++ b/mail-filter/opendkim/files/opendkim.init
@@ -1,10 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/files/opendkim.init,v 1.1 2009/10/06 09:10:42 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/files/opendkim.init,v 1.2 2010/06/15 12:00:07 dragonheart Exp $
 
 CONFFILE=/etc/opendkim/${SVCNAME}.conf
-PIDFILE=/var/run/opendkim/${SVCNAME}.pid
 
 depend() {
        use dns logger net
@@ -12,19 +11,18 @@ depend() {
 
 check_cfg() {
 
+       PIDFILE=$(sed -ne 's/^[[:space:]]*PidFile[[:space:]]\+//p' "${CONFFILE}")
        if [ ! -f "${CONFFILE}" ] ; then
                eerror "Configuration file ${CONFFILE} is missing"
                return 1
        fi
-
-       if egrep -q '^[[:space:]]*Background[[:space:]]+no' "${CONFFILE}" ; then
-               eerror "${SVCNAME} service cannot run with Background key set to yes!"
+       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:]]*PidFile[[:space:]]' "${CONFFILE}"; then
-               eerror "Please remove PidFile key from your configuration file!"
-               eerror "${SVCNAME} is automatically configured to use ${PIDFILE} as pid file."
+       if egrep -q '^[[:space:]]*Background[[:space:]]+no' "${CONFFILE}" ; then
+               eerror "${SVCNAME} service cannot run with Background key set to yes!"
                return 1
        fi
 }
@@ -34,17 +32,19 @@ start() {
        
        # 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}" -P "${PIDFILE}"
+               --exec /usr/sbin/opendkim -- -x "${CONFFILE}"
        eend $?
 }
 
 stop() {
+       check_cfg || return 1
        ebegin "Stopping OpenDKIM"
        start-stop-daemon --stop --pidfile "${PIDFILE}"
        eend $?

diff --git a/mail-filter/opendkim/opendkim-2.0.3.ebuild b/mail-filter/opendkim/opendkim-2.0.3.ebuild
index 63b74ebc043f14b42dcab2bf53ac383715a52d51..eac500067c9645d3add97d0c676347e57da05632 100644 (file)
--- a/mail-filter/opendkim/opendkim-2.0.3.ebuild
+++ b/mail-filter/opendkim/opendkim-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.0.3.ebuild,v 1.1 2010/05/01 01:46:59 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.0.3.ebuild,v 1.2 2010/06/15 12:00:06 dragonheart Exp $
 
 EAPI="2"
 
@@ -45,6 +45,7 @@ pkg_setup() {
 src_prepare() {
        sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
               -e 's:/etc/mail:/etc/opendkim:g' \
+                  -e 's:^#[[:space:]]*PidFile.*:PidFile /var/run/opendkim/opendkim.pid:' \
                   opendkim/opendkim.conf.sample
 }
 

diff --git a/mail-filter/opendkim/opendkim-2.0.4.ebuild b/mail-filter/opendkim/opendkim-2.0.4.ebuild
index d220a7ae6b8dd5fada0a830b75a9ff46c10a1204..870a11c574f199501da8f47d7e0283786509d112 100644 (file)
--- a/mail-filter/opendkim/opendkim-2.0.4.ebuild
+++ b/mail-filter/opendkim/opendkim-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.0.4.ebuild,v 1.1 2010/05/18 08:08:47 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.0.4.ebuild,v 1.2 2010/06/15 12:00:07 dragonheart Exp $
 
 EAPI="2"
 
@@ -45,6 +45,7 @@ pkg_setup() {
 src_prepare() {
        sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
               -e 's:/etc/mail:/etc/opendkim:g' \
+                  -e 's:^#[[:space:]]*PidFile.*:PidFile /var/run/opendkim/opendkim.pid:' \
                   opendkim/opendkim.conf.sample
 }
 

diff --git a/mail-filter/opendkim/opendkim-2.1.0.ebuild b/mail-filter/opendkim/opendkim-2.1.0.ebuild
index 6ae140bcb5941eb36390999e7c8cac0b9b7cc636..1cb5c9c9a2728f7655535b2aa6e1d9d17e96c58c 100644 (file)
--- a/mail-filter/opendkim/opendkim-2.1.0.ebuild
+++ b/mail-filter/opendkim/opendkim-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.1.0.ebuild,v 1.1 2010/06/07 23:07:52 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.1.0.ebuild,v 1.2 2010/06/15 12:00:07 dragonheart Exp $
 
 EAPI="2"
 
@@ -45,6 +45,7 @@ pkg_setup() {
 src_prepare() {
        sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
               -e 's:/etc/mail:/etc/opendkim:g' \
+              -e 's:^#[[:space:]]*PidFile.*:PidFile /var/run/opendkim/opendkim.pid:' \
                   opendkim/opendkim.conf.sample
 }