summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2009-08-19 20:32:46 +0000
committerAlin Năstac <mrness@gentoo.org>2009-08-19 20:32:46 +0000
commit805d9a779332c62c3e08f62332c86f7eedd5d91e (patch)
tree7a3e647597d1be1ff05d07439fe0759f3359b3a2 /mail-filter/milter-regex
parentChange to any-of-many dependency for eselect-news, bug 271447. (diff)
downloadhistorical-805d9a779332c62c3e08f62332c86f7eedd5d91e.tar.gz
historical-805d9a779332c62c3e08f62332c86f7eedd5d91e.tar.bz2
historical-805d9a779332c62c3e08f62332c86f7eedd5d91e.zip
Remove stale socket file on startup (#281197).
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'mail-filter/milter-regex')
-rw-r--r--mail-filter/milter-regex/ChangeLog8
-rw-r--r--mail-filter/milter-regex/Manifest12
-rw-r--r--mail-filter/milter-regex/files/milter-regex-init7
-rw-r--r--mail-filter/milter-regex/milter-regex-1.7-r1.ebuild (renamed from mail-filter/milter-regex/milter-regex-1.7.ebuild)2
4 files changed, 20 insertions, 9 deletions
diff --git a/mail-filter/milter-regex/ChangeLog b/mail-filter/milter-regex/ChangeLog
index 957bf6de018f..1f6d07cfa0b5 100644
--- a/mail-filter/milter-regex/ChangeLog
+++ b/mail-filter/milter-regex/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for mail-filter/milter-regex
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/milter-regex/ChangeLog,v 1.5 2009/08/15 12:41:17 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/milter-regex/ChangeLog,v 1.6 2009/08/19 20:32:46 mrness Exp $
+
+*milter-regex-1.7-r1 (19 Aug 2009)
+
+ 19 Aug 2009; Alin Năstac <mrness@gentoo.org> files/milter-regex-init,
+ -milter-regex-1.7.ebuild, +milter-regex-1.7-r1.ebuild:
+ Remove stale socket file on startup (#281197).
15 Aug 2009; Alin Năstac <mrness@gentoo.org> milter-regex-1.7.ebuild:
Set /var/lib/milter as home directory for milter user (#280571).
diff --git a/mail-filter/milter-regex/Manifest b/mail-filter/milter-regex/Manifest
index 14bdfe602fdd..98b31ce27beb 100644
--- a/mail-filter/milter-regex/Manifest
+++ b/mail-filter/milter-regex/Manifest
@@ -5,15 +5,15 @@ AUX milter-regex-1.7-gentoo.patch 1489 RMD160 4f7c5b88f59ff176e9524a6d1d713d5bac
AUX milter-regex-1.7-rules.patch 351 RMD160 ab1cd7404c555b78be8d5b7e0b04bccbe1dd539d SHA1 e757096c4404ae3fcd36bbe1f619628b73537403 SHA256 8319e51b061a12d13b49fdb602e232d229fe25d418cddbe9e96c6001753724ae
AUX milter-regex-1.7-yacc.patch 428 RMD160 81e6fa5aec57c9824989ef61af0eefad66b45a34 SHA1 927e217aed49d9e4bf52e23325759387a5190d25 SHA256 a2f40699187e9a075f6a306b1051fb71adfd430a0c3d1d2e65f8170f12535d05
AUX milter-regex-conf 177 RMD160 aac67efe1fa295755d85fe313a504bab70ed5dad SHA1 46760523a139d2ab80b9e27a4c7248a28387cee6 SHA256 e26c4c6a876dd8c3c5a15e6093feec5da7e44b396636c96d2b4441f555a8a150
-AUX milter-regex-init 824 RMD160 f6fe14f020f8e7e0150183b6fa124f436085fbe7 SHA1 daf51b3cbddc81421e7b29fb919db05a01614ca6 SHA256 cccf793d1c62444d8f82c899e5787090fd048f5b7c56f4dddd04b21e7c06f181
+AUX milter-regex-init 964 RMD160 01d87fac14c32e763ce64ab1fd969d9a9e1570d1 SHA1 357c0283b08cf69ed14e40e78c795cd163179a26 SHA256 3aa5c796e3b4c96378395aacb6defe489fc1018aa5544680508dd59525aa1145
DIST milter-regex-1.7.tar.gz 19321 RMD160 66868b21eb095f203ef8391e99744506d7ee3cc4 SHA1 de337bc12dade1ed4b715657c4317040f08ef902 SHA256 ca64e51c67a27962e2d258a0f69f832ffd56b5270dbe4440f960f457c74bbce6
-EBUILD milter-regex-1.7.ebuild 1935 RMD160 5c254a818dde57b0370f87b18c569beef7aaa869 SHA1 cd2457dc862fcd75103c2fb155750bdc518c505e SHA256 e3cd62777a01a577ebea75ba504fb772489392f66b6a03e8d7ff55e8886744f7
-MISC ChangeLog 1053 RMD160 313aa83f9edfdd5c4964d3598fa7a4b7bbd75116 SHA1 eb7d8fd6520c123cf1906a8536f317f3430fbb2f SHA256 bb1daee03c9054e0dc5e401791dc06cad14edb40c431bdfd495116d3bedf20ef
+EBUILD milter-regex-1.7-r1.ebuild 1938 RMD160 d4a1f5efcca0b21a68758a31624ce0d6e6fbd0a3 SHA1 90b6d19254ce16ebfab0226bef647cbebe40d75c SHA256 2afbb58f42988aa2f88a88f0f5a1850da8ef4b37e4695cff04a7e93a826597a2
+MISC ChangeLog 1269 RMD160 3531fceeb3fc23f4ea53c61660232da37ba2a2a9 SHA1 eb86045ac669f3fcb486d71485a6f1db575b9bff SHA256 b91a7a8aa0157668ba8c1276729671905f3e74fc78c76a5bc3c926a1181cd0d9
MISC metadata.xml 492 RMD160 afd9793c7ad83c56f53e9d5a5b1f596b033b4e8b SHA1 5fba558c4dcabeba151318150772910833860f90 SHA256 5dd05145d4a0eb2d55ba127f97290e7c3b2ebe32bb45ad952358f61b69c4718a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkqGrPQACgkQ9A5kJBGSrsu7mgCeMzNW/RM6aa1yyF9vSzG3jrWc
-J+YAn3auY2kHVphOW588A6EzVuNQ6Vmd
-=IQoh
+iEYEARECAAYFAkqMYXIACgkQ9A5kJBGSrstdZgCglkidRWVYOhycYoC+jCYIN5tY
+pgEAoJedYcv87e6B3R4s29m/gORf4FFi
+=qHrF
-----END PGP SIGNATURE-----
diff --git a/mail-filter/milter-regex/files/milter-regex-init b/mail-filter/milter-regex/files/milter-regex-init
index 9c95d562fc41..d1b1dae546a5 100644
--- a/mail-filter/milter-regex/files/milter-regex-init
+++ b/mail-filter/milter-regex/files/milter-regex-init
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/milter-regex/files/milter-regex-init,v 1.1 2008/02/18 10:34:54 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/milter-regex/files/milter-regex-init,v 1.2 2009/08/19 20:32:46 mrness Exp $
depend() {
use dns logger net
@@ -22,6 +22,11 @@ check_cfg() {
start() {
check_cfg || return 1
+ # Remove stalled Unix socket if no other process is using it
+ if [ -S "${SOCKET}" ] && ! fuser -s "${SOCKET}"; then
+ rm "${SOCKET}"
+ fi
+
ebegin "Starting milter-regex"
start-stop-daemon --start --exec /usr/bin/milter-regex -- \
-u "${USER}" -p "${SOCKET}" -c "${CONFIG}"
diff --git a/mail-filter/milter-regex/milter-regex-1.7.ebuild b/mail-filter/milter-regex/milter-regex-1.7-r1.ebuild
index 371aa438aae5..2ddd7bfefcae 100644
--- a/mail-filter/milter-regex/milter-regex-1.7.ebuild
+++ b/mail-filter/milter-regex/milter-regex-1.7-r1.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/milter-regex/milter-regex-1.7.ebuild,v 1.5 2009/08/15 12:41:17 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/milter-regex/milter-regex-1.7-r1.ebuild,v 1.1 2009/08/19 20:32:46 mrness Exp $
EAPI="2"