diff options
| -rw-r--r-- | debian/NEWS | 5 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 84 | ||||
| -rw-r--r-- | debian/dirs | 3 | ||||
| -rw-r--r-- | debian/ntp-refclock.dirs | 2 | ||||
| -rw-r--r-- | debian/ntp-refclock.postinst | 28 | ||||
| -rw-r--r-- | debian/ntp-simple.dirs | 2 | ||||
| -rw-r--r-- | debian/ntp-simple.postinst | 29 | ||||
| -rw-r--r-- | debian/ntp-simple.postrm | 11 | ||||
| -rw-r--r-- | debian/ntp.cron.daily (renamed from debian/ntp-server.cron.daily) | 0 | ||||
| -rw-r--r-- | debian/ntp.cron.weekly (renamed from debian/ntp-server.cron.weekly) | 0 | ||||
| -rw-r--r-- | debian/ntp.dirs (renamed from debian/ntp-server.dirs) | 5 | ||||
| -rw-r--r-- | debian/ntp.docs (renamed from debian/docs) | 0 | ||||
| -rw-r--r-- | debian/ntp.ifup (renamed from debian/ntp-server.ifup) | 2 | ||||
| -rw-r--r-- | debian/ntp.ignore (renamed from debian/ntp-server.ignore) | 0 | ||||
| -rw-r--r-- | debian/ntp.init (renamed from debian/ntp-server.init.d) | 2 | ||||
| -rw-r--r-- | debian/ntp.postinst | 8 | ||||
| -rw-r--r-- | debian/ntp.postrm (renamed from debian/ntp-refclock.postrm) | 0 | ||||
| -rwxr-xr-x | debian/rules | 89 |
19 files changed, 63 insertions, 211 deletions
diff --git a/debian/NEWS b/debian/NEWS index 54042a6..ccdfab3 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,8 @@ +ntp (1:4.2.0a+stable-10) unstable; urgency=low + + The packages ntp, ntp-server, ntp-simple, and ntp-refclock have been + into a single package ntp. + ntp (1:4.2.0a+stable-8) unstable; urgency=medium The NTP server now runs as the user "ntp". (Obviously it retains its diff --git a/debian/changelog b/debian/changelog index e0212c5..390cdf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,12 +2,14 @@ ntp (1:4.2.0a+stable-10) unstable; urgency=low [ Peter Eisentraut ] * Consolidated patches using quilt + * Merged ntp, ntp-server, ntp-simple, ntp-refclock into single package ntp + (closes: #222369, #343131, #377578) [ Kurt Roeckx ] * Make ntp, ntp-simple, ntp-refclock and ntpdate depend on netbase because they require /etc/services (Closes: #376295) - -- Peter Eisentraut <petere@debian.org> Sat, 1 Jul 2006 20:07:03 +0200 + -- Peter Eisentraut <petere@debian.org> Thu, 13 Jul 2006 21:44:49 +0200 ntp (1:4.2.0a+stable-9) unstable; urgency=low diff --git a/debian/control b/debian/control index 76c31a9..606e5ea 100644 --- a/debian/control +++ b/debian/control @@ -8,89 +8,30 @@ Uploaders: Bruce Walker <w1bw@debian.org>, Bdale Garbee <bdale@gag.com>, Matthia Package: ntp Architecture: any -Depends: ${shlibs:Depends}, psmisc, perl-modules, netbase -Recommends: ntp-server -Suggests: ntpdate,ntp-doc -Replaces: xntp,xntp3 -Conflicts: chrony -Description: Network Time Protocol: network utilities +Depends: adduser, netbase, perl-modules, psmisc, ${misc:Depends}, ${shlibs:Depends} +Suggests: ntp-doc +Replaces: ntp-server (<= 1:4.2.0a+stable-9), ntp-simple (<= 1:4.2.0a+stable-9), ntp-refclock (<= 1:4.2.0a+stable-9), xntp, xntp3 +Conflicts: chrony, ntp-server (<= 1:4.2.0a+stable-9), ntp-simple (<= 1:4.2.0a+stable-9), ntp-refclock (<= 1:4.2.0a+stable-9) +Description: Network Time Protocol: server and utility programs NTP, the Network Time Protocol, is used to keep computer clocks accurate over the Internet, or by following an accurate hardware receiver which interprets GPS, DCF-77, NIST or similar time signals. . - This package contains control programs which can access a remote NTP - server. Thus you will need either ntp-simple or ntp-refclock; - ntp-refclock includes drivers for radio clocks. - . - For more information about the NTP protocol / NTP server configuration - and operation, load the optional Debian package 'ntp-doc'. - -Package: ntp-server -Architecture: any -Depends: ntp-simple (>> 1:4.2.0a+stable-6) | ntp-refclock (>> 1:4.2.0a+stable-6), ntp -Suggests: ntpdate,ntp-doc -Replaces: xntp,xntp3,ntp (<= 1:4.1.0-2) -Conflicts: ntp-simple (<< 1:4.2.0), ntp-refclock (<< 1:4.2.0), ntp (<< 1:4.2.0-0.6) -Description: Network Time Protocol: common server tools - NTP, the Network Time Protocol, is used to keep computer clocks accurate - over the Internet, or by following an accurate hardware receiver which - interprets GPS, DCF-77, NIST or similar time signals. - . - This package holds the common files for the NTP server and all programs - which need to run on the actual server. - . - There are two server packages: 'ntp-simple' only knows about your computer's - built-in clock. 'ntp-refclock' has built-in support for a variety of - time signal receivers. Both server packages, of course, can synchronize - with other servers across the Internet. - -Package: ntp-simple -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, netbase -Recommends: ntp-server (= ${Source-Version}) -Suggests: ntpdate,ntp-doc,ntp -Replaces: xntp,xntp3,ntp (<= 1:4.1.0-2) -Conflicts: chrony, ntp (<< 1:4.1.0), ntp-refclock -Description: Network Time Protocol: daemon for simple systems - NTP, the Network Time Protocol, is used to keep computer clocks accurate - over the Internet, or by following an accurate hardware receiver which - interprets GPS, DCF-77, NIST or similar time signals. - . - This version of the ntp daemon can synchronize to other servers across - the Internet, or (if none are available) use your computer's built-in - clock as a time source for a local network. It is sufficient for most - systems. - . - If you wish to configure a reference clock, particularly if you have a radio - clock, use the ntp-refclock package instead. - -Package: ntp-refclock -Architecture: any -Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, netbase -Recommends: ntp-server (= ${Source-Version}) -Suggests: ntpdate,ntp-doc,ntp -Replaces: xntp,xntp3,ntp (<= 1:4.1.0-2) -Conflicts: chrony, ntp (<< 1:4.1.0), ntp-simple -Description: Network Time Protocol: daemon for reference clocks - NTP, the Network Time Protocol, is used to keep computer clocks accurate - over the Internet, or by following an accurate hardware receiver which - interprets GPS, DCF-77, NIST or similar time signals. - . - This version of the ntp daemon can understand a variety of time signal - receivers. If you do not have a radio clock, use the ntp-simple package - instead, as it consumes far less memory. + This package contains the server and utility programs. . If you're serious about building a high-quality stratum 1 timekeeper, please take a look at Ulrich Windl's PPSkit patchset for the Linux kernel, available from the kernel.org mirror network in pub/linux/daemons/ntp. + . + For more information about the NTP protocol / NTP server configuration + and operation, load the optional Debian package 'ntp-doc'. Package: ntpdate Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, netbase +Depends: netbase, ${misc:Depends}, ${shlibs:Depends} Suggests: ntp -Conflicts: ntp (<< 1:4.0.98a),chrony -Replaces: ntp (<< 1:4.0.98a),xntp,xntp3 +Conflicts: ntp (<< 1:4.0.98a), chrony +Replaces: ntp (<< 1:4.0.98a), xntp, xntp3 Description: The ntpdate client for setting system time from NTP servers NTP, the Network Time Protocol, is used to keep computer clocks accurate over the Internet, or by following an accurate hardware receiver which @@ -121,4 +62,3 @@ Description: Network Time Protocol: documentation pages for ntp's programs and configuration files, this package is desirable for any setup beyond the simple configuration supplied by the server packages. - diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index f7430fa..0000000 --- a/debian/dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/share/man/man1 -usr/sbin diff --git a/debian/ntp-refclock.dirs b/debian/ntp-refclock.dirs deleted file mode 100644 index 58b1610..0000000 --- a/debian/ntp-refclock.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/sbin -usr/share/man/man1 diff --git a/debian/ntp-refclock.postinst b/debian/ntp-refclock.postinst deleted file mode 100644 index 196c7c9..0000000 --- a/debian/ntp-refclock.postinst +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -# only do remaining stuff if we're being called to configure the package -if [ "$1" != "configure" ] -then - exit 0 -fi - -# make sure a couple of directories we need exist -mkdir -p /var/log/ntpstats /var/lib/ntp - -# ntpd now runs as normal user, but must be able to write some files -adduser --system --quiet --group --no-create-home ntp || true -chown -R ntp:ntp /var/log/ntpstats /var/lib/ntp - -# restart the server, in case ntp-server's postinst ran before us -if [ -x "/etc/init.d/ntp-server" ]; then - update-rc.d ntp-server defaults 23 >/dev/null - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d ntp-server restart - else - /etc/init.d/ntp-server restart - fi -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/ntp-simple.dirs b/debian/ntp-simple.dirs deleted file mode 100644 index 58b1610..0000000 --- a/debian/ntp-simple.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/sbin -usr/share/man/man1 diff --git a/debian/ntp-simple.postinst b/debian/ntp-simple.postinst deleted file mode 100644 index bd8e935..0000000 --- a/debian/ntp-simple.postinst +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -# only do remaining stuff if we're being called to configure the package -if [ "$1" != "configure" ] -then - exit 0 -fi - -# make sure a couple of directories we need exist -mkdir -p /var/log/ntpstats /var/lib/ntp - -# ntpd now runs as normal user, but must be able to write some files -adduser --system --quiet --group --no-create-home ntp || true -chown -R ntp:ntp /var/log/ntpstats /var/lib/ntp - -# restart the server, in case ntp-server's postinst ran before us -if [ -x "/etc/init.d/ntp-server" ]; then - update-rc.d ntp-server defaults 23 >/dev/null - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d ntp-server restart - else - /etc/init.d/ntp-server restart - fi -fi - - -#DEBHELPER# - -exit 0 diff --git a/debian/ntp-simple.postrm b/debian/ntp-simple.postrm deleted file mode 100644 index d692ba7..0000000 --- a/debian/ntp-simple.postrm +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -#DEBHELPER# - -if [ "$1" = "purge" ]; then - deluser --system --quiet ntp || true - rm -rf /var/lib/ntp/ - rm -rf /var/log/ntpstats/ -fi - -exit 0 diff --git a/debian/ntp-server.cron.daily b/debian/ntp.cron.daily index 7cf2af0..7cf2af0 100644 --- a/debian/ntp-server.cron.daily +++ b/debian/ntp.cron.daily diff --git a/debian/ntp-server.cron.weekly b/debian/ntp.cron.weekly index b3ef262..b3ef262 100644 --- a/debian/ntp-server.cron.weekly +++ b/debian/ntp.cron.weekly diff --git a/debian/ntp-server.dirs b/debian/ntp.dirs index bdf5daf..15c6fb3 100644 --- a/debian/ntp-server.dirs +++ b/debian/ntp.dirs @@ -1,6 +1,9 @@ etc/init.d etc/logcheck/ignore.d.server +etc/network/if-up.d +usr/bin usr/sbin usr/share/man/man1 usr/share/man/man5 -etc/network/if-up.d +var/lib/ntp +var/log/ntpstats diff --git a/debian/docs b/debian/ntp.docs index 30e313f..30e313f 100644 --- a/debian/docs +++ b/debian/ntp.docs diff --git a/debian/ntp-server.ifup b/debian/ntp.ifup index ca29d01..dc87094 100644 --- a/debian/ntp-server.ifup +++ b/debian/ntp.ifup @@ -5,6 +5,6 @@ exit 0 case $ADDRFAM in inet*) - /etc/init.d/ntp-server restart + /etc/init.d/ntp restart ;; esac diff --git a/debian/ntp-server.ignore b/debian/ntp.ignore index f962f9c..f962f9c 100644 --- a/debian/ntp-server.ignore +++ b/debian/ntp.ignore diff --git a/debian/ntp-server.init.d b/debian/ntp.init index 5c70cd7..afba372 100644 --- a/debian/ntp-server.init.d +++ b/debian/ntp.init @@ -36,7 +36,7 @@ case "$1" in exit 1 ;; *) - echo "Usage: /etc/init.d/ntp-server {start|stop|restart|force-reload}" + echo "Usage: $0 {start|stop|restart|force-reload}" exit 1 ;; esac diff --git a/debian/ntp.postinst b/debian/ntp.postinst new file mode 100644 index 0000000..3e8cd7c --- /dev/null +++ b/debian/ntp.postinst @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ "$1" = "configure" ]; then + adduser --system --quiet --group --no-create-home ntp || : + chown -R ntp:ntp /var/lib/ntp /var/log/ntpstats +fi + +#DEBHELPER# diff --git a/debian/ntp-refclock.postrm b/debian/ntp.postrm index d692ba7..d692ba7 100644 --- a/debian/ntp-refclock.postrm +++ b/debian/ntp.postrm diff --git a/debian/rules b/debian/rules index 8b9e9cb..5cc91d7 100755 --- a/debian/rules +++ b/debian/rules @@ -5,40 +5,29 @@ include /usr/share/quilt/quilt.make -config: config-stamp -config-stamp: patch +# hacks to avoid running these things during the build +export ACLOCAL = : aclocal +export AUTOCONF = : autoconf +export AUTOMAKE = : automake +export AUTOHEADER = : autoheader + +config: config.status +config.status: patch dh_testdir chmod a+x configure - # refclock version - mkdir -p build-refclock - cd build-refclock && ../configure --prefix=/usr \ + ./configure --prefix=/usr \ --enable-all-clocks --enable-parse-clocks --enable-SHM \ --disable-debugging --sysconfdir=/var/lib/ntp \ - --cache-file=../config.cache --disable-errorcache \ + --disable-errorcache \ --enable-linuxcaps - touch build-refclock/stamp-h.in - - # build simple version - mkdir -p build-simple - cd build-simple && ../configure --prefix=/usr \ - --disable-all-clocks --disable-parse-clocks \ - --disable-debugging --enable-LOCAL-CLOCK \ - --sysconfdir=/var/lib/ntp --cache-file=../config.cache \ - --disable-errorcache --enable-linuxcaps - touch build-simple/stamp-h.in - - touch config-stamp build: build-stamp -build-stamp: config-stamp version +build-stamp: config.status version dh_testdir - - make -C build-refclock/ntpd - make -C build-simple - - touch build-stamp + $(MAKE) + touch $@ version: debian/changelog dpkg-parsechangelog | sed -ne 's/^Version:[ ]*//p' >$@ @@ -47,9 +36,8 @@ clean: clean-patched unpatch clean-patched: dh_testdir dh_testroot - rm -f config-stamp build-stamp - rm -rf build-simple build-refclock - rm -f config.cache + rm -f build-stamp + -$(MAKE) -i -k distclean -test -r /usr/share/misc/config.sub && \ cp -f /usr/share/misc/config.sub config.sub @@ -65,29 +53,18 @@ install: build-stamp dh_clean -k dh_installdirs - $(MAKE) -C build-simple install \ - bindir=`pwd`/debian/ntp/usr/sbin \ - prefix=`pwd`/debian/ntp/usr + $(MAKE) install bindir=`pwd`/debian/ntp/usr/sbin prefix=`pwd`/debian/ntp/usr # move the user-space programs from /usr/sbin to /usr/bin for file in ntpq ntpdc ntptrace; do \ mv debian/ntp/usr/sbin/$$file debian/ntp/usr/bin/$$file; \ done - # move the daemon to their packages - mv debian/ntp/usr/sbin/ntpd debian/ntp-simple/usr/sbin/ntpd - install build-refclock/ntpd/ntpd debian/ntp-refclock/usr/sbin/ntpd - - # move support programs - for file in ntp-wait ntptime tickadj; do \ - mv debian/ntp/usr/sbin/$$file debian/ntp-server/usr/sbin/$$file; \ - done - - install -o root -g root -m 755 debian/ntp-server.ifup \ - debian/ntp-server/etc/network/if-up.d/ntp-server - install -o root -g root -m 0755 build-simple/scripts/ntpsweep \ + install -o root -g root -m 755 debian/ntp.ifup \ + debian/ntp/etc/network/if-up.d/ntp + install -o root -g root -m 0755 scripts/ntpsweep \ debian/ntp/usr/bin/ntpsweep - install -o root -g root -m 0755 build-simple/util/ntp-keygen \ + install -o root -g root -m 0755 util/ntp-keygen \ debian/ntp/usr/sbin/ntp-keygen install -o root -g root -m 0644 debian/ntpsweep.1 \ debian/ntp/usr/share/man/man1/ntpsweep.1 @@ -96,31 +73,29 @@ install: build-stamp install -o root -g root -m 0644 debian/ntpdate.1 \ debian/ntpdate/usr/share/man/man1/ntpdate.1 install -o root -g root -m 0644 debian/ntpd.1 \ - debian/ntp-simple/usr/share/man/man1/ntpd.1 - install -o root -g root -m 0644 debian/ntpd.1 \ - debian/ntp-refclock/usr/share/man/man1/ntpd.1 + debian/ntp/usr/share/man/man1/ntpd.1 install -o root -g root -m 0644 debian/useless.1 \ debian/ntp/usr/share/man/man1/ntpdc.1 install -o root -g root -m 0644 debian/useless.1 \ debian/ntp/usr/share/man/man1/ntp-keygen.1 install -o root -g root -m 0644 debian/useless.1 \ - debian/ntp-server/usr/share/man/man1/ntp-wait.1 + debian/ntp/usr/share/man/man1/ntp-wait.1 install -o root -g root -m 0644 debian/useless.1 \ debian/ntp/usr/share/man/man1/ntpq.1 install -o root -g root -m 0644 debian/useless.1 \ debian/ntp/usr/share/man/man1/ntptrace.1 install -o root -g root -m 0644 debian/useless.1 \ - debian/ntp-server/usr/share/man/man1/tickadj.1 + debian/ntp/usr/share/man/man1/tickadj.1 install -o root -g root -m 0644 debian/useless.1 \ - debian/ntp-server/usr/share/man/man1/ntptime.1 + debian/ntp/usr/share/man/man1/ntptime.1 install -o root -g root -m 0644 debian/ntp.conf \ - debian/ntp-server/etc + debian/ntp/etc install -o root -g root -m 0644 debian/useless.5 \ - debian/ntp-server/usr/share/man/man5/ntp.conf.5 + debian/ntp/usr/share/man/man5/ntp.conf.5 install -o root -g root -m 0644 debian/ntpdate.default \ debian/ntpdate/etc/default/ntpdate - install -o root -g root -m 0644 debian/ntp-server.ignore \ - debian/ntp-server/etc/logcheck/ignore.d.server/ntp-server + install -o root -g root -m 0644 debian/ntp.ignore \ + debian/ntp/etc/logcheck/ignore.d.server/ntp install -o root -g root -m 0644 debian/ntpdate.ignore \ debian/ntpdate/etc/logcheck/ignore.d.server/ntpdate @@ -162,20 +137,14 @@ binary-arch: build install dh_installmenu -a # dh_installemacsen -a dh_installdebconf -a - dh_installinit -pntp-server --update-rcd-params="defaults 23" + dh_installinit -pntp --update-rcd-params="defaults 23" dh_installinit -pntpdate --update-rcd-params="start 51 S ." \ --init-script=ntpdate dh_installcron -a # dh_installmanpages -a ansi2knr.1 # dh_undocumented dh_installchangelogs -a - - # The non-server utilities get a combined debugging package dh_strip -a - #dh_strip -a --dbg-package=ntp --dbg-package=ntp-simple --dbg-package=ntp-refclock --dbg-package=ntp-server --dbg-package=ntpdate - #mv debian/ntp-server-dbg/usr/lib/debug/usr/sbin/* debian/ntp-dbg/usr/lib/debug/usr/sbin/ - #mv debian/ntpdate-dbg/usr/lib/debug/usr/sbin/* debian/ntp-dbg/usr/lib/debug/usr/sbin/ - dh_compress -a #dh_compress -pntp usr/share/doc/ntp/ChangeLog dh_fixperms -a |