public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in mail-filter/amavisd-new/files: amavisd.initd
@ 2010-11-10 11:13 Eray Aslan (eras)
  0 siblings, 0 replies; 5+ messages in thread
From: Eray Aslan (eras) @ 2010-11-10 11:13 UTC (permalink / raw
  To: gentoo-commits

eras        10/11/10 11:13:15

  Added:                amavisd.initd
  Log:
  Version bump. Following upstream dropped milter USE flag and added snmp.
  Bump to EAPI 3. Ebuild clean up and init.d script revision. Bugs #245434
  
  (Portage version: 2.1.9.24/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  mail-filter/amavisd-new/files/amavisd.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?rev=1.1&content-type=text/plain

Index: amavisd.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2010 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.1 2010/11/10 11:13:15 eras Exp $

opts="${opts} reload debug debug-sa"

prog="/usr/sbin/amavisd"
progname="amavisd-new"
conffile="/etc/amavisd.conf"

depend() {
	need net
	use logger antivirus snmpd
	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 $?
}

stop() {
	ebegin "Stopping ${progname}"
	"${prog}" stop 2>/dev/null
	eend $?
}

reload() {
	ebegin "Reloading ${progname}"
	"${prog}" reload 2>/dev/null
	eend $?
}

restart() {
	ebegin "Restarting ${progname}"
	svc_stop
	sleep 3
	svc_start
	eend $?
}

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 $?
}






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in mail-filter/amavisd-new/files: amavisd.initd
@ 2010-12-07 10:34 Eray Aslan (eras)
  0 siblings, 0 replies; 5+ messages in thread
From: Eray Aslan (eras) @ 2010-12-07 10:34 UTC (permalink / raw
  To: gentoo-commits

eras        10/12/07 10:34:32

  Modified:             amavisd.initd
  Log:
  Init script revision for baselayout-2 for amavisd-new-2.7.0_pre Bug #347895
  
  (Portage version: 2.1.9.25/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  mail-filter/amavisd-new/files/amavisd.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?r1=1.1&r2=1.2

Index: amavisd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amavisd.initd	10 Nov 2010 11:13:15 -0000	1.1
+++ amavisd.initd	7 Dec 2010 10:34:32 -0000	1.2
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2010 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.1 2010/11/10 11:13:15 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.2 2010/12/07 10:34:32 eras Exp $
 
-opts="${opts} reload debug debug-sa"
+opts="${opts} reload debug debug_sa"
 
 prog="/usr/sbin/amavisd"
 progname="amavisd-new"
@@ -63,7 +63,7 @@
 	eend $?
 }
 
-debug-sa() {
+debug_sa() {
 	ebegin "Starting ${progname} in debug-sa mode"
 	checkconfig || return 1
 	"${prog}" debug-sa






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in mail-filter/amavisd-new/files: amavisd.initd
@ 2012-01-06 11:38 Eray Aslan (eras)
  0 siblings, 0 replies; 5+ messages in thread
From: Eray Aslan (eras) @ 2012-01-06 11:38 UTC (permalink / raw
  To: gentoo-commits

eras        12/01/06 11:38:35

  Modified:             amavisd.initd
  Log:
  fix in init script - bug #397763
  
  (Portage version: 2.1.10.44/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  mail-filter/amavisd-new/files/amavisd.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?r1=1.2&r2=1.3

Index: amavisd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amavisd.initd	7 Dec 2010 10:34:32 -0000	1.2
+++ amavisd.initd	6 Jan 2012 11:38:35 -0000	1.3
@@ -1,9 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# 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.2 2010/12/07 10:34:32 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.3 2012/01/06 11:38:35 eras Exp $
 
-opts="${opts} reload debug debug_sa"
+extra_started_commands="reload"
+extra_commands="debug debug_sa"
 
 prog="/usr/sbin/amavisd"
 progname="amavisd-new"
@@ -20,7 +21,7 @@
 	if [ -r "${conffile}" ] ; then
 		pidfile=$(grep -m1 ^[^#].*pid_file "${conffile}"|sed -e 's/.*"\(.*\)".*/\1/')
 		piddir=${pidfile%/*}
-		if [ ! -d "${piddir:-/var/amavis}" ] ; then
+		if [ ! -d "${piddir:=/var/amavis}" ] ; then
 			checkpath -q -d -o root:amavis -m 0770 "${piddir}" || return 1
 		fi
 	else






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in mail-filter/amavisd-new/files: amavisd.initd
@ 2012-01-10 13:46 Eray Aslan (eras)
  0 siblings, 0 replies; 5+ messages in thread
From: Eray Aslan (eras) @ 2012-01-10 13:46 UTC (permalink / raw
  To: gentoo-commits

eras        12/01/10 13:46:47

  Modified:             amavisd.initd
  Log:
  don't try to parse the config file - bug #397763
  
  (Portage version: 2.1.10.44/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  mail-filter/amavisd-new/files/amavisd.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?r1=1.3&r2=1.4

Index: amavisd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- amavisd.initd	6 Jan 2012 11:38:35 -0000	1.3
+++ amavisd.initd	10 Jan 2012 13:46:47 -0000	1.4
@@ -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 @@
 	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 @@
 
 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 $?
 }






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in mail-filter/amavisd-new/files: amavisd.initd
@ 2012-08-24 18:25 Christian Ruppert (idl0r)
  0 siblings, 0 replies; 5+ messages in thread
From: Christian Ruppert (idl0r) @ 2012-08-24 18:25 UTC (permalink / raw
  To: gentoo-commits

idl0r       12/08/24 18:25:20

  Modified:             amavisd.initd
  Log:
  Redirect stdout instead of stderr. Whitespace.
  
  (Portage version: 2.2.0_alpha121/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  mail-filter/amavisd-new/files/amavisd.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?r1=1.4&r2=1.5

Index: amavisd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- amavisd.initd	10 Jan 2012 13:46:47 -0000	1.4
+++ amavisd.initd	24 Aug 2012 18:25:20 -0000	1.5
@@ -1,7 +1,7 @@
 #!/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.4 2012/01/10 13:46:47 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.5 2012/08/24 18:25:20 idl0r Exp $
 
 extra_started_commands="reload"
 extra_commands="debug debug_sa"
@@ -23,21 +23,13 @@
 
 stop() {
 	ebegin "Stopping ${progname}"
-	"${prog}" stop 2>/dev/null
+	"${prog}" stop 1>/dev/null
 	eend $?
 }
 
 reload() {
 	ebegin "Reloading ${progname}"
-	"${prog}" reload 2>/dev/null
-	eend $?
-}
-
-restart() {
-	ebegin "Restarting ${progname}"
-	svc_stop
-	sleep 3
-	svc_start
+	"${prog}" reload 1>/dev/null
 	eend $?
 }
 





^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2012-08-24 18:25 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-24 18:25 [gentoo-commits] gentoo-x86 commit in mail-filter/amavisd-new/files: amavisd.initd Christian Ruppert (idl0r)
  -- strict thread matches above, loose matches on Subject: below --
2012-01-10 13:46 Eray Aslan (eras)
2012-01-06 11:38 Eray Aslan (eras)
2010-12-07 10:34 Eray Aslan (eras)
2010-11-10 11:13 Eray Aslan (eras)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox