From d7c0aed5ab029a04cd60356126d7feede60bfc0a Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 13 Aug 2009 11:53:16 +0000
Subject: main/gross: init.d script fix

we stop the daemon using --exec rather than pidfile. This is to make
sure that all threads (when using linuxthreads) are gone when restarting.

fixes #130
---
 main/gross/APKBUILD     | 4 ++--
 main/gross/grossd.initd | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/gross/APKBUILD b/main/gross/APKBUILD
index dd1104536c..48c4579225 100644
--- a/main/gross/APKBUILD
+++ b/main/gross/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gross
 pkgver=1.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Greylisting of suspicious sources"
 url="http://code.google.com/p/gross/"
 license="BSD"
@@ -46,7 +46,7 @@ build() {
 }
 
 md5sums="f8f81b36850dcda30cb81799b9cee3b6  gross-1.0.1.tar.gz
-b0d8635b64c4a90d72c49e868f4c4c32  grossd.initd
+5c8c2aa3ad8108812850717c6134493c  grossd.initd
 5ca1c6e51c3243236e6564480b20279b  grossd.confd
 bb75b119ac96b8f99831ce6df810003f  gross-1.0.1-configure.ac.patch
 7c504b653c71dcf7b192bc487b3516fd  gross-1.0.1-default-conf.patch
diff --git a/main/gross/grossd.initd b/main/gross/grossd.initd
index 3d1c43d708..4d59b623a9 100644
--- a/main/gross/grossd.initd
+++ b/main/gross/grossd.initd
@@ -4,6 +4,7 @@ NAME="grossd"
 DAEMON="/usr/sbin/$NAME"
 DAEMON_USER="gross"
 DAEMON_GROUP="gross"
+pidfile=/var/run/gross/$NAME.pid
 
 depend() {
 	need net
@@ -20,16 +21,15 @@ check_config() {
 start() {
 	check_config || return 1
 	ebegin "Starting ${NAME}"
-	start-stop-daemon --start --quiet \
+	start-stop-daemon --start --quiet --pidfile ${pidfile} \
 		--exec ${DAEMON} -- \
-		-p /var/run/gross/grossd.pid \
-		-u ${DAEMON_USER} ${OPTS}
+		-p ${pidfile} -u ${DAEMON_USER} ${OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ${NAME}"
-	start-stop-daemon --stop --pidfile /var/run/gross/grossd.pid
+	start-stop-daemon --stop --exec ${DAEMON}
 	eend $?
 }
 
-- 
cgit v1.2.3