diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2010-09-24 19:59:23 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2010-09-24 19:59:23 +0000 |
| commit | 0890ae02d4f56c4de5208966598ee7858cbf18ae (patch) | |
| tree | a166bb33b1a7122c824bb47b847ce3111a391fa4 /mail-filter | |
| parent | Version bump (#329577). (diff) | |
| download | historical-0890ae02d4f56c4de5208966598ee7858cbf18ae.tar.gz historical-0890ae02d4f56c4de5208966598ee7858cbf18ae.tar.bz2 historical-0890ae02d4f56c4de5208966598ee7858cbf18ae.zip | |
Remove existing socket file at startup (#302282).
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
RepoMan-Options: --force
Diffstat (limited to 'mail-filter')
| -rw-r--r-- | mail-filter/sid-milter/Manifest | 10 | ||||
| -rwxr-xr-x | mail-filter/sid-milter/files/sid-filter.init | 16 | ||||
| -rw-r--r-- | mail-filter/sid-milter/sid-milter-1.0.0-r5.ebuild (renamed from mail-filter/sid-milter/sid-milter-1.0.0-r4.ebuild) | 2 |
3 files changed, 21 insertions, 7 deletions
diff --git a/mail-filter/sid-milter/Manifest b/mail-filter/sid-milter/Manifest index c228d03e1380..369ec1954330 100644 --- a/mail-filter/sid-milter/Manifest +++ b/mail-filter/sid-milter/Manifest @@ -3,17 +3,17 @@ Hash: SHA1 AUX gentoo-config.m4 197 RMD160 f8ea32f01eefd71de2a6fe36fc6bd084735ac8eb SHA1 c26236132574f782a3c2df187c52372ec854927c SHA256 e704faeab661553c2bb886f9486693681f07d3581d8d8b8eb287faf621c23738 AUX sid-filter.conf 226 RMD160 c2743152e4dc29f4d3df046e122acfe9e89fb99a SHA1 fc251d7534dabaf3923e11ad1710718c23730efa SHA256 9c887c16afecfce014ab64a4747fd6c643f7b570f5d506740401d61872ae5249 -AUX sid-filter.init 1386 RMD160 570de2aebb54444abea1e5b58bd074719e733b38 SHA1 0c5e74f2bc068151c60f9a5a7e28b950fb64eca8 SHA256 a96e39cd0d931af6694dc1e5074db94e6d791f602062f38a2052a3a94c537409 +AUX sid-filter.init 1890 RMD160 dc8aa36c6f44b29ab83c0663c56367e22dbc3c6f SHA1 0b43e51c686ba7fb0a1cb5ade230e960406fc8db SHA256 d5f73be629f18ad240f1d5b81fdbbade2009f4160c63225ff2e935710a10e010 AUX sid-milter-1.0.0-as-needed.patch 1213 RMD160 d846aaa04a390d5b7ee6e7a342f7b94d365679b0 SHA1 f864e9135880dd4c675d2ff35e99c6825b91dff6 SHA256 8c77f7be8f99d69e75eced9aa8880acb0ada60aec7186bc2d48b823855b902a0 AUX sid-milter-1.0.0-nopra_on_spf1.patch 1777 RMD160 2b87e1759a806ef6f8b09dbbc99d51dc663a80be SHA1 b54ed8bc77cbbeb83af13d7e322c011dfe66fc17 SHA256 2a01bb115496583682e1e6f78370acc267c7e45067bb4dd91daa90dbf7107942 DIST sid-milter-1.0.0.tar.gz 351161 RMD160 7aca88c5d1c18581a17a779c87e7dda3d0091e0e SHA1 dd6517b36933083923c3094cf7f09e74825e7dcb SHA256 b303bf0c43afd0cb0c814b8c862b8d22563d1203339ac130036873e79f696376 -EBUILD sid-milter-1.0.0-r4.ebuild 2021 RMD160 14e7c0afd526921e9ace9d492c91be283366baee SHA1 f243a587465f4ea950447e695b81f0de132c08c9 SHA256 516afd773970fd5eac2c791c99683bc84287106b3acde92735cb4ec18517ffed +EBUILD sid-milter-1.0.0-r5.ebuild 2021 RMD160 02b22c2965c02bd5f468aae872803507ece9c3a0 SHA1 aa228db528df5b029e3dfc16e1974314638e08d0 SHA256 43d44e686ce301d12ba16425cd2fe7b86bd4a023941434840c62a34fef81a92b MISC ChangeLog 3052 RMD160 a328805b9aba2939404f8dfda5d952813c79e9d3 SHA1 c5096741043056fec5d2c9c38b7dbb9ca3cac66e SHA256 c6740ef5d9264adea3a3ce7593506eb6b8fef4e882d4e4bab963bf8170448297 MISC metadata.xml 447 RMD160 d12715bcb22b684ecc8d69400ea109bb1898b068 SHA1 4967c8a01ec72918142454d4795637048283ef63 SHA256 c014f1e81516b87fd0b79be261b843a3ed2d8f981baf0177c3805ef8e51bac17 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAksjdikACgkQ9A5kJBGSrsuZ3gCdEwb5fHnpc8f5rlPfK9aLX+Jt -hoMAn2AoTS7zbvotqBFxFd55/JYeDbbc -=aQWb +iEYEARECAAYFAkydAyYACgkQ1564UogppBLdPwCfd/9ftIL8YvwE5uSjo2IX1Lhv +9doAoKHX41gpNBTIRpAOE8h7jE3OYF9p +=Czi0 -----END PGP SIGNATURE----- diff --git a/mail-filter/sid-milter/files/sid-filter.init b/mail-filter/sid-milter/files/sid-filter.init index d2f735bbcbfe..8ef2a4dbddf3 100755 --- a/mail-filter/sid-milter/files/sid-filter.init +++ b/mail-filter/sid-milter/files/sid-filter.init @@ -1,7 +1,7 @@ #!/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/sid-milter/files/sid-filter.init,v 1.3 2009/12/12 10:53:15 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/sid-milter/files/sid-filter.init,v 1.4 2010/09/24 19:59:23 mrness Exp $ depend() { # need net @@ -31,9 +31,23 @@ parse_opts() { fi } +clean_socket() { + local socket_file= svc_pid= + + socket_file="$(echo ${SID_FILTER_OPTS} | sed -e 's/.*local:\(.*\) .*/\1/' | awk '{print $1}')" + svc_pid="$(ps -C sid-filter -o pid=)" + if [[ -z "${svc_pid}" ]] && [[ ! -z "${socket_file}" ]] && [[ -S "${socket_file}" ]]; then + ewarn "Strange, the socket file already exist in \"${socket_file}\"" + ewarn "it will be removed now and re-created by the sid-filter server" + ewarn "BUT please make your checks." + rm -f "${socket_file}" + fi +} + start() { local filter_user= filter_pid= + clean_socket parse_opts if ! (touch ${filter_pid} && chown ${filter_user} ${filter_pid}) ; then eerror "Failed to create pidfile" diff --git a/mail-filter/sid-milter/sid-milter-1.0.0-r4.ebuild b/mail-filter/sid-milter/sid-milter-1.0.0-r5.ebuild index 6bf92345cdc8..20c0f7c00e89 100644 --- a/mail-filter/sid-milter/sid-milter-1.0.0-r4.ebuild +++ b/mail-filter/sid-milter/sid-milter-1.0.0-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/sid-milter/sid-milter-1.0.0-r4.ebuild,v 1.1 2009/12/05 06:49:37 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/sid-milter/sid-milter-1.0.0-r5.ebuild,v 1.1 2010/09/24 19:59:23 mrness Exp $ EAPI="2" |