testing/dkimproxy: Fixes #1474, bump pkgrel.

5 files changed, 64 insertions, 11 deletions

diff --git a/testing/dkimproxy/APKBUILD b/testing/dkimproxy/APKBUILD
index 3f236f3eb9..34265ef331 100644
--- a/testing/dkimproxy/APKBUILD
+++ b/testing/dkimproxy/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=dkimproxy
 pkgver=1.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="SMTP-proxy that signs and/or verifies emails, using the Mail::DKIM module"
 url="http://dkimproxy.sourceforge.net/"
 arch="noarch"
@@ -15,6 +15,8 @@ subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	dkimproxy.in.initd
 	dkimproxy.out.initd
+	dkimproxy.in.confd
+	dkimproxy.out.confd
 	"
 
 
@@ -48,8 +50,15 @@ package() {
 		"$pkgdir"/etc/init.d/$pkgname.in
 	install -D -m755 "$srcdir"/$pkgname.out.initd \
 		"$pkgdir"/etc/init.d/$pkgname.out
+	install -D -m755 "$srcdir"/$pkgname.in.confd \
+		"$pkgdir"/etc/conf.d/$pkgname.in
+	install -D -m755 "$srcdir"/$pkgname.out.confd \
+		"$pkgdir"/etc/conf.d/$pkgname.out
+	
 }
 
 md5sums="3ecaa38a8c865a5b7682f7f261354218  dkimproxy-1.4.1.tar.gz
-fe974cf486e0aee1eddd65a5a36fdb83  dkimproxy.in.initd
-f7e1fbcf11ebf04d0127a8e97a85fa67  dkimproxy.out.initd"
+825ed04082c623be6b53933424534d88  dkimproxy.in.initd
+9d88fb0db1e9829803492cc508840dde  dkimproxy.out.initd
+ed0a3b96bfa39456b8c140bb7299590e  dkimproxy.in.confd
+29bd82752fb872abcd7711244de6bc09  dkimproxy.out.confd"
diff --git a/testing/dkimproxy/dkimproxy.in.confd b/testing/dkimproxy/dkimproxy.in.confd
new file mode 100644
index 0000000000..e10508a436
--- /dev/null
+++ b/testing/dkimproxy/dkimproxy.in.confd
@@ -0,0 +1,3 @@
+#OPTS=""
+CONFIGFILE="/etc/dkimproxy/dkimproxy_in.conf"
+PIDFILE="/var/run/dkimproxy_in.pid"
diff --git a/testing/dkimproxy/dkimproxy.in.initd b/testing/dkimproxy/dkimproxy.in.initd
index 1649f66da7..0eb5a9b89e 100644
--- a/testing/dkimproxy/dkimproxy.in.initd
+++ b/testing/dkimproxy/dkimproxy.in.initd
@@ -1,12 +1,31 @@
 #!/sbin/runscript
 
-command="/usr/sbin/${RC_SVCNAME}"
-command_args="${OPTS}"
-pidfile="/var/run/${RC_SVCNAME}.pid"
-description="SMTP proxy that verifies signature on incomming messages"
+description="SMTP proxy that verifies signature on incoming messages"
 
 depend() {
 	need net
 	after firewall
 }
 
+checkconfig() {
+	if [ ! -f ${CONFIGFILE} ]; then
+		eerror "Missing configuration file ${CONFIGFILE}"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting dkimproxy.in"
+	start-stop-daemon --start -q --exec /usr/sbin/dkimproxy.in \
+		--pidfile "${PIDFILE}" --make-pidfile --background \
+		-- --conf_file=${CONFIGFILE} ${OPTS}
+	eend $?
+}
+
+
+stop() {
+	ebegin "Stopping dkimproxy.in"
+	start-stop-daemon --stop -q --pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/testing/dkimproxy/dkimproxy.out.confd b/testing/dkimproxy/dkimproxy.out.confd
new file mode 100644
index 0000000000..570b0bc078
--- /dev/null
+++ b/testing/dkimproxy/dkimproxy.out.confd
@@ -0,0 +1,3 @@
+#OPTS=""
+CONFIGFILE="/etc/dkimproxy/dkimproxy_out.conf"
+PIDFILE="/var/run/dkimproxy_out.pid"
diff --git a/testing/dkimproxy/dkimproxy.out.initd b/testing/dkimproxy/dkimproxy.out.initd
index 7e395412fc..ec1fba8869 100644
--- a/testing/dkimproxy/dkimproxy.out.initd
+++ b/testing/dkimproxy/dkimproxy.out.initd
@@ -1,12 +1,31 @@
 #!/sbin/runscript
 
-command="/usr/sbin/${RC_SVCNAME}"
-command_args="${OPTS}"
-pidfile="/var/run/${RC_SVCNAME}.pid"
-description="SMTP proxy that signs outgoing messages"
+description="SMTP proxy that verifies signature on outgoing messages"
 
 depend() {
 	need net
 	after firewall
 }
 
+checkconfig() {
+	if [ ! -f ${CONFIGFILE} ]; then
+		eerror "Missing configuration file ${CONFIGFILE}"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting dkimproxy.out"
+	start-stop-daemon --start -q --exec /usr/sbin/dkimproxy.out \
+		--pidfile "${PIDFILE}" --make-pidfile --background \
+		-- --conf_file=${CONFIGFILE} ${OPTS}
+	eend $?
+}
+
+
+stop() {
+	ebegin "Stopping dkimproxy.out"
+	start-stop-daemon --stop -q --pidfile "${PIDFILE}"
+	eend $?
+}