Update of /cvsroot/leaf/src/bering-uclibc/apps/ntp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21289

Modified Files:
        buildtool.cfg buildtool.mk ntp.conf ntp.txt ntpdate.cron 
        ntpdate.init 
Added Files:
        ntp_4.2.0a+stable-2.diff.gz ntp_4.2.0a+stable.orig.tar.gz 
        ntpdate.default 
Removed Files:
        ntp-servers ntp_4.1.0-8.diff.gz ntp_4.1.0.orig.tar.gz 
Log Message:
update to ntp 4.2.0

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/ntp/buildtool.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** buildtool.mk        16 Feb 2005 21:40:05 -0000      1.5
--- buildtool.mk        23 Mar 2005 21:28:48 -0000      1.6
***************
*** 2,6 ****
  include $(MASTERMAKEFILE)
  
! NTP_DIR:=ntp-4.1.0
  NTP_TARGET_DIR:=$(BT_BUILD_DIR)/ntp
  
--- 2,6 ----
  include $(MASTERMAKEFILE)
  
! NTP_DIR:=ntp-4.2.0a+stable.orig
  NTP_TARGET_DIR:=$(BT_BUILD_DIR)/ntp
  
***************
*** 14,23 ****
                          
  $(NTP_DIR)/.configured: $(NTP_DIR)/.source
!       (cd $(NTP_DIR); touch aclocal.m4 configure config.h.in);
!       find $(NTP_DIR) -name Makefile.in -exec touch {} \;
!       (cd $(NTP_DIR) ; CC=$(TARGET_CC) LD=$(TARGET_LD) LDFLAGS="-s"  
CFLAGS="$(BT_COPT_FLAGS)" \
        ./configure --prefix=/usr \
        --without-openssl-libdir \
        --without-openssl-incdir \
        --disable-all-clocks \
        --disable-parse-clocks \
--- 14,25 ----
                          
  $(NTP_DIR)/.configured: $(NTP_DIR)/.source
! #     (cd $(NTP_DIR); touch aclocal.m4 configure config.h.in);
! #     find $(NTP_DIR) -name Makefile.in -exec touch {} \;
!       (cd $(NTP_DIR) ; autoconf ; chmod +x ./configure ; \
!       CC=$(TARGET_CC) LD=$(TARGET_LD) LDFLAGS="-s"  CFLAGS="$(BT_COPT_FLAGS)" 
\
        ./configure --prefix=/usr \
        --without-openssl-libdir \
        --without-openssl-incdir \
+       --without-crypto \
        --disable-all-clocks \
        --disable-parse-clocks \
***************
*** 25,28 ****
--- 27,34 ----
        
        touch $(NTP_DIR)/.configured
+ 
+ #     --host=$(GNU_HOST_NAME) \
+ #     --build=$(GNU_HOST_NAME) \
+ 
                                                                   
  $(NTP_DIR)/.build: $(NTP_DIR)/.configured
***************
*** 35,45 ****
        mkdir -p $(NTP_TARGET_DIR)/usr/sbin             
        make -C $(NTP_DIR) all  
!       #make DESTDIR=$(NTP_TARGET_DIR) -C $(NTP_DIR) install 
!       -$(BT_STRIP) -s --remove-section=.note --remove-section=.comment 
$(NTP_DIR)/ntpdate/*
!       -$(BT_STRIP) -s --remove-section=.note --remove-section=.comment 
$(NTP_DIR)/ntpd/ntpd   
        cp -a $(NTP_DIR)/ntpdate/ntpdate $(NTP_TARGET_DIR)/usr/sbin     
-       cp -a $(NTP_DIR)/ntpdate/ntptimeset $(NTP_TARGET_DIR)/usr/sbin  
        cp -a $(NTP_DIR)/ntpd/ntpd $(NTP_TARGET_DIR)/usr/sbin   
!       cp -a ntp-servers $(NTP_TARGET_DIR)/etc/default
        cp -a ntpdate.cron $(NTP_TARGET_DIR)/etc/cron.d/ntpdate
        cp -a ntpdate.init $(NTP_TARGET_DIR)/etc/init.d/ntpdate 
--- 41,49 ----
        mkdir -p $(NTP_TARGET_DIR)/usr/sbin             
        make -C $(NTP_DIR) all  
!       -$(BT_STRIP) $(BT_STRIP_BINOPTS) $(NTP_DIR)/ntpdate/ntpdate
!       -$(BT_STRIP) $(BT_STRIP_BINOPTS) $(NTP_DIR)/ntpd/ntpd   
        cp -a $(NTP_DIR)/ntpdate/ntpdate $(NTP_TARGET_DIR)/usr/sbin     
        cp -a $(NTP_DIR)/ntpd/ntpd $(NTP_TARGET_DIR)/usr/sbin   
!       cp -a ntpdate.default $(NTP_TARGET_DIR)/etc/default/ntpdate
        cp -a ntpdate.cron $(NTP_TARGET_DIR)/etc/cron.d/ntpdate
        cp -a ntpdate.init $(NTP_TARGET_DIR)/etc/init.d/ntpdate 

Index: ntpdate.init
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/ntp/ntpdate.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ntpdate.init        18 Sep 2004 15:29:29 -0000      1.1
--- ntpdate.init        23 Mar 2005 21:32:22 -0000      1.2
***************
*** 1,22 ****
! #! /bin/sh 
  
  RCDLINKS="2,S51"
  
! error () {
!       echo "ntpdate error: $1"
!       exit 1
! }
  
! test -f /usr/sbin/ntpdate || error "not found"
! test -f /etc/default/ntp-servers || error "ntp-servers file not found"
  
! . /etc/default/ntp-servers
  
! test -n "$NTPSERVERS" || error "NTPSERVERS undefined"
  
  case "$1" in
! start|restart|force-reload)
    echo -n "Running ntpdate to synchronize clock"
!   /usr/sbin/ntpdate -u -b -s $NTPSERVERS
    echo "."
    ;;
--- 1,28 ----
! #!/bin/sh
  
  RCDLINKS="2,S51"
  
! PATH=/sbin:/bin
  
! test -f /usr/sbin/ntpdate || exit 0
  
! if test -f /etc/default/ntpdate ; then
! . /etc/default/ntpdate
! else
! NTPSERVERS="pool.ntp.org"
! fi
  
! test -n "$NTPSERVERS" || exit 0
  
  case "$1" in
! start|force-reload)
    echo -n "Running ntpdate to synchronize clock"
!   /usr/sbin/ntpdate -b -s $NTPOPTIONS $NTPSERVERS
!   echo "."
!   ;;
! restart|reload)
!   # Drop -b to slew clock rather than step it if called after system is up
!   echo -n "Running ntpdate to synchronize clock"
!   /usr/sbin/ntpdate -s $NTPOPTIONS $NTPSERVERS
    echo "."
    ;;
***************
*** 24,28 ****
    ;;
  *)
!   echo "Usage: /etc/init.d/ntpdate {start|stop|restart|force-reload}"
    exit 1
  esac
--- 30,34 ----
    ;;
  *)
!   echo "Usage: /etc/init.d/ntpdate {start|stop|restart|reload|force-reload}"
    exit 1
  esac

Index: ntp.conf
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/ntp/ntp.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ntp.conf    23 Mar 2005 20:10:40 -0000      1.2
--- ntp.conf    23 Mar 2005 21:28:53 -0000      1.3
***************
*** 16,20 ****
  #  *** Please consider joining the pool! ***
  #  ***  <http://www.pool.ntp.org/#join>  ***
! #server pool.ntp.org
  #server pool.ntp.org
  ## uncomment for extra reliability
--- 16,20 ----
  #  *** Please consider joining the pool! ***
  #  ***  <http://www.pool.ntp.org/#join>  ***
! server pool.ntp.org
  #server pool.ntp.org
  ## uncomment for extra reliability

Index: ntp.txt
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/ntp/ntp.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ntp.txt     24 Nov 2002 16:51:25 -0000      1.1.1.1
--- ntp.txt     23 Mar 2005 21:28:53 -0000      1.2
***************
*** 1,5 ****
- Source(s):
- ntp_4.1.0-8
- 
  Compile:
  ./ntp.mk
--- 1,2 ----

--- NEW FILE: ntp_4.2.0a+stable-2.diff.gz ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ntpdate.default ---
# servers to check.   (Separate multiple servers with spaces.)
NTPSERVERS="pool.ntp.org"
#
# additional options for ntpdate
#NTPOPTIONS="-v"
NTPOPTIONS="-u"

--- ntp-servers DELETED ---

Index: ntpdate.cron
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/ntp/ntpdate.cron,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ntpdate.cron        18 Sep 2004 15:29:29 -0000      1.1
--- ntpdate.cron        23 Mar 2005 21:32:21 -0000      1.2
***************
*** 1,3 ****
  #Periodic schedule for ntpdate
  #Default: Every 60 minutes
! */60  * * * * root    `/etc/init.d/ntpdate start`
--- 1,3 ----
  #Periodic schedule for ntpdate
  #Default: Every 60 minutes
! */60  * * * * root    `/etc/init.d/ntpdate restart`

--- ntp_4.1.0-8.diff.gz DELETED ---

Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/ntp/buildtool.cfg,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** buildtool.cfg       23 Mar 2005 19:15:25 -0000      1.5
--- buildtool.cfg       23 Mar 2005 21:28:44 -0000      1.6
***************
*** 5,9 ****
  </File>
  
! <File ntp_4.1.0.orig.tar.gz>
    Server = cvs-sourceforge
    Revision = HEAD
--- 5,9 ----
  </File>
  
! <File ntp_4.2.0a+stable.orig.tar.gz>
    Server = cvs-sourceforge
    Revision = HEAD
***************
*** 12,16 ****
  </File>
  
! <File ntp_4.1.0-8.diff.gz>
    Server = cvs-sourceforge
    Revision = HEAD
--- 12,16 ----
  </File>
  
! <File ntp_4.2.0a+stable-2.diff.gz>
    Server = cvs-sourceforge
    Revision = HEAD
***************
*** 19,23 ****
  </File>
  
! <File configure.patch.gz>
    Server = cvs-sourceforge
    Revision = HEAD
--- 19,23 ----
  </File>
  
! <File ntp-nolynx.patch.gz>
    Server = cvs-sourceforge
    Revision = HEAD
***************
*** 26,30 ****
  </File>
  
! <File ntp-servers>
    Server = cvs-sourceforge
    Revision = HEAD
--- 26,30 ----
  </File>
  
! <File ntpdate.default>
    Server = cvs-sourceforge
    Revision = HEAD
***************
*** 72,76 ****
  <Package>
        <ntpdate>
!               Version = 4.1.0-8
                Revision = 1
                
--- 72,76 ----
  <Package>
        <ntpdate>
!               Version = 4.2.0a-2
                Revision = 1
                
***************
*** 78,82 ****
                client for setting system time from NTP servers
                Homepage: http://www.ntp.org
-               Requires: libm.lrp
                LEAF package by __PACKAGER__, __BUILDDATE__
                EOF
--- 78,81 ----
***************
*** 94,99 ****
                <Contents>
                        <File>
!                               Filename        = etc/default/ntp-servers
!                               Source          = etc/default/ntp-servers
                                Description     = ntpdate server configuration
                                Type            = conf
--- 93,98 ----
                <Contents>
                        <File>
!                               Filename        = etc/default/ntpdate
!                               Source          = etc/default/ntpdate
                                Description     = ntpdate server configuration
                                Type            = conf
***************
*** 108,112 ****
                                Permissions = 600
                        </File>
-                       
                        <File>
                                Filename    = etc/init.d/ntpdate
--- 107,110 ----
***************
*** 119,130 ****
                                Filename    = usr/sbin/ntpdate
                                Source      = usr/sbin/ntpdate
-                               Description = ntpdate 
-                               Type        = binary
-                               Permissions = 755
-                       </File>
-                       <File>
-                               Filename    = usr/sbin/ntptimeset
-                               Source      = usr/sbin/ntptimeset
-                               Description = ntptimeset
                                Type        = binary
                                Permissions = 755
--- 117,120 ----
***************
*** 134,138 ****
        
        <ntpsimpl>
!               Version = 4.1.0-8
                Revision = 1
                
--- 124,128 ----
        
        <ntpsimpl>
!               Version = 4.2.0a-2
                Revision = 1
                
***************
*** 170,174 ****
                                Permissions = 600
                        </File>
- 
                        <File>
                                Filename        = etc/cron.weekly/ntpsimpl
--- 160,163 ----
***************
*** 178,182 ****
                                Permissions = 600
                        </File>
-                       
                        <File>
                                Filename    = etc/init.d/ntp
--- 167,170 ----
***************
*** 193,197 ****
                                Permissions = 755
                        </File>
- 
                        <File>
                                Filename    = var/lib/ntp
--- 181,184 ----
***************
*** 199,203 ****
                                Type        = list
                        </File>
- 
                        <File>
                                Filename    = var/lib/ntp/*
--- 186,189 ----

--- NEW FILE: ntp_4.2.0a+stable.orig.tar.gz ---
(This appears to be a binary file; contents omitted.)

--- ntp_4.1.0.orig.tar.gz DELETED ---



-------------------------------------------------------
This SF.net email is sponsored by Microsoft Mobile & Embedded DevCon 2005
Attend MEDC 2005 May 9-12 in Vegas. Learn more about the latest Windows
Embedded(r) & Windows Mobile(tm) platforms, applications & content.  Register
by 3/29 & save $300 http://ads.osdn.com/?ad_id=6883&alloc_id=15149&op=click
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits

Reply via email to