openntpd: merge r28620, r28621

SVN-Revision: 28642

diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index 980d631f9eccb208291dd2c01b51b39eeaef0d38..d6c139cc955a689c6a75494aaa7fd439493f4860 100644 (file)
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openntpd
 PKG_VERSION:=3.9p1
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
@@ -50,8 +50,8 @@ define Build/Compile
 endef
 
 define Package/openntpd/install        
-       $(INSTALL_DIR) $(1)/usr/sbin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpd $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/sbin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpd $(1)/sbin/
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_DATA) ./files/ntpd.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/init.d
@@ -60,4 +60,16 @@ define Package/openntpd/install
        $(INSTALL_BIN) ./files/ntpd.hotplug $(1)/etc/hotplug.d/iface/20-ntpd
 endef
 
+define Package/openntpd/postinst
+#!/bin/sh
+[ -L "$${IPKG_INSTROOT}/usr/sbin/ntpd" ] && rm -f "$${IPKG_INSTROOT}/usr/sbin/ntpd"
+exit 0
+endef
+
+define Package/openntpd/postrm
+#!/bin/sh
+/bin/busybox ntpd -h 2>&1 | grep -q BusyBox && ln -sf ../../bin/busybox /usr/sbin/ntpd
+exit 0
+endef
+
 $(eval $(call BuildPackage,openntpd))

diff --git a/net/openntpd/files/ntpd.init b/net/openntpd/files/ntpd.init
index 738007c38ca410db192b99a170a725ff1669b2cd..ea5fc3b08a28f40dd398eb9af6176d5e807e8c57 100644 (file)
--- a/net/openntpd/files/ntpd.init
+++ b/net/openntpd/files/ntpd.init
@@ -10,7 +10,7 @@ boot() {
 start() {
        mkdir -p `awk -F: '/^network:/{print $6}' /etc/passwd`
        mkdir -p /var/db/
-       /usr/sbin/ntpd -s
+       /sbin/ntpd -s
 }
 
 stop() {