openntpd: Sanitize, and drop old version

diff --git a/packages/openntpd/openntpd_3.6.1p1.bb b/packages/openntpd/openntpd_3.6.1p1.bb
deleted file mode 100644 (file)
index b924b4a..0000000
--- a/packages/openntpd/openntpd_3.6.1p1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DEPENDS += "openssl"
-DESCRIPTION = "OpenNTPD is a FREE, easy to use implementation of the \
-Network Time Protocol."
-HOMEPAGE = "http://www.openntpd.org/"
-LICENSE = "BSD"
-SECTION = "console/network"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-
-SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/openntpd-${PV}.tar.gz \
-          file://autofoo.patch;patch=1"
-S = "${WORKDIR}/openntpd-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF += "--disable-strip"

diff --git a/packages/openntpd/openntpd_3.7p1.bb b/packages/openntpd/openntpd_3.7p1.bb
index 4001eb7..d13f6d3 100644 (file)
--- a/packages/openntpd/openntpd_3.7p1.bb
+++ b/packages/openntpd/openntpd_3.7p1.bb
@@ -1,12 +1,12 @@
-DEPENDS += "openssl"
 DESCRIPTION = "OpenNTPD is a FREE, easy to use implementation of the \
 Network Time Protocol."
 HOMEPAGE = "http://www.openntpd.org/"
-LICENSE = "BSD"
 SECTION = "console/network"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
+LICENSE = "BSD"
+DEPENDS += "openssl"
 DEPENDS = "timezones"
-PR="r13"
+PR = "r13"
 
 SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \
            file://autofoo.patch;patch=1 \
@@ -18,9 +18,6 @@ S = "${WORKDIR}/openntpd-${PV}"
 
 inherit autotools update-rc.d
 
-INITSCRIPT_NAME = "openntpd"  
-INITSCRIPT_PARAMS = "defaults"
-
 EXTRA_OECONF += "CFLAGS=-DUSE_ADJTIMEX --disable-strip --prefix=/usr \
                 --sysconfdir=/etc  --with-privsep-path=/${localstatedir}/shared/empty \
                 --with-privsep-user=ntpd \
@@ -30,17 +27,20 @@ EXTRA_OECONF += "CFLAGS=-DUSE_ADJTIMEX --disable-strip --prefix=/usr \
 do_install_prepend() {
         install -d ${D}${sysconfdir}/init.d
 }
-
 do_install_append() {
         install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/openntpd
 }
 
-pkg_postrm () {
-        grep ntpd ${sysconfdir}/passwd && deluser ntpd 
-}
-
 pkg_postinst () {
         [ ! -d ${localstatedir}/shared ] && mkdir -p ${localstatedir}/shared
         grep ntpd ${sysconfdir}/passwd || adduser --disabled-password --home=${localstatedir}/shared/empty --ingroup nogroup ntpd
         chown root:root ${localstatedir}/shared/empty
 }
+
+pkg_postrm () {
+        grep ntpd ${sysconfdir}/passwd && deluser ntpd
+}
+
+INITSCRIPT_NAME = "openntpd"
+
+INITSCRIPT_PARAMS = "defaults"