Merge pull request #1289 from clehner/master

Fix emailrelay init script

diff --git a/net/emailrelay/Makefile b/net/emailrelay/Makefile
index bbcd6148b4711abc4a7eff9be4fdc8c3f4c7e1c7..9352db7295bf19e8661f5770735fe744538c0a6b 100644 (file)
--- a/net/emailrelay/Makefile
+++ b/net/emailrelay/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=emailrelay
 PKG_VERSION:=1.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.gz
 PKG_SOURCE_URL:=@SF/emailrelay/$(PKG_VERSION)

diff --git a/net/emailrelay/files/emailrelay.init b/net/emailrelay/files/emailrelay.init
index c63d2f061c75ffcd259512d402550e0fe3c3e5fe..9fc33996ece2ee4388656bddef649a978a126d69 100644 (file)
--- a/net/emailrelay/files/emailrelay.init
+++ b/net/emailrelay/files/emailrelay.init
@@ -6,10 +6,10 @@ START=90
 
 start() {
         logger -t 'emailrelay' "Starting emailrelay service."
-        service_start emailrelay --as-server --poll 60 --forward-to smtpserver:smtpport --spool-dir /tmp --client-tls --client-auth /etc/emailrelay.auth --server-auth /etc/emailrelay.auth --log
+        service_start /usr/bin/emailrelay --as-server --poll 60 --forward-to smtpserver:smtpport --spool-dir /tmp --client-tls --client-auth /etc/emailrelay.auth --server-auth /etc/emailrelay.auth --log
 }
 
 stop() {
         logger -t 'emailrelay' "Stopping emailrelay service."
-        killall -9 emailrelay
+        service_stop /usr/bin/emailrelay
 }