Author: bdubbs Date: 2011-10-21 12:15:55 -0600 (Fri, 21 Oct 2011) New Revision: 8906
Added: trunk/bootscripts/blfs/init.d/ntpd Removed: trunk/bootscripts/blfs/init.d/ntp Modified: trunk/BOOK/basicnet/netprogs/ntp.xml trunk/BOOK/general.ent trunk/BOOK/introduction/welcome/changelog.xml trunk/bootscripts/Makefile Log: Updated ntp-4.2.6p4 Modified: trunk/BOOK/basicnet/netprogs/ntp.xml =================================================================== --- trunk/BOOK/basicnet/netprogs/ntp.xml 2011-10-20 02:14:46 UTC (rev 8905) +++ trunk/BOOK/basicnet/netprogs/ntp.xml 2011-10-21 18:15:55 UTC (rev 8906) @@ -6,13 +6,13 @@ <!ENTITY ntp-download-http "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-&ntp-version;.tar.gz";> <!ENTITY ntp-download-ftp "&gentoo-ftp-repo;/ntp-&ntp-version;.tar.gz"> - <!ENTITY ntp-md5sum "8c19ff62ed4f7d64f8e2aa59cb11f364"> - <!ENTITY ntp-size "3.3 MB"> - <!ENTITY ntp-buildsize "29 MB"> + <!ENTITY ntp-md5sum "1447121a07b49361677ffda4f6e29527"> + <!ENTITY ntp-size "4.0 MB"> + <!ENTITY ntp-buildsize "39 MB"> <!ENTITY ntp-time "0.5 SBU"> ]> -<sect1 id="ntp" xreflabel="NTP-&ntp-version;"> +<sect1 id="ntp" xreflabel="ntp-&ntp-version;"> <?dbhtml filename="ntp.html"?> <sect1info> @@ -20,21 +20,21 @@ <date>$Date$</date> </sect1info> - <title>NTP-&ntp-version;</title> + <title>ntp-&ntp-version;</title> <indexterm zone="ntp"> - <primary sortas="a-NTP">NTP</primary> + <primary sortas="a-ntp">ntp</primary> </indexterm> <sect2 role="package"> - <title>Introduction to NTP</title> + <title>Introduction to ntp</title> - <para>The <application>NTP</application> package contains a + <para>The <application>ntp</application> package contains a client and server to keep the time synchronized between various computers over a network. This package is the official reference implementation of the NTP protocol.</para> - &lfs65_checked; + &lfs70_checked; <bridgehead renderas="sect3">Package Information</bridgehead> <itemizedlist spacing="compact"> @@ -58,6 +58,7 @@ </listitem> </itemizedlist> +<!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead> <itemizedlist spacing='compact'> <listitem> @@ -65,9 +66,9 @@ url="&patch-root;/ntp-&ntp-version;-mod_nano-1.patch"/></para> </listitem> </itemizedlist> +--> + <bridgehead renderas="sect3">ntp Dependencies</bridgehead> - <bridgehead renderas="sect3">NTP Dependencies</bridgehead> - <bridgehead renderas="sect4">Optional</bridgehead> <para role="optional"><xref linkend="openssl"/></para> @@ -77,13 +78,12 @@ </sect2> <sect2 role="installation"> - <title>Installation of NTP</title> + <title>Installation of ntp</title> - <para>Install <application>NTP</application> by running + <para>Install <application>ntp</application> by running the following commands:</para> -<screen><userinput>patch -Np1 -i ../ntp-&ntp-version;-mod_nano-1.patch && -./configure --prefix=/usr --sysconfdir=/etc \ +<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \ --with-binsubdir=sbin && make</userinput></screen> @@ -107,7 +107,7 @@ </sect2> <sect2 role="configuration"> - <title>Configuring NTP</title> + <title>Configuring ntp</title> <sect3 id="ntp-config"> <title>Config Files</title> @@ -123,12 +123,12 @@ <sect3> <title>Configuration Information</title> - <para>The following configuration file defines various NTP servers + <para>The following configuration file defines various ntp servers with open access from different continents. It also creates a drift file where <command>ntpd</command> stores the frequency offset and a pid file to store the <command>ntpd</command> process ID. Since the documentation included with the package is sparse, - visit the NTP website at <ulink url="http://www.ntp.org/"/> and + visit the ntp website at <ulink url="http://www.ntp.org/"/> and <ulink url="http://www.pool.ntp.org/"/> for more information.</para> <screen role="root"><userinput>cat > /etc/ntp.conf << "EOF" @@ -173,7 +173,7 @@ <primary sortas="f-ntp">ntp</primary> </indexterm> -<screen role="root"><userinput>make install-ntp</userinput></screen> +<screen role="root"><userinput>make install-ntpd</userinput></screen> <para>If you prefer to run <command>ntpd</command> periodically, add the following command to <systemitem class="username">root</systemitem>'s @@ -239,9 +239,9 @@ <varlistentry id="ntpd"> <term><command>ntpd</command></term> <listitem> - <para>is a NTP daemon that runs in the background and keeps + <para>is a ntp daemon that runs in the background and keeps the date and time synchronized based on response from configured - NTP servers. It also functions as a NTP server.</para> + ntp servers. It also functions as a ntp server.</para> <indexterm zone="ntp ntpd"> <primary sortas="b-ntpd">ntpd</primary> </indexterm> @@ -252,7 +252,7 @@ <term><command>ntpdate</command></term> <listitem> <para>is a client program that sets the date and time based on - the response from an NTP server. This command is deprecated.</para> + the response from an ntp server. This command is deprecated.</para> <indexterm zone="ntp ntpdate"> <primary sortas="b-ntpdate">ntpdate</primary> </indexterm> @@ -262,7 +262,7 @@ <varlistentry id="ntpdc"> <term><command>ntpdc</command></term> <listitem> - <para>is used to query the NTP daemon about its current state + <para>is used to query the ntp daemon about its current state and to request changes in that state.</para> <indexterm zone="ntp ntpdc"> <primary sortas="b-ntpdc">ntpdc</primary> @@ -294,7 +294,7 @@ <varlistentry id="ntptrace"> <term><command>ntptrace</command></term> <listitem> - <para>traces a chain of NTP servers back to the primary source.</para> + <para>traces a chain of ntp servers back to the primary source.</para> <indexterm zone="ntp ntptrace"> <primary sortas="b-ntptrace">ntptrace</primary> </indexterm> Modified: trunk/BOOK/general.ent =================================================================== --- trunk/BOOK/general.ent 2011-10-20 02:14:46 UTC (rev 8905) +++ trunk/BOOK/general.ent 2011-10-21 18:15:55 UTC (rev 8906) @@ -3,13 +3,13 @@ $Date$ --> -<!ENTITY day "19"> <!-- Always 2 digits --> +<!ENTITY day "21"> <!-- Always 2 digits --> <!ENTITY month "10"> <!-- Always 2 digits --> <!ENTITY year "2011"> <!ENTITY copyrightdate "2001-&year;"> <!ENTITY copyholder "The BLFS Development Team"> <!ENTITY version "svn-&year;&month;&day;"> -<!ENTITY releasedate "September &day;th, &year;"> +<!ENTITY releasedate "September &day;st, &year;"> <!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP --> <!ENTITY blfs-version "svn"> <!-- svn|[release #] --> <!ENTITY lfs-version "development"> <!-- version|testing|unstable|development] --> @@ -55,7 +55,7 @@ <!ENTITY lfs-vim-version "7.3"> <!-- End LFS versions --> -<!ENTITY blfs-bootscripts-version "20111019"> +<!ENTITY blfs-bootscripts-version "20111021"> <!ENTITY blfs-bootscripts-download "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2"> <!ENTITY blfs-wiki "http://wiki.&lfs-domainname;/blfs/wiki";> @@ -440,7 +440,7 @@ <!ENTITY ncftp-version "3.2.3"> <!ENTITY net-tools-version "1.60"> <!ENTITY wireless-tools-version "28"> -<!ENTITY ntp-version "4.2.4p7"> +<!ENTITY ntp-version "4.2.6p4"> <!ENTITY openssh-version "5.9p1"> <!ENTITY portmap-version "6.0"> <!ENTITY rsync-version "3.0.7"> Modified: trunk/BOOK/introduction/welcome/changelog.xml =================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml 2011-10-20 02:14:46 UTC (rev 8905) +++ trunk/BOOK/introduction/welcome/changelog.xml 2011-10-21 18:15:55 UTC (rev 8906) @@ -42,6 +42,15 @@ --> <listitem> + <para>October 21st, 2011</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Updated ntp-4.2.6p4.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>October 19th, 2011</para> <itemizedlist> <listitem> Modified: trunk/bootscripts/Makefile =================================================================== --- trunk/bootscripts/Makefile 2011-10-20 02:14:46 UTC (rev 8905) +++ trunk/bootscripts/Makefile 2011-10-21 18:15:55 UTC (rev 8906) @@ -265,15 +265,15 @@ ln -sf ../init.d/nfs-server ${EXTDIR}/rc.d/rc5.d/S24nfs-server ln -sf ../init.d/nfs-server ${EXTDIR}/rc.d/rc6.d/K48nfs-server -install-ntp: create-dirs - install -m ${MODE} blfs/init.d/ntp ${EXTDIR}/rc.d/init.d/ - ln -sf ../init.d/ntp ${EXTDIR}/rc.d/rc0.d/K46ntp - ln -sf ../init.d/ntp ${EXTDIR}/rc.d/rc1.d/K46ntp - ln -sf ../init.d/ntp ${EXTDIR}/rc.d/rc2.d/K46ntp - ln -sf ../init.d/ntp ${EXTDIR}/rc.d/rc3.d/S26ntp - ln -sf ../init.d/ntp ${EXTDIR}/rc.d/rc4.d/S26ntp - ln -sf ../init.d/ntp ${EXTDIR}/rc.d/rc5.d/S26ntp - ln -sf ../init.d/ntp ${EXTDIR}/rc.d/rc6.d/K46ntp +install-ntpd: create-dirs + install -m ${MODE} blfs/init.d/ntpd ${EXTDIR}/rc.d/init.d/ + ln -sf ../init.d/ntpd ${EXTDIR}/rc.d/rc0.d/K46ntpd + ln -sf ../init.d/ntpd ${EXTDIR}/rc.d/rc1.d/K46ntpd + ln -sf ../init.d/ntpd ${EXTDIR}/rc.d/rc2.d/K46ntpd + ln -sf ../init.d/ntpd ${EXTDIR}/rc.d/rc3.d/S26ntpd + ln -sf ../init.d/ntpd ${EXTDIR}/rc.d/rc4.d/S26ntpd + ln -sf ../init.d/ntpd ${EXTDIR}/rc.d/rc5.d/S26ntpd + ln -sf ../init.d/ntpd ${EXTDIR}/rc.d/rc6.d/K46ntpd install-openldap1: create-dirs install -m ${MODE} blfs/init.d/openldap1 ${EXTDIR}/rc.d/init.d/openldap Deleted: trunk/bootscripts/blfs/init.d/ntp =================================================================== --- trunk/bootscripts/blfs/init.d/ntp 2011-10-20 02:14:46 UTC (rev 8905) +++ trunk/bootscripts/blfs/init.d/ntp 2011-10-21 18:15:55 UTC (rev 8906) @@ -1,37 +0,0 @@ -#!/bin/sh -# Begin $rc_base/init.d/ntp - -#$LastChangedBy$ -#$Date$ - -. /etc/sysconfig/rc -. $rc_functions - -case "$1" in - start) - boot_mesg "Starting ntpd..." - loadproc /usr/sbin/ntpd gx - ;; - - stop) - boot_mesg "Stopping ntpd..." - killproc /usr/sbin/ntpd - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - status) - statusproc /usr/sbin/ntpd - ;; - - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/ntp Added: trunk/bootscripts/blfs/init.d/ntpd =================================================================== --- trunk/bootscripts/blfs/init.d/ntpd (rev 0) +++ trunk/bootscripts/blfs/init.d/ntpd 2011-10-21 18:15:55 UTC (rev 8906) @@ -0,0 +1,62 @@ +#!/bin/sh +######################################################################## +# Begin ntpd +# +# Description : Start Network Time Protocol daemon +# +# Author : DJ Lucas - [email protected] +# Bruce Dubbs - [email protected] +# +# Version : LFS 7.0 +# +######################################################################## + +### BEGIN INIT INFO +# Provides: ntpd +# Required-Start: $time $network +# Should-Start: +# Required-Stop: $network +# Should-Stop: $remote_fs +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 +# Short-Description: NTP Network Time Protocal +# Description: NTP Syncronizes time with time servers worldwide +# X-LFS-Provided-By: BLFS / LFS 7.0 +### END INIT INFO + +. /lib/lsb/init-functions + +#$LastChangedBy$ +#$Date$ + +case "$1" in + start) + log_info_msg "Starting ntpd..." + start_daemon /usr/sbin/ntpd -gx + evaluate_retval + ;; + + stop) + log_info_msg "Stopping ntpd..." + killproc /usr/sbin/ntpd + evaluate_retval + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + status) + statusproc /usr/sbin/ntpd + ;; + + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac + +# End ntpd + Property changes on: trunk/bootscripts/blfs/init.d/ntpd ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + LastChangedBy Date -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
