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
commit731a8fc9224afb581de4e2c8d12762895bcef15b (patch)
treec6ef3bc5e095266f183eea63fd2d55255adccd5d /mail-filter
parentChange to any-of-many dependency for eselect-news, bug 271447. (diff)
downloadgentoo-2-731a8fc9224afb581de4e2c8d12762895bcef15b.tar.gz
gentoo-2-731a8fc9224afb581de4e2c8d12762895bcef15b.tar.bz2
gentoo-2-731a8fc9224afb581de4e2c8d12762895bcef15b.zip
Remove stale socket file on startup (#281197).
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'mail-filter')
-rw-r--r--mail-filter/milter-regex/ChangeLog8
-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
3 files changed, 14 insertions, 3 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/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"