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

Gaetan Bisson bisson at archlinux.org
Thu Oct 6 02:08:31 EDT 2011


    Date: Thursday, October 6, 2011 @ 02:08:31
  Author: bisson
Revision: 140052

upstream update, massive cleanup

Added:
  ntp/trunk/install
  ntp/trunk/ntpd.conf
    (from rev 140047, ntp/trunk/ntp-client.conf)
Modified:
  ntp/trunk/PKGBUILD
  ntp/trunk/ntp.conf
  ntp/trunk/ntpd
  ntp/trunk/ntpdate
Deleted:
  ntp/trunk/changelog
  ntp/trunk/ntp-4.2.4-html2man.patch
  ntp/trunk/ntp-client.conf

--------------------------+
 PKGBUILD                 |  105 ++++++++++---------------
 changelog                |   25 ------
 install                  |   10 ++
 ntp-4.2.4-html2man.patch |  183 ---------------------------------------------
 ntp-client.conf          |    5 -
 ntp.conf                 |   62 +++------------
 ntpd                     |    2 
 ntpd.conf                |    5 +
 ntpdate                  |    2 
 9 files changed, 76 insertions(+), 323 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-06 06:06:45 UTC (rev 140051)
+++ PKGBUILD	2011-10-06 06:08:31 UTC (rev 140052)
@@ -1,78 +1,59 @@
 # $Id$
-# Maintainer: kevin <kevin at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: kevin <kevin at archlinux.org>
 
 pkgname=ntp
-pkgver=4.2.6.p3
-_realver=4.2.6p3
-pkgrel=3
-pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync"
-arch=(i686 x86_64)
+pkgver=4.2.6.p4
+_realver=4.2.6p4
+pkgrel=1
+pkgdesc='Network Time Protocol reference implementation'
+url='http://www.ntp.org/'
 license=('custom')
-url="http://www.ntp.org/"
+arch=('i686' 'x86_64')
 depends=('openssl' 'readline' 'libcap')
 makedepends=('perl-html-parser')
-backup=('etc/ntp.conf' 'etc/conf.d/ntp-client.conf')
-options=('!emptydirs')
-changelog=changelog
-source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz
-	ntp-4.2.4-html2man.patch
-	ntp.conf
-	ntp-client.conf
-	ntpd
-	ntpdate)
-md5sums=('59876a9009b098ff59767ee45a88ebd2' '1b04e888717bb31479a6087632981723'
-         '398a7f270f6ae083f47f86eb8b557a75' '58997d6cf4846d80e35a01b855376a33'
-         'bf20804e75656609e808ca21b53ea4aa' '99b49d763e5866f4f81c48d922c80b93')
+backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf')
+source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz"
+        'ntpd'
+        'ntpdate'
+        'ntp.conf'
+        'ntpd.conf')
+sha1sums=('b53c4565c5d1c37494584d4fb826f82ffea285cf'
+          '97b41b8bc34f259f4e525ab2e58707c9724e72e2'
+          '63572457586379aa6bf75b6e899e71d651e643f4'
+          '6d2d234afb1db2dcb940747a62f70217246a3d13'
+          '6cfcb7bbd34499b30e31dffca2f3e1a036010271')
 
+install=install
+
 build() {
-  cd "$srcdir/$pkgname-$_realver"
-  # fix man page generation
-  patch -Np1 -i ../ntp-4.2.4-html2man.patch
-  # configure
-  export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-  # 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
+	cd "${srcdir}/${pkgname}-${_realver}"
+
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--enable-linux-caps \
+
+	make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$_realver"
+	cd "${srcdir}/${pkgname}-$_realver"
 
-  # install
-  make DESTDIR="$pkgdir" install
+	make DESTDIR="${pkgdir}" install
 
-  # install conf files
-  install -d "$pkgdir/usr/share/ntp"
-  install -D -m644 conf/* "${pkgdir}/usr/share/ntp"
+	install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd
+	install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate
+	install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf
+	install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf
 
-  # install launch scripts 
-  install -d "$pkgdir/etc/rc.d"
-  install -D -m755 ${srcdir}/{ntpd,ntpdate} "$pkgdir/etc/rc.d"
+	cd html
+	../scripts/html2man
+	install -d "${pkgdir}"/usr/share/man
+	mv man/man* "${pkgdir}"/usr/share/man
+	mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd
+	cd ..
 
-  # install man pages
-  cd html
-  ../scripts/html2man
-  sed -i 's/^[\t\ ]*$//;/./,/^$/!d' man/man*/*.[58]
-  install -d "$pkgdir"/usr/share/man/man{5,8}
-  install -m644 man/man5/* "$pkgdir/usr/share/man/man5/"
-  install -m644 man/man8/* "$pkgdir/usr/share/man/man8/"
-  mv "$pkgdir/usr/share/man/man8/ntpd.8" "$pkgdir/usr/share/man/man8/ntp-ntpd.8"
-  cd ..
-
-  # install sample configs
-  install -D -m644 "$srcdir/ntp.conf" "$pkgdir/etc/ntp.conf"
-  install -D -m644 "$srcdir/ntp-client.conf" \
-  	"$pkgdir/etc/conf.d/ntp-client.conf"
-
-  # create /var/lib/ntp
-  install -d "$pkgdir/var/lib/ntp"
-  touch "$pkgdir/var/lib/ntp/.placeholder"
-
-  install -Dm644 "$srcdir/$pkgname-$_realver/COPYRIGHT" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	rmdir "${pkgdir}"/usr/{lib,sbin}
+	install -d "${pkgdir}/var/lib/ntp"
+	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: changelog
===================================================================
--- changelog	2011-10-06 06:06:45 UTC (rev 140051)
+++ changelog	2011-10-06 06:08:31 UTC (rev 140052)
@@ -1,25 +0,0 @@
-2011-04-03  andrea <andrea at archlinux.org>
-
-    * ntp 4.2.6p3-3
-    - Use 'ntpd -p' to get the PID in ntpd
-    - Don't run the ntp client in background in ntpdate
-
-2011-03-28  andrea <andrea at archlinux.org>
-
-    * ntp 4.2.6p3-2
-    - Improved daemon scripts
-
-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
-    - Convert PKGBUILD to build()/package() format
-    - removed "|| return 1"

Added: install
===================================================================
--- install	                        (rev 0)
+++ install	2011-10-06 06:08:31 UTC (rev 140052)
@@ -0,0 +1,10 @@
+post_upgrade() {
+	if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then
+		cat <<EOF
+
+==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf
+==> If you made changes to the former, please update the latter.
+
+EOF
+	fi
+}

Deleted: ntp-4.2.4-html2man.patch
===================================================================
--- ntp-4.2.4-html2man.patch	2011-10-06 06:06:45 UTC (rev 140051)
+++ ntp-4.2.4-html2man.patch	2011-10-06 06:08:31 UTC (rev 140052)
@@ -1,183 +0,0 @@
---- ntp-4.2.4/scripts/html2man.in.html2man	2006-06-06 22:17:10.000000000 +0200
-+++ ntp-4.2.4/scripts/html2man.in	2007-01-08 12:47:31.000000000 +0100
-@@ -23,10 +23,10 @@
- 	     'ntpq' => ['ntpq', 8, 'ntpd(8), ntpdc(8)'],
- 	     'ntpdate' => ['ntpdate', 8, 'ntpd(8)'],
- 	     'ntpdc' => ['ntpdc', 8, 'ntpd(8)'],
--	     'ntptime' => ['ntpdtime', 8, 'ntpd(8), ntpdate(8)'],
-+	     'ntptime' => ['ntptime', 8, 'ntpd(8), ntpdate(8)'],
- 	     'ntptrace' => ['ntptrace', 8, 'ntpd(8)'],
- 	     'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'],
--	     'confopt' => ['ntp.conf', 5, 'ntpd(8)'],
-+	     'confopt' => ['ntp.conf', 5, 'ntpd(8), ntp_auth(5), ntp_mon(5), ntp_acc(5), ntp_clock(5), ntp_misc(5)'],
- 	     'authopt' => ['ntp_auth', 5, 'ntp.conf(5), ntpd(8)'],
- 	     'monopt' => ['ntp_mon', 5, 'ntp.conf(5)'],
- 	     'accopt' => ['ntp_acc', 5, 'ntp.conf(5)'],
-@@ -34,17 +34,8 @@
- 	     'miscopt' => ['ntp_misc', 5, 'ntp.conf(5)']);
- 
- # Disclaimer to go in SEE ALSO section of the man page
--$seealso_disclaimer = 'These man pages are automatically hacked from the main NTP ' .
--    'documentation pages, which are maintained in HTML format.  These files are ' .
--    'included in the NTP source distribution.  If you installed NTP from a binary ' .
--    'package, or it came pre-installed on your system, chances are the documentation ' .
--    'was also included in the usual place for your system.  The HTML files are more ' .
--    'correct and complete than these man pages, which are provided for your reference ' .
--    'only.';
--
--# Disclaimer to go right at the top
--$top_disclaimer = 'This file was automatically generated from HTML source, and may be ' .
--    'incorrect.  See the SEE ALSO section at the end of this file for more info';
-+$seealso_disclaimer = "Primary source of documentation: /usr/share/doc/ntp-*\n\n" .
-+    "This file was automatically generated from HTML source.\n";
- 
- mkdir $MANDIR, 0777;
- mkdir "$MANDIR/man8", 0777;
-@@ -64,7 +55,8 @@
-     $fileinfo = $manfiles{$filename};
- 
-     $p = HTML::TokeParser->new("$filename.html") || die "Can't open $filename.html: $!";
--    open(MANOUT, ">$MANDIR/man$fileinfo->[1]/$fileinfo->[0].$fileinfo->[1]")
-+    $fileout = "$MANDIR/man$fileinfo->[1]/$fileinfo->[0].$fileinfo->[1]";
-+    open(MANOUT, ">$fileout")
- 	|| die "Can't open: $!";
- 
-     $p->get_tag("title");
-@@ -73,7 +65,6 @@
- 
-     # Setup man header
-     print MANOUT ".TH " . $fileinfo->[0] . " " . $fileinfo->[1] .  "\n";
--    print MANOUT ".UC 4\n";
-     print MANOUT ".SH NAME\n";
-     $pat = $fileinfo->[0];
-     if ($name =~ /$pat/) {
-@@ -81,10 +72,12 @@
- 	# Add the manpage name, if not in the HTML title already
- 	print MANOUT "$fileinfo->[0] - ";
-     }
--    print MANOUT "$name\n\n";
--
--    print MANOUT "$top_disclaimer\n";
-+    print MANOUT "$name\n.SH \\ \n\n";
- 
-+    @fontstack = ();
-+    $deflevel = 0;
-+    $pre = 0;
-+    $ignore = 0;
-     # Now start scanning.  We basically print everything after translating some tags.
-     # $token->[0] has "T", "S", "E" for Text, Start, End
-     # $token->[1] has the tag name, or text (for "T" case)
-@@ -92,19 +85,37 @@
-     while (my $token = $p->get_token) {
- 	if($token->[0] eq "T") {
- 	    my $text = $token->[1];
--	    if($tag) {
--		$text =~ s/^[\n ]*//;
--		$text =~ s/[\n ]*$/ /;
-+	    if (!$pre) {
-+		if($tag) {
-+		    $text =~ s/^[\n\t ]*//;
-+		}
-+		$text =~ s/^[\n\t ][\n\t ]+$//;
-+		$text =~ s/[\n\t ]+/ /g;
-+		$text =~ s/&nbsp\;/ /g;
-+		$text =~ s/&gt\;/>/g;
-+		$text =~ s/&lt\;/</g;
-+		$text =~ s/&quot\;/"/g;
-+		$text =~ s/&amp\;/&/g;
-+		$text =~ s/^\./\\[char46]/;
- 	    }
--	    $text =~ s/&nbsp\;/ /g;
--	    $text =~ s/^\./\\./;
- 	    print MANOUT "$text";
- 	    $tag = 0;
- 	}
- 	if($token->[0] eq "S") {
- 	    if($token->[1] eq "h4") {
- 		my $text = uc($p->get_trimmed_text("/h4"));
--		print MANOUT ".SH $text\n";
-+		# ignore these two sections in ntpd.html
-+		if ($filename eq "ntpd" &&
-+		    ($text eq "FILES" || $text eq "CONFIGURATION OPTIONS")) {
-+			$ignore = 1;
-+			close(MANOUT);
-+			open(MANOUT, ">/dev/null");
-+		} elsif ($ignore) {
-+		    $ignore = 0;
-+		    close(MANOUT);
-+		    open(MANOUT, ">>$fileout");
-+		}
-+		print MANOUT "\n\n.SH $text\n";
- 	    }
- 	    if($token->[1] eq "tt") {
- 		push @fontstack, "tt";
-@@ -118,22 +129,30 @@
- 		my $text = $p->get_trimmed_text("/address");
- 		print MANOUT "\n.SH AUTHOR\n$text\n";
- 	    }
--	    if($token->[1] eq "dt") {
--		$tmp = $deflevel-4;
--		print MANOUT "\n.RS $tmp\n";
-+	    if($token->[1] eq "dt" || $token->[1] eq "br" && $deflevel > 0) {
-+		print MANOUT "\n.TP 8\n";
- 		$tag = 1;
- 	    }
- 	    if($token->[1] eq "dd") {
--		print MANOUT "\n.RS $deflevel\n";
-+		print MANOUT "\n";
- 		$tag = 1;
- 	    }
- 	    if($token->[1] eq "dl") {
--		$deflevel+=4;
-+		$deflevel+=1;
-+		if ($deflevel > 0) {
-+		    print MANOUT "\n.RS ", $deflevel > 1 ? 8 : 0;
-+		}
-+	    }
-+	    if($token->[1] eq "p") {
-+		print MANOUT "\n";
-+	    }
-+	    if($token->[1] eq "pre") {
-+		print MANOUT "\n.nf";
-+		$pre = 1;
- 	    }
- 	}
- 	elsif($token->[0] eq "E") {
--	    if($token->[1] eq "dd") {
--		print MANOUT "\n.RE\n";
-+	    if($token->[1] eq "h4") {
- 		$tag = 1;
- 	    }
- 	    if($token->[1] eq "tt") {
-@@ -157,15 +176,27 @@
- 		print MANOUT "$fontswitch";
- 	    }
- 	    if($token->[1] eq "dl") {
--		$deflevel-=4;
-+		if ($deflevel > 0) {
-+		    print MANOUT "\n.RE";
-+		}
-+		print MANOUT "\n";
-+		$deflevel-=1;
- 	    }
--	    if($token->[1] eq "dt") {
--		print MANOUT "\n.RE";
-+	    if($token->[1] eq "p") {
-+		print MANOUT "\n";
- 		$tag = 1;
- 	    }
-+	    if($token->[1] eq "pre") {
-+		print MANOUT "\n.fi";
-+		$pre = 0;
-+	    }
- 	}
-     }
--    print MANOUT ".SH SEE ALSO\n\n";
-+    if ($ignore) {
-+	close(MANOUT);
-+	open(MANOUT, ">>$fileout");
-+    }
-+    print MANOUT "\n.SH SEE ALSO\n\n";
-     print MANOUT "$fileinfo->[2]\n\n";
-     print MANOUT "$seealso_disclaimer\n";
-     close(MANOUT);

Deleted: ntp-client.conf
===================================================================
--- ntp-client.conf	2011-10-06 06:06:45 UTC (rev 140051)
+++ ntp-client.conf	2011-10-06 06:08:31 UTC (rev 140052)
@@ -1,5 +0,0 @@
-# client options for "ntpd -q" - ntpdate equivalent
-NTP_CLIENT_OPTION="-g"
-
-# arguments passed to ntpd when started
-NTPD_ARGS="-g"

Modified: ntp.conf
===================================================================
--- ntp.conf	2011-10-06 06:06:45 UTC (rev 140051)
+++ ntp.conf	2011-10-06 06:08:31 UTC (rev 140052)
@@ -1,52 +1,22 @@
-# NOTES:
-#  - you should only have to update the server line below
-#  - if you start getting lines like 'restrict' and 'fudge'
-#    and you didnt add them, AND you run dhcpcd on your
-#    network interfaces, be sure to add '-Y -N' to the
-#    dhcpcd_ethX variables in /etc/conf.d/net
+# With the default settings below, ntpd will only synchronize your clock.
+#
+# For details, see:
+# - the ntp.conf man page
+# - http://support.ntp.org/bin/view/Support/GettingStarted
+# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon
 
-# Name of the servers ntpd should sync with
-# Please respect the access policy as stated by the responsible person.
-#server		ntp.example.tld		iburst
+# Select three geolocalized NTP public servers; see http://www.pool.ntp.org/
+server 0.pool.ntp.org
+server 1.pool.ntp.org
+server 2.pool.ntp.org
 
-server pool.ntp.org
-
-##
-# A list of available servers can be found here:
-# http://www.pool.ntp.org/
-# http://www.pool.ntp.org/#use
-# A good way to get servers for your machine is:
-# netselect -s 3 pool.ntp.org
-##
-
-#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.
-
-# 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
+# Only allow read-only access from localhost
 restrict default nomodify nopeer
-#restrict -6 default nomodify nopeer
-
-# Allow localhost
 restrict 127.0.0.1
-#restrict -6 ::1
 
+# Location of drift and log files
+driftfile /var/lib/ntp/ntp.drift
+logfile /var/log/ntp.log
 
-# To allow machines within your network to synchronize
-# their clocks with your server, but ensure they are
-# not allowed to configure the server or used as peers
-# 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
-
+# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing
+# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net

Modified: ntpd
===================================================================
--- ntpd	2011-10-06 06:06:45 UTC (rev 140051)
+++ ntpd	2011-10-06 06:08:31 UTC (rev 140052)
@@ -2,7 +2,7 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
-. /etc/conf.d/ntp-client.conf
+. /etc/conf.d/ntpd.conf
 
 PIDFILE="/var/run/ntpd/ntpd.pid"
 PID=$(cat $PIDFILE 2> /dev/null)

Copied: ntp/trunk/ntpd.conf (from rev 140047, ntp/trunk/ntp-client.conf)
===================================================================
--- ntpd.conf	                        (rev 0)
+++ ntpd.conf	2011-10-06 06:08:31 UTC (rev 140052)
@@ -0,0 +1,5 @@
+# client options for "ntpd -q" - ntpdate equivalent
+NTP_CLIENT_OPTION="-g"
+
+# arguments passed to ntpd when started
+NTPD_ARGS="-g"

Modified: ntpdate
===================================================================
--- ntpdate	2011-10-06 06:06:45 UTC (rev 140051)
+++ ntpdate	2011-10-06 06:08:31 UTC (rev 140052)
@@ -2,7 +2,7 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
-. /etc/conf.d/ntp-client.conf
+. /etc/conf.d/ntpd.conf
 
 case "$1" in
   start)



More information about the arch-commits mailing list