diff options
| -rw-r--r-- | mail-filter/dk-milter/ChangeLog | 7 | ||||
| -rw-r--r-- | mail-filter/dk-milter/Manifest | 24 | ||||
| -rwxr-xr-x | mail-filter/dk-milter/files/dk-filter.init | 15 |
3 files changed, 33 insertions, 13 deletions
diff --git a/mail-filter/dk-milter/ChangeLog b/mail-filter/dk-milter/ChangeLog index b4eb0e0254c5..8f97f0a2fe78 100644 --- a/mail-filter/dk-milter/ChangeLog +++ b/mail-filter/dk-milter/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for mail-filter/dk-milter -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/ChangeLog,v 1.19 2009/08/22 22:47:13 mrness Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/ChangeLog,v 1.20 2011/06/10 11:49:10 eras Exp $ + + 10 Jun 2011; Eray Aslan <eras@gentoo.org> files/dk-filter.init: + Remove stale socket on start up - bug #355443. Thanks to Alexey Lapitsky *dk-milter-1.0.2-r1 (22 Aug 2009) diff --git a/mail-filter/dk-milter/Manifest b/mail-filter/dk-milter/Manifest index 94256aa11a1b..1f759efef4a4 100644 --- a/mail-filter/dk-milter/Manifest +++ b/mail-filter/dk-milter/Manifest @@ -1,18 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX dk-filter.conf 346 RMD160 9a247255de0200e34cca4a4df03f73252ac1d5b6 SHA1 4e8548264e4513de98992f8523d5adefa54ea2f5 SHA256 b2e1ed85f0c05bb3fccc4fafaabb8b169919f0b2256e70d8e777f5241912192c -AUX dk-filter.init 1218 RMD160 1bf649a3147087c88c11def02dbb30ca465fde02 SHA1 45ba3c262c75da02c1a04fbc1a674b9c28a9da5e SHA256 01efa58dc6de954d80f571da960072367e9da8d3c4e8fdb8a3c47a61e54526f2 +AUX dk-filter.init 1494 RMD160 a4c9245f0054fd6738c8ad652a158ce50cc61fd6 SHA1 34c54bba2bd52b1e0d86ddc6aad6bc403b087f14 SHA256 4fc531c1a71122ae81c333485cc4388b726228cfc6501288ec770b12ee190644 AUX dk-milter-1.0.2-as-needed.patch 1088 RMD160 73fd57228aaa12cca34a44602556f580c9d75c07 SHA1 8eca272134ff114d12c46dd3eb28cc5887871b7f SHA256 67d3412716e7bcca62fce50bcfe3cdb14e3b67a9cf51c411008b29b2579ffb4c AUX gentoo.config.m4 170 RMD160 bb4afa7a2414c94100efce7033ebc9cdac5dbdef SHA1 8069d083ba6eadf6655ac02a5463eb2f4909371f SHA256 1b2a20a5290b7c60ea512509aaaacb773bc37964bfe0d27c1082a582a5991cd2 DIST dk-milter-1.0.2.tar.gz 362255 RMD160 24c1b3f023257937f212e38e15b151b9a5e81caf SHA1 95b60ebb9d28c8213ce36c3fcf383faeaa3f0e6a SHA256 b671234ca4089bfe71ab4685b7ed6efaae51017ee5b389b7bf60656b182a20d9 EBUILD dk-milter-1.0.2-r1.ebuild 4675 RMD160 84009fcf5089ed3fc767cc06cf8eb82152167c22 SHA1 47aec9b006eb90f9d2730243d1ab57f6d252f7fd SHA256 1068dc074ffd75a44a48ccccde47f1f741fc1f87b65d230047c04c446eff1bbe -MISC ChangeLog 3149 RMD160 595f9f9df5bd99625a6df2bea309e5a6ff33eb80 SHA1 7179878166b550198ed6b74974c764a9f1aab581 SHA256 cdd1a620c0022e27098c721c8269fcaf19cb7f26c28c3506f9b69332c1bbdb81 +MISC ChangeLog 3289 RMD160 c553a5a4a3c5c90fadc8c5dd8f11cee91ae9855f SHA1 bbe975c1940e82b412e6d708b37c5c83da578447 SHA256 277de56ced2e1e0757dd8dde62343febb1b27c7e752d9b779a35d18405844d4b MISC metadata.xml 253 RMD160 5a8a4bfae3d474e19cfaf4100521aa6bf8e45e79 SHA1 986d279cf4c10e38fedc186c077ef87d6bee2ca3 SHA256 102ff5abbeac0d1a0d95b31a2e442aa20a948975046eac169e4b761b69e2e6ab -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAkqQdXsACgkQ9A5kJBGSrsv+fQCeK+JrjBnH/HRQ5Ahq8qgEsZYn -RKgAoJPeLxK1vQ/fw7QT+3Zjq4tHdQWQ -=R8rV +iQIcBAEBCAAGBQJN8gTDAAoJEHfx8XVYajsfV1cQAIzZljooYxRhys4k2xyuAY1W +/GnokhLrasTTbij4xJNgar4D8cOOUACsTrUd9ZZPoPgvp0GV1LhLenXEGP1oP5au +oiAPnukqO7ccz+biTwR/1psmV2ha5MNM7SayEEOWE7j2Ap/1tt6FIP8SoqEME3n3 +OJc8MOmuXdoxsw3WDgCQnT0bmNXk2XupYijSk7eHb9aEiJ5JXX+JE9+BcCx175cd +NInHSmjUCnZfMk8VC05UKNsoUNXqXj0Q+cs6pGYotYbNwCsGcBx6Hf7v4wPH/zod +AK+Q5RkF4p5qJKi2G6Btfw/jATk6MkhlFc3hIARLSfx4UvjZG1azeGzexEOzdXjt +8q5wRW/o7ZbhHg+obfZD7BSF30Meq6sV5OovpN3tQ39pusIUELj6tfJYO5eKqyU6 +wQf68uAz3YDGvkjkxnD/FQOmXVo49tHF2Et/CyDsNHMmyhkMoONARQjvjdvWyYq/ +usTYrjhYjoqR7qNBux4mEPGEycxLZ9zSLGUMmY/DsjhwmNug27nXhR7wTA4PI4JJ +f/QoQUqrkVEy0qdIAUjW6aFPSyVtijcOsJ1mhe5xXUWbAsspfiziYNmYXXFry2rU +WnoG5kASw+EiymTo0jpPUFUR4Xf3YS6fQm8e9zJJ+FFnlNwLk3suy6mHweqH/+hH +k/4er8CM/bXZB+EBRruR +=QFIf -----END PGP SIGNATURE----- diff --git a/mail-filter/dk-milter/files/dk-filter.init b/mail-filter/dk-milter/files/dk-filter.init index 77dabec2b70c..148a22ad8221 100755 --- a/mail-filter/dk-milter/files/dk-filter.init +++ b/mail-filter/dk-milter/files/dk-filter.init @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2011 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.4 2007/10/12 20:31:23 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/files/dk-filter.init,v 1.5 2011/06/10 11:49:10 eras Exp $ depend() { use dns logger net @@ -24,8 +24,15 @@ check_cfg() { fi if [[ " ${ADDITIONAL_OPTS} " == *" -"[fpP]" "* ]]; then - eerror "-f, -p or -P are not allowed in ADDITIONAL_OPTS" - return 1 + eerror "-f, -p or -P are not allowed in ADDITIONAL_OPTS" + return 1 + fi + + if [[ "${SOCKET_TYPE}" == "local" && -S "${SOCKET_ADDRESS}" ]] ; then + ewarn "Strange, the socket file already exist in \"${SOCKET_ADDRESS}\"" + ewarn "it will be removed now and re-created by the service" + ewarn "BUT please make your checks." + rm -f "${SOCKET_ADDRESS}" fi } |