Changeset d30e6bd in freewrt for package/openntpd

Timestamp:

Jul 22, 2006, 6:50:15 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

0511771

Parents:

621ecb5

Message:

• base-files: we'll have variables of the style | firewall=NO | ssh=YES and variables of the style | ntpd_flags=-s | ntpd_flags="" | ntpd_flags=NO
• openntpd: convert to use functions.sh stuff

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@369 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/openntpd

Files:

• Makefile (modified) (2 diffs)
• files/ntpd.init (modified) (1 diff)
• ipkg/openntpd.postinst (modified) (2 diffs)

package/openntpd/Makefile

@@ -1 @@
-# $Id: Makefile 3274 2006-02-25 23:32:40Z florian $
+# $FreeWRT$
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=openntpd
-PKG_VERSION:=3.7p1
-PKG_RELEASE:=1
-PKG_MD5SUM:=10ed8eefd760e5819efcf3277b118f47
+PKG_NAME:=              openntpd
+PKG_VERSION:=           3.7p1
+PKG_RELEASE:=           2
+PKG_MD5SUM:=            10ed8eefd760e5819efcf3277b118f47
 
 # space separated list or special @SF for sourceforge projects
-PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
-        ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenNTPD/ \
-        ftp://ftp.fr.openbsd.org/pub/OpenBSD/OpenNTPD/ \
-        ftp://ftp.sunet.se/pub/OpenBSD/OpenNTPD/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-
+PKG_SOURCE_URL:=        ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
+                        ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenNTPD/ \
+                        ftp://ftp.fr.openbsd.org/pub/OpenBSD/OpenNTPD/ \
+                        ftp://ftp.sunet.se/pub/OpenBSD/OpenNTPD/
+PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(TOPDIR)/package/rules.mk
@@ -63 +62 @@
         $(RSTRIP) $(IDIR_OPENNTPD)
         $(IPKG_BUILD) $(IDIR_OPENNTPD) $(PACKAGE_DIR)
-

package/openntpd/files/ntpd.init

@@ -1 +1 @@
 #!/bin/sh
-mkdir -p `awk -F: '/^ntp:/{print $6}' /etc/passwd`
-/usr/sbin/ntpd -s
+. /etc/rc.conf
+mkdir -p /tmp/.ntp
+[ x"$ntpd_flags" = x"NO" ] || /usr/sbin/ntpd $ntpd_flags

package/openntpd/ipkg/openntpd.postinst

@@ -1 +1 @@
 #!/bin/sh
-
-name=ntp
-id=50
 
 # do not change below
@@ -21 +18 @@
 fi
 
-echo ""
-if [ -z "$(grep ^\\${name}: ${IPKG_INSTROOT}/etc/group)" ]; then 
-        echo "adding group $name to /etc/group"
-        echo "${name}:x:${id}:" >> ${IPKG_INSTROOT}/etc/group  
-fi
-
-if [ -z "$(grep ^\\${name}: ${IPKG_INSTROOT}/etc/passwd)" ]; then 
-        echo "adding user $name to /etc/passwd"
-        echo "${name}:x:${id}:${id}:${name}:/tmp/.${name}:/bin/false" >> ${IPKG_INSTROOT}/etc/passwd
-fi
-
-grep -q '^ntp[[:space:]]*123/udp' ${IPKG_INSTROOT}/etc/services 2>/dev/null
-[ $? -ne 0 ] && echo "ntp       123/udp" >>${IPKG_INSTROOT}/etc/services
+gid=$(get_next_gid)
+add_group ntp $gid
+add_user ntp $(get_next_uid) $gid /tmp/.ntp
+add_service ntp 123/udp
+add_rcconf openntpd ntpd_flags -s