mail-mta/citadel: Version bump to current 7.71 version. Corrected and improved init...

svn path=/sunrise/; revision=9995

diff --git a/mail-mta/citadel/ChangeLog b/mail-mta/citadel/ChangeLog
index 6816071ecee376c223efb8b0a0a36a7f4e86af34..d8c8dae5cdedca1d393e55f16956727e82ccd760 100644 (file)
--- a/mail-mta/citadel/ChangeLog
+++ b/mail-mta/citadel/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for mail-mta/citadel
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Feb 2010; the_mgt themgt@mail.ru -citadel-7.66.ebuild,
+  +citadel-7.71.ebuild, ,files/citadel.init:
+  Version bump to current 7.71 version. Corrected and improved init script
+
   04 Oct 2009; the_mgt themgt@mail.ru +citadel-7.66.ebuild,
   +files/citadel.confd, +files/citadel.init, +files/mailer.conf,
   +metadata.xml:

diff --git a/mail-mta/citadel/Manifest b/mail-mta/citadel/Manifest
index ca01533c6b3046f8ec87ff01d0516b18ffb27b78..7bc2069f37e9843c89c2559aa69efd4c453aedb2 100644 (file)
--- a/mail-mta/citadel/Manifest
+++ b/mail-mta/citadel/Manifest
@@ -1,7 +1,7 @@
 AUX citadel.confd 957 RMD160 50f8ade88eb6b0c88aa94b42e13f81b725099027 SHA1 091d9223315c5d390ecd18bba44198ed6dfe2c22 SHA256 ef9309d200cb0617b91ee0983db41b53e424a9b4095e0f5ec76112866865871f
-AUX citadel.init 797 RMD160 4da67fb04e802d06391b1bf990421ba9dc8a8376 SHA1 ee6068c4ca88b214b8fa16e05592495dd2101bd2 SHA256 2e233de7a7cb5af342449e062df8ca47e35fa9b029a5ad1565f4fa16764686d0
+AUX citadel.init 767 RMD160 afd16e3aec56496d4fa3ee59966428e742d31dd1 SHA1 719871e18211554f1088ef3ad2ca438c9c67c20d SHA256 16fc77dc01825c920d38864b880f0a00bc22aee5ebc552518c0bf94cb8b4b7c7
 AUX mailer.conf 236 RMD160 a01981ea92dfafa4039c7f09f41a9b5722bf56d6 SHA1 5e8e0cd326bda077831a309ff3825897b3156279 SHA256 f0df591d761bb078447d666fdf18c42e511fb5765a4ddc2fca2bc96f7df50be8
-DIST citadel-7.66.tar.gz 809003 RMD160 783b3070c32e517bbcf492904946e35ad1d4b4c0 SHA1 0d039bd7a9fa827312d71b9a0dbf10eebb976752 SHA256 0ce10d75855aab77a0cb787e146ffb02f8077637a972c1eec56865ad5939abb1
-EBUILD citadel-7.66.ebuild 6711 RMD160 e4747007e35861e0fc6639c79d99ca087a9c9a98 SHA1 d4371b14fcae288eb774a70414d4437edd645c5a SHA256 0f70420f360fffb45986161f2e8b48e77d718b2965e907fef622e90264136c95
-MISC ChangeLog 353 RMD160 a27bf2955c1fa791e8a2bdd71ff0947b4f393f4b SHA1 310eac230c2600f78cbe4736b2be07db2aab2b12 SHA256 90582dfbafd47d8ef842e039010eff5e4d61d33cf37b209f3c379643efeb26cd
+DIST citadel-7.71.tar.gz 827489 RMD160 46ad63e5e6284a2149c02e790a23b4ec11d39989 SHA1 6d8445d9e71bc946df2acd854e6c0a10b60ca9b1 SHA256 c07350030f3bb67b8a765b6e3c692f18400c1fc174075678c4acc03115c3ce5e
+EBUILD citadel-7.71.ebuild 6711 RMD160 4575963b5205403e2f10c915c182f6903644d557 SHA1 b3a437ad1144d0167199ff19ee914ee51e2c57c0 SHA256 d2d88c23571b17faec8ee9b6c071860d380bcb046c227e779a4fc09d70f95edc
+MISC ChangeLog 534 RMD160 93b3c634bcd34e59d6e85a1ae38756d310a03d41 SHA1 082a5a9f4b388546e7df95db023843e60fa1650a SHA256 87500aa16bd2f522713d134097711403dfb91d2ce32b4d17e2cbaaf3a52b9322
 MISC metadata.xml 1069 RMD160 e8e08f40f6d4d25a1c7bee66d21357ae3b400fdc SHA1 106aa862377e9932222947e4871789ba28e5d38b SHA256 9811c5376d9fd71e14ad2a10ad827e92769f489262ebb7de9d3558d4dc609c66

diff --git a/mail-mta/citadel/citadel-7.66.ebuild b/mail-mta/citadel/citadel-7.71.ebuild
similarity index 99%
rename from mail-mta/citadel/citadel-7.66.ebuild
rename to mail-mta/citadel/citadel-7.71.ebuild
index 2b16c411c8dd0f422df6760e8a68927a4a0efd15..5cf84af1740821db483d6c28f81e3eb23aab1e64 100644 (file)
--- a/mail-mta/citadel/citadel-7.66.ebuild
+++ b/mail-mta/citadel/citadel-7.71.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 

diff --git a/mail-mta/citadel/files/citadel.init b/mail-mta/citadel/files/citadel.init
index 29b0586359d833f880b0b91a020963085c0112d3..023f6ec747d193e193e744d20da1531b167285d2 100644 (file)
--- a/mail-mta/citadel/files/citadel.init
+++ b/mail-mta/citadel/files/citadel.init
@@ -17,15 +17,15 @@ SENDCOMMAND="/usr/sbin/sendcommand"
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
 
-svc_start() {
+start() {
        ebegin "Starting citserver"
        start-stop-daemon --start --exec /usr/sbin/citserver -- ${CITSERVER_OPTS}
        eend $?
 }
 
-svc_stop() {
+stop() {
        ebegin "Stopping citserver"
-       start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+       ${SENDCOMMAND} DOWN &>/dev/null
        eend $?
 }