From cf41b77ac20cb46cc5556561528cb788a3fe42fc Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 29 Oct 2014 20:25:06 -0500
Subject: fix openntpd startup script, reported by joerg

---
 package/openntpd/Makefile                |  3 ++-
 package/openntpd/files/ntpd.init         | 29 -----------------------------
 package/openntpd/files/openntpd.init     | 29 +++++++++++++++++++++++++++++
 package/openntpd/files/openntpd.postinst |  4 ++--
 4 files changed, 33 insertions(+), 32 deletions(-)
 delete mode 100644 package/openntpd/files/ntpd.init
 create mode 100644 package/openntpd/files/openntpd.init

(limited to 'package/openntpd')

diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile
index bfe60ea58..076957f1f 100644
--- a/package/openntpd/Makefile
+++ b/package/openntpd/Makefile
@@ -5,13 +5,14 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		openntpd
 PKG_VERSION:=		3.9p1
-PKG_RELEASE:=		18
+PKG_RELEASE:=		19
 PKG_MD5SUM:=		afc34175f38d08867c1403d9008600b3
 PKG_DESCR:=		ntp server daemon
 PKG_SECTION:=		net/ntp
 PKG_DEPENDS:=		libopenssl
 PKG_URL:=		http://www.openntpd.org/
 PKG_SITES:=		ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/
+PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/openntpd/files/ntpd.init b/package/openntpd/files/ntpd.init
deleted file mode 100644
index 02239f318..000000000
--- a/package/openntpd/files/ntpd.init
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#PKG openntpd
-#INIT 55
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
-	test x"${ntpd:-NO}" = x"NO" && exit 0
-	test x"$ntpd" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
-        exec sh $0 start
-        ;;
-start)
-	mkdir -p /tmp/.ntp
-	/usr/sbin/ntpd $ntpd_flags
-	;;
-stop)
-	kill $(pgrep -f /usr/sbin/ntpd)
-	;;
-restart)
-	sh $0 stop
-	sh $0 start
-	;;
-*)
-	echo "Usage: $0 {start | stop | restart}"
-	exit 1
-	;;
-esac
-exit $?
diff --git a/package/openntpd/files/openntpd.init b/package/openntpd/files/openntpd.init
new file mode 100644
index 000000000..f21bd730a
--- /dev/null
+++ b/package/openntpd/files/openntpd.init
@@ -0,0 +1,29 @@
+#!/bin/sh
+#PKG openntpd
+#INIT 55
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${openntpd:-NO}" = x"NO" && exit 0
+	test x"$openntpd" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
+        exec sh $0 start
+        ;;
+start)
+	mkdir -p /tmp/.ntp &> /dev/null
+	/usr/sbin/ntpd $openntpd_flags
+	;;
+stop)
+	kill $(pgrep -f /usr/sbin/ntpd)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "Usage: $0 {start | stop | restart}"
+	exit 1
+	;;
+esac
+exit $?
diff --git a/package/openntpd/files/openntpd.postinst b/package/openntpd/files/openntpd.postinst
index 1e4f34da1..1688c112c 100644
--- a/package/openntpd/files/openntpd.postinst
+++ b/package/openntpd/files/openntpd.postinst
@@ -4,5 +4,5 @@ gid=$(get_next_gid)
 add_group ntp $gid
 add_user ntp $(get_next_uid) $gid /tmp/.ntp
 add_service ntp 123/udp
-add_rcconf ntpd_flags "-s"
-add_rcconf ntpd NO
+add_rcconf openntpd_flags "-s"
+add_rcconf openntpd NO
-- 
cgit v1.2.3