Thread: [Astlinux-commits] SF.net SVN: astlinux: [1519] trunk/package (Page 4)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1519
          http://astlinux.svn.sourceforge.net/astlinux/?rev=1519&view=rev
Author:   krisk84
Date:     2008-01-14 13:19:27 -0800 (Mon, 14 Jan 2008)

Log Message:
-----------
u-del ntp update

Modified Paths:
--------------
    trunk/package/ntp/Config.in
    trunk/package/ntp/ntp.mk
    trunk/package/openntpd/Config.in

Added Paths:
-----------
    trunk/package/ntp/ntpd.init

Removed Paths:
-------------
    trunk/package/ntp/ntp-configure.patch
    trunk/package/ntp/ntp-cross-compile.patch
    trunk/package/ntp/ntp-var-fix.patch

Modified: trunk/package/ntp/Config.in
===================================================================

--- trunk/package/ntp/Config.in	2008-01-14 17:35:11 UTC (rev 1518)
+++ trunk/package/ntp/Config.in	2008-01-14 21:19:27 UTC (rev 1519)
@@ -3,6 +3,6 @@
 	default n
 	help
 	  Network Time Protocol suite/programs.
-	  Provides things like ntpd, ntpdate, ntpq, etc...
+	  Provides ntpd, and ntpq
 
 	  http://www.ntp.org/

Deleted: trunk/package/ntp/ntp-configure.patch
===================================================================
--- trunk/package/ntp/ntp-configure.patch	2008-01-14 17:35:11 UTC (rev 1518)
+++ trunk/package/ntp/ntp-configure.patch	2008-01-14 21:19:27 UTC (rev 1519)
@@ -1,16 +0,0 @@
---- ntp/configure.orig	2006-02-15 23:18:42.000000000 -0500
-+++ ntp/configure	2006-02-15 23:20:05.000000000 -0500
-@@ -19399,11 +19399,11 @@
-   ac_cv_var_ntp_syscalls=no
-  case "$ac_cv_func___adjtimex" in
-   yes)
--    ac_cv_var_ntp_syscalls=libc
-+    ac_cv_var_ntp_syscalls=no
-     ;;
-   *) case "$ac_cv_func_ntp_adjtime$ac_cv_func_ntp_gettime" in
-       yesyes)
--        ac_cv_var_ntp_syscalls=libc
-+        ac_cv_var_ntp_syscalls=no
-         ;;
-       *) cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"

Deleted: trunk/package/ntp/ntp-cross-compile.patch
===================================================================
--- trunk/package/ntp/ntp-cross-compile.patch	2008-01-14 17:35:11 UTC (rev 1518)
+++ trunk/package/ntp/ntp-cross-compile.patch	2008-01-14 21:19:27 UTC (rev 1519)
@@ -1,11 +0,0 @@
---- ntp/ntpdc/Makefile.in
-+++ ntp/ntpdc/Makefile.in
-@@ -157,7 +157,7 @@
- bin_PROGRAMS = ntpdc
- EXTRA_PROGRAMS = ntpdc-layout
- EXTRA_DATA = check-layout
--BUILT_SOURCES = maybe-layout
-+BUILT_SOURCES = 
- INCLUDES = -I$(top_srcdir)/include
- # LDADD might need RESLIB and ADJLIB
- ntpdc_LDADD = version.o ../libntp/libntp.a @READLINE_LIBS@

Deleted: trunk/package/ntp/ntp-var-fix.patch
===================================================================
--- trunk/package/ntp/ntp-var-fix.patch	2008-01-14 17:35:11 UTC (rev 1518)
+++ trunk/package/ntp/ntp-var-fix.patch	2008-01-14 21:19:27 UTC (rev 1519)
@@ -1,15 +0,0 @@
---- ntp/util/tickadj.c.orig	2006-02-15 22:58:31.000000000 -0500
-+++ ntp/util/tickadj.c	2006-02-15 22:59:31.000000000 -0500
-@@ -180,7 +180,11 @@
- # include <sys/resource.h>
- # include <sys/file.h>
- # include <a.out.h>
--# include <sys/var.h>
-+
-+# ifdef HAVE_SYS_VAR_H
-+#  include <sys/var.h>
-+# endif
-+
- #endif
- 
- #include "ntp_io.h"

Modified: trunk/package/ntp/ntp.mk
===================================================================
--- trunk/package/ntp/ntp.mk	2008-01-14 17:35:11 UTC (rev 1518)
+++ trunk/package/ntp/ntp.mk	2008-01-14 21:19:27 UTC (rev 1519)
@@ -3,13 +3,13 @@
 # ntp
 #
 #############################################################
-NTP_VERSION:=4.2.0
+NTP_VERSION:=4.2.4p4
 NTP_SOURCE:=ntp-$(NTP_VERSION).tar.gz
 NTP_SITE:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4
 NTP_DIR:=$(BUILD_DIR)/ntp-$(NTP_VERSION)
 NTP_CAT:=zcat
-NTP_BINARY:=ntpdate/ntpdate
-NTP_TARGET_BINARY:=usr/bin/ntpdate
+NTP_BINARY:=ntpq/ntpq
+NTP_TARGET_BINARY:=usr/bin/ntpq
 
 $(DL_DIR)/$(NTP_SOURCE):
 	$(WGET) -P $(DL_DIR) $(NTP_SITE)/$(NTP_SOURCE)
@@ -18,9 +18,6 @@
 
 $(NTP_DIR)/.unpacked: $(DL_DIR)/$(NTP_SOURCE)
 	$(NTP_CAT) $(DL_DIR)/$(NTP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(NTP_DIR) package/ntp/ ntp\*.patch
-	$(SED) "s,^#if.*__GLIBC__.*_BSD_SOURCE.*$$,#if 0," \
-		$(NTP_DIR)/ntpd/refclock_pcf.c;
 	touch $(NTP_DIR)/.unpacked
 
 $(NTP_DIR)/.configured: $(NTP_DIR)/.unpacked
@@ -55,6 +52,8 @@
 $(TARGET_DIR)/$(NTP_TARGET_BINARY): $(NTP_DIR)/$(NTP_BINARY)
 	install -m 755 $(NTP_DIR)/ntpd/ntpd $(TARGET_DIR)/usr/sbin/ntpd
 	install -m 755 $(NTP_DIR)/$(NTP_BINARY) $(TARGET_DIR)/$(NTP_TARGET_BINARY)
+	install -m 755 package/ntp/ntpd.init $(TARGET_DIR)/etc/init.d/ntpd
+	ln -sf /tmp/etc/ntpd.conf $(TARGET_DIR)/etc/ntpd.conf
 
 ntp: uclibc $(TARGET_DIR)/$(NTP_TARGET_BINARY)
 

Added: trunk/package/ntp/ntpd.init
===================================================================
--- trunk/package/ntp/ntpd.init	                        (rev 0)
+++ trunk/package/ntp/ntpd.init	2008-01-14 21:19:27 UTC (rev 1519)
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+init () {
+if [ -r /mnt/kd/ntpd.conf ]
+then
+ln -s /mnt/kd/ntpd.conf /tmp/etc/ntpd.conf
+else
+if [ "$NTPSERV" ]
+then
+echo "server $NTPSERV" > /tmp/etc/ntpd.conf
+echo "driftfile /var/db/ntpd.drift" >> /tmp/etc/ntpd.conf
+fi
+
+if [ "$NTPSERVS" ]
+then
+echo "# NTPd" > /tmp/etc/ntpd.conf
+for i in $NTPSERVS
+do
+echo "server $i" >> /tmp/etc/ntpd.conf
+done
+echo "driftfile /var/db/ntpd.drift" >> /tmp/etc/ntpd.conf
+fi
+
+fi
+}
+
+start () {
+if [ -r /etc/ntpd.conf ]
+then
+echo "Starting ntpd..."
+# Set the clock (large change) and exit
+ntpd -g -q -c /etc/ntpd.conf
+sleep 1
+# Maintain the clock (small changes)
+ntpd -c /etc/ntpd.conf
+fi
+}
+
+stop () {
+if `ps | grep -q ntpd`
+then
+echo "Stopping ntpd..."
+killall ntpd 2> /dev/null
+fi
+}
+
+case $1 in
+
+start)
+start
+;;
+
+stop)
+stop
+;;
+
+init)
+init
+start
+;;
+
+restart)
+stop
+sleep 2
+start
+;;
+
+*)
+echo "Usage: start|stop|restart"
+;;
+
+esac
+

Modified: trunk/package/openntpd/Config.in
===================================================================
--- trunk/package/openntpd/Config.in	2008-01-14 17:35:11 UTC (rev 1518)
+++ trunk/package/openntpd/Config.in	2008-01-14 21:19:27 UTC (rev 1519)
@@ -5,4 +5,4 @@
 	     OpenNTPD is an easy to use implementation of the Network Time
 	     Protocol. It provides the ability to sync the local clock
 	     to remote NTP servers and can act as NTP server itself,
-	     redistributing the local clock. It just works.
+	     redistributing the local clock.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Astlinux-commits] SF.net SVN: astlinux: [1519] trunk/package (Page 4)

astlinux-commits