[arch-commits] Commit in ntp/trunk (7 files)

Kevin Piché kevin at archlinux.org
Thu Feb 17 23:15:46 UTC 2011


    Date: Thursday, February 17, 2011 @ 18:15:46
  Author: kevin
Revision: 110231

upgpkg: ntp 4.2.6.p3-1
Updated to 4.2.6p3 and implemented FS#18469, replace ntpdate with ntpd -q

Modified:
  ntp/trunk/PKGBUILD
  ntp/trunk/changelog
  ntp/trunk/ntp-client.conf
  ntp/trunk/ntp.conf
  ntp/trunk/ntpdate
Deleted:
  ntp/trunk/fix-ipv6.patch
  ntp/trunk/ntp-4.2.4_p7-nano.patch

-------------------------+
 PKGBUILD                |   29 +++++++++++------------------
 changelog               |    7 +++++++
 fix-ipv6.patch          |   10 ----------
 ntp-4.2.4_p7-nano.patch |   20 --------------------
 ntp-client.conf         |   10 ++--------
 ntp.conf                |   21 +++++++++++++--------
 ntpdate                 |    7 ++++---
 7 files changed, 37 insertions(+), 67 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-17 23:09:19 UTC (rev 110230)
+++ PKGBUILD	2011-02-17 23:15:46 UTC (rev 110231)
@@ -2,8 +2,8 @@
 # Maintainer: kevin <kevin at archlinux.org>
 
 pkgname=ntp
-pkgver=4.2.6.p2
-_realver=4.2.6p2
+pkgver=4.2.6.p3
+_realver=4.2.6p3
 pkgrel=1
 pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync"
 arch=(i686 x86_64)
@@ -15,32 +15,25 @@
 options=('!emptydirs')
 changelog=changelog
 source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz
-	ntp-4.2.4_p7-nano.patch
-	fix-ipv6.patch
 	ntp-4.2.4-html2man.patch
 	ntp.conf
 	ntp-client.conf
 	ntpd
 	ntpdate)
-md5sums=('cf73cd85f248232c62f8029e6eb05938' '36c5711228cb0cf48966daa993e06f55'
-         '9dabdbc6b8cd020f2205515df7972c21' '1b04e888717bb31479a6087632981723'
-         '5bd3924f5720b97837969ec4ec4d5e09' 'c7f50632b69bd4f32cf052d0b1848463'
-         '46118a8ec2c4f5bbfafd730af21b7c03' '140855352baeb89da0c6c1c475c18b57')
+md5sums=('59876a9009b098ff59767ee45a88ebd2' '1b04e888717bb31479a6087632981723'
+         '398a7f270f6ae083f47f86eb8b557a75' '58997d6cf4846d80e35a01b855376a33'
+         '46118a8ec2c4f5bbfafd730af21b7c03' '486c0d16bb67cf26b4e64abddc50a573')
 
 build() {
   cd "$srcdir/$pkgname-$_realver"
-  # fix glibc build issue
-  patch -Np1 -i ../ntp-4.2.4_p7-nano.patch
-  # fix ipv6 support
-  patch -Np1 -i ../fix-ipv6.patch
   # fix man page generation
   patch -Np1 -i ../ntp-4.2.4-html2man.patch
   # configure
-  # 4.2.6p2 not finding rt lib: added LIS
   export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-  libtoolize --copy  --force
-  ac_cv_header_dns_sd_h=0 ./configure LIBS=-lrt --prefix=/usr --mandir=/usr/share/man --enable-linux-caps
-
+  # 4.2.6p3: aclocal too old, regenerate
+  rm -f aclocal.m4
+  libtoolize --copy --force
+  ac_cv_header_dns_sd_h=0 ./configure --prefix=/usr --mandir=/usr/share/man --enable-linux-caps
   # build
   make
 }
@@ -53,11 +46,11 @@
 
   # install conf files
   mkdir -p "$pkgdir/usr/share/ntp"
-  install -D -m644 conf/* "$pkgdir/usr/share/ntp/"
+  install -D -m644 conf/* "${pkgdir}/usr/share/ntp"
 
   # install launch scripts 
   mkdir -p "$pkgdir/etc/rc.d"
-  install -D -m755 "$srcdir"/{ntpd,ntpdate} "$pkgdir/etc/rc.d/"
+  install -D -m755 ${srcdir}/{ntpd,ntpdate} "$pkgdir/etc/rc.d"
 
   # install man pages
   cd html

Modified: changelog
===================================================================
--- changelog	2011-02-17 23:09:19 UTC (rev 110230)
+++ changelog	2011-02-17 23:15:46 UTC (rev 110231)
@@ -1,5 +1,12 @@
 2010-10-16  kevin  <kevin at archlinux.org>
 
+    * ntp 4.2.6p3
+    - Implemented FS#18469, replace ntpdate with ntpd -q
+    - Removed LIBS
+    - Removed old IPv6 and nano patch
+
+2010-10-16  kevin  <kevin at archlinux.org>
+
     * ntp 4.2.6p2
     - Added changelog
     - Set LIBS to use librt since configure doesn't set it

Deleted: fix-ipv6.patch
===================================================================
--- fix-ipv6.patch	2011-02-17 23:09:19 UTC (rev 110230)
+++ fix-ipv6.patch	2011-02-17 23:15:46 UTC (rev 110231)
@@ -1,10 +0,0 @@
---- ntp-4.2.4p7-orig/configure.ac	2009-06-18 14:48:12.151346763 +0200
-+++ ntp-4.2.4p7/configure.ac	2009-06-18 14:50:07.054692531 +0200
-@@ -4456,6 +4456,7 @@
- 		[
- 		    AC_LANG_PROGRAM(
- 			[
-+                            #define _GNU_SOURCE
- 			    #include <sys/types.h>
- 			    #include <sys/socket.h>
- 			    #include <netinet/in.h>

Deleted: ntp-4.2.4_p7-nano.patch
===================================================================
--- ntp-4.2.4_p7-nano.patch	2011-02-17 23:09:19 UTC (rev 110230)
+++ ntp-4.2.4_p7-nano.patch	2011-02-17 23:15:46 UTC (rev 110231)
@@ -1,20 +0,0 @@
-http://bugs.gentoo.org/270483
-
-ripped from fedora
-
---- ntp-4.2.4p7/include/ntp_syscall.h
-+++ ntp-4.2.4p7/include/ntp_syscall.h
-@@ -14,5 +14,13 @@
- # include <sys/timex.h>
- #endif
- 
-+#if defined(ADJ_NANO) && !defined(MOD_NANO)
-+#define MOD_NANO ADJ_NANO
-+#endif
-+
-+#if defined(ADJ_TAI) && !defined(MOD_TAI)
-+#define MOD_TAI ADJ_TAI
-+#endif
-+
- #ifndef NTP_SYSCALLS_LIBC
- #ifdef NTP_SYSCALLS_STD

Modified: ntp-client.conf
===================================================================
--- ntp-client.conf	2011-02-17 23:09:19 UTC (rev 110230)
+++ ntp-client.conf	2011-02-17 23:15:46 UTC (rev 110231)
@@ -1,11 +1,5 @@
-# change this to a server closer to your location
-NTP_CLIENT_SERVER="pool.ntp.org"
+# client options for "ntpd -q" - ntpdate equivalent
+NTP_CLIENT_OPTION="-g"
 
-# client options
-NTP_CLIENT_OPTION="-b -u"
-
-# timeout for the ntp-client
-NTPCLIENT_TIMEOUT=10
-
 # arguments passed to ntpd when started
 NTPD_ARGS="-g"

Modified: ntp.conf
===================================================================
--- ntp.conf	2011-02-17 23:09:19 UTC (rev 110230)
+++ ntp.conf	2011-02-17 23:15:46 UTC (rev 110231)
@@ -19,24 +19,24 @@
 # netselect -s 3 pool.ntp.org
 ##
 
-# you should not need to modify the following paths
-driftfile	/var/lib/ntp/ntp.drift
-
 #server ntplocal.example.com prefer 
 #server timeserver.example.org 
 
 # Warning: Using default NTP settings will leave your NTP
 # server accessible to all hosts on the Internet.
 
-# If you want to deny all machines (including your own)
-# from accessing the NTP server, uncomment:
+# A default deny all (including localhost) policy
+# To use this define restrictions for all servers and clients
 #restrict default ignore
+#restrict -6 default ignore
 
+# A more open policy, allow access but deny changing the configuration
+restrict default nomodify nopeer
+#restrict -6 default nomodify nopeer
 
-# To deny other machines from changing the
-# configuration but allow localhost:
-restrict default nomodify nopeer
+# Allow localhost
 restrict 127.0.0.1
+#restrict -6 ::1
 
 
 # To allow machines within your network to synchronize
@@ -45,3 +45,8 @@
 # to synchronize against, uncomment this line.
 #
 #restrict 192.168.0.0 mask 255.255.255.0 nomodify nopeer notrap
+
+
+# you should not need to modify the following paths
+driftfile	/var/lib/ntp/ntp.drift
+

Modified: ntpdate
===================================================================
--- ntpdate	2011-02-17 23:09:19 UTC (rev 110230)
+++ ntpdate	2011-02-17 23:15:46 UTC (rev 110231)
@@ -7,17 +7,17 @@
 case "$1" in
   start)
     stat_busy "Starting NTP Client"
-    /usr/bin/ntpdate $NTP_CLIENT_OPTION -t $NTPCLIENT_TIMEOUT $NTP_CLIENT_SERVER > /dev/null 2>&1
+    /usr/bin/ntpd -q $NTP_CLIENT_OPTION > /dev/null 2>&1
     if [  $? -gt 0 ]; then
       stat_fail
     else
-      add_daemon ntpdate
+      add_daemon ntp-client
       stat_done
     fi
     ;;
   stop)
     stat_busy "Stopping NTP Client"
-    rm_daemon ntpdate
+    rm_daemon ntp-client
     stat_done
     ;;
   restart)
@@ -28,3 +28,4 @@
   *)
     echo "usage: $0 {start|stop|restart}"  
 esac
+




More information about the arch-commits mailing list