don't try to parse the config file - bug #397763

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 4aca2da663fe27f90c68d96e9068511a783263a0..0b7f306279c454038cb799838db81c37c6bc58c0 100644 (file)
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.175 2012/01/06 11:38:35 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.176 2012/01/10 13:46:47 eras Exp $
+
+  10 Jan 2012; Eray Aslan <eras@gentoo.org> files/amavisd.initd:
+  don't try to parse the config file - bug #397763
 
   06 Jan 2012; Eray Aslan <eras@gentoo.org> files/amavisd.initd:
   fix in init script - bug #397763

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 1a0bd465208482438a128263451fca2a6d3c2046..8ad3a4fd3ea9b7ce564b2b537d4df253af2cd0f0 100644 (file)
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -6,7 +6,7 @@ AUX amavisd-new-2.6.3-amavisd.conf-gentoo.patch 4882 RMD160 0d6b26e68128f021fb68
 AUX amavisd-new-2.6.3-dkimconf.patch 735 RMD160 778aad1195caf735eb44ff2c4e9147e88b68881d SHA1 3ff44615cb9b161da069055eb4fc79f6b24fd70c SHA256 1d0489bfd14d794617c12ec797404373a632b2c26e381d9e09c364cbfa2ae248
 AUX amavisd-new-2.6.3-startup.patch 522 RMD160 e7e864c260efc9b7f27c54771956c85fe67fd1eb SHA1 70092348cfc2ab5e8bd1776196a49e76c611b0bf SHA256 ebc531320945ab009da3b59d829d7f6dd938647063ec495ed85d96833eee0647
 AUX amavisd-new-dkimconf.patch 735 RMD160 721bc3fdaf15c2838092825e0b88c781841184b0 SHA1 7b57c4c80a92c3d764f9d338dac6146cd37e3080 SHA256 033f6758dc3f62d19f8a269c8ba1e3960f8b55a48aaccbb6d1d0078cd92352a8
-AUX amavisd.initd 1366 RMD160 e79a0286803db75176450380cec93931b4d6adc8 SHA1 bb5903d2197046f13176ff64567696592adb5937 SHA256 a462493764542e85078f527b0f294818acd32b330e0681042da2cfefc4e3c27d
+AUX amavisd.initd 918 RMD160 683f0b4d6351102d448ae12ea0951895b340bb03 SHA1 abf3c4ceeb48d739064d213ba718e8765580066e SHA256 6843671c58cca1fb1df954b85f40c587838519d4b359a054f0619cad5592877d
 AUX amavisd.rc6 371 RMD160 d32a99dd9a229a133741501ec443509e22c6867a SHA1 f353cd12004bff30ac2361df2a2784f697b0cb8d SHA256 f2010650d3ef408359f41e3a84173c2b27300e9d6d2e4f7558ef39858e01da9d
 DIST amavisd-new-2.6.3.tar.gz 918888 RMD160 911e356dbc2a900734c5c87bdd231846abe4f9e8 SHA1 12a120b4fc614a0b3269cb0ec0ee185cb3e7c13f SHA256 47e774579fdab1e1c10ef2295d49cb511b13e05431a7955c73f07e98025d788e
 DIST amavisd-new-2.6.4.tar.gz 947596 RMD160 010dd9bf49a3c7553996c49553fd0fa84ca7bdab SHA1 993b7ca839ce038fd13f65351950f0ef03d99ff9 SHA256 40fe1b655deb934c7a655a6b5b430df268ec9ac80754b120795bc45d4ae769ef
@@ -18,22 +18,22 @@ EBUILD amavisd-new-2.6.4.ebuild 5451 RMD160 7b2d69e9319e59cb14736697267a72272c0e
 EBUILD amavisd-new-2.6.5.ebuild 5503 RMD160 bfef5fdefcb1d871ca6f7931df33733dd6c5d265 SHA1 4dcdbd03b4c6c4faa697f88c0b4d79521ac1476b SHA256 8396b23e232a890851b0056bc57351fc1e5629856bd6ba7174eebcc812e77116
 EBUILD amavisd-new-2.6.6.ebuild 5503 RMD160 a6bd6c4f1139e248763e38fcba3200eb9405bfeb SHA1 b388ba11ab05edcc379b5b76ecf3c7714f13984d SHA256 f8a9cb437a966b50147898f62b448de800855ab8301dea0dbf673873a86ebbf5
 EBUILD amavisd-new-2.7.0.ebuild 4282 RMD160 1859c541ab4d8374d97c5e44829a49e997449c05 SHA1 a6827374186f7d92c5c2612f446e02a5d586f454 SHA256 fb677e578d476bc11b028c0618dd3331028c825026dffab014f58fe04f3a40d8
-MISC ChangeLog 33853 RMD160 12052b0b86628963f7fcb4aad1b86e892e37511b SHA1 e1e60c686507932f831ccf980770194cc0338199 SHA256 7ef68bb3298e1ef93c096b2d0fe91abee320a674e30682280a92113ed25be3d2
+MISC ChangeLog 33970 RMD160 0b110e533990a48e5d827da679e966c00fb4c3dd SHA1 fae9a3c8afccb3abe4a48984a34d43cf68f8a5a7 SHA256 0c16378dade032a3f01dd54e1102b96c608c062ca54eaa35c6d5d9672073a2ff
 MISC metadata.xml 492 RMD160 5cc972a4e9a4a4d988864d3860c14faaab49b486 SHA1 2ba196114139a71488d3561cebb5634603f4e6f1 SHA256 9210f93fc9ec4b70f4fc79c08f43bb50f29e02aa33bad7061c0047ac8781d190
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPBt1AAAoJEHfx8XVYajsf4dYP/Rg5hnd2aDzd+GROa0yI8LIt
-4x5Y+VcTxfoMawG9348OooT/ArjducCCfwCiYrl93II30gzXcQsMCMJ9z2E/I+7l
-cSxly/vO0iqYaTuJYAHrKjqUflBgY1NRj0ImHd+B/wggUZbrgJC28js/yEmU/pUl
-6i0k+H4sXSBQjcf2zSSPsl2smklIUiOu18W6Ct8YxzbLq8xMtXAx5E0op5OgEPDo
-E3sgQGTU5C8C3yXJv1ECQ4+HZLRZ2KnmOTbNXFSutyKEpKXPxiX53QUpTINQ5f1n
-l7IwZAYQUYmDjjtgoAXvMzqktzKJtoEejEf5PkLl2DuY6GvQWivzlmjLDY+FmNXs
-XnSYvNrX9qwOMTo6792C+eD4pcoM2A0K3Ogg5yLs9/khTtYecfahMZKwTNOmw66b
-X1axuBuYtYhZf4ZCyTocQQunczR+4N1RMEZQnutQZczmfihdOOLbXeKwKEPv7NTl
-K7DKs6SzF8d0Z6vI1gwJ7hySwzEUoniZnIeAOM3SGUspkyUvaCVqilaSYFCipER+
-ebNtKO9RRfVOQF+RP8JLozIyoch+KU2cI88fFlWv6c52KPii5EHvLTllYN/e3u6Z
-4RUGhaW1ipsxDIUm84bQBUJGp2Zlha1R//32dp6seOVltcOS2NqRPDdQ5NwhjVmh
-ULlK7TT9Ulnl9vs6jCHp
-=Nib4
+iQIcBAEBCAAGBQJPDEFXAAoJEHfx8XVYajsfYE4P/AxSmEAO3M7tFxMJomxZ7rlu
+CbuDWmefoET9UdpR1sJVSMYy7DHQ4s3litCp9WnGvYIfrcvQd4Y8/vFOT7xloPv7
+wdt+qVVVeEQNVHspLqnXDu36bnxv7spvgtNl3nB1L1TsvxfbrxkSpGXBLoMvHUOS
+Ikio/tEa8f5U57doS90POlSZdVHFLF4Dsf64Nq+V6Po0i3ZoLMsMSum/ec3S63Ju
+uTGkDwcLssgh2HkF9TOt7m2HjE7bBHulS6sVhCG1Sr35ImPXv46O7/nG2O+dkpdI
+GTW6IZDrtkiACo0Otzg8CfO0RezczzY8J5vzhohkXPJtKPFEie+4b7RW7CCyyyuf
+abId33C+romnXWI4zXWyZ6XCTP7sbwWfdwLjzcQaRH42eWy/v4o8ttzmcH4hBWiZ
+SRtI/p7eaDaZI8ADkQMIh0WLPdXaEp7y8r0sOetTy9ARy9e+ILTCXG6pO8rZAzH6
+F+UaShtEvjdNDlCLjNKskZf/VlvIwWxLnglKeBihcMIXS9OCt8I2UMYwp/3rKIh9
+d8c+FwdxI4HdMt8dnEuPy8Q8bzM4+WPr2nmMIbAI3kPMVVk462VgS+TwWSKMpRJL
+/KwhFUeVgGNKniFC41U/iAaZCluFJAglYLcsssFHDg07ML413sW09B107ce93svg
+ycbAPz7LFQj99bPE+nJR
+=UX9U
 -----END PGP SIGNATURE-----

diff --git a/mail-filter/amavisd-new/files/amavisd.initd b/mail-filter/amavisd-new/files/amavisd.initd
index bd47bc9a79f45a62f5a47868e7c3ab60fa6cca2e..ce3a447eb3f9d745256c9a331461d478b228127d 100644 (file)
--- a/mail-filter/amavisd-new/files/amavisd.initd
+++ b/mail-filter/amavisd-new/files/amavisd.initd
@@ -1,14 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.3 2012/01/06 11:38:35 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.4 2012/01/10 13:46:47 eras Exp $
 
 extra_started_commands="reload"
 extra_commands="debug debug_sa"
 
 prog="/usr/sbin/amavisd"
 progname="amavisd-new"
-conffile="/etc/amavisd.conf"
 
 depend() {
        need net
@@ -16,23 +15,8 @@ depend() {
        before mta
 }
 
-checkconfig() {
-       local piddir pidfile
-       if [ -r "${conffile}" ] ; then
-               pidfile=$(grep -m1 ^[^#].*pid_file "${conffile}"|sed -e 's/.*"\(.*\)".*/\1/')
-               piddir=${pidfile%/*}
-               if [ ! -d "${piddir:=/var/amavis}" ] ; then
-                       checkpath -q -d -o root:amavis -m 0770 "${piddir}" || return 1
-               fi
-       else
-               eerror "Missing conf file."
-               return 1
-       fi
-}
-
 start() {
        ebegin "Starting ${progname}"
-       checkconfig || return 1
        "${prog}" start
        eend $?
 }
@@ -59,14 +43,12 @@ restart() {
 
 debug() {
        ebegin "Starting ${progname} in debug mode"
-       checkconfig || return 1
        "${prog}" debug
        eend $?
 }
 
 debug_sa() {
        ebegin "Starting ${progname} in debug-sa mode"
-       checkconfig || return 1
        "${prog}" debug-sa
        eend $?
 }