Skip to content
Commits on Source (9)
Show whitespace changes
Inline Side-by-side
debian/README.Debian
View file @ 892cb60b
......@@ -119,3 +119,13 @@ works with the default installation, and changes in your configuration may
require changes to the installed apparmor profile. Please see
https://wiki.ubuntu.com/DebuggingApparmor before filing a bug against this
software.
If your ntpd configuration needs access to a device (for example for a local
DCF clock) you may need to add this device to
/etc/apparmor.d/tunables/ntpd
Afterwards you need to reload the AppArmor profile for the changes to take
effect by executing
# apparmor_parser -r /etc/apparmor.d/usr.sbin.ntpd
debian/changelog
View file @ 892cb60b
ntp (1:4.2.8p10+dfsg-6) unstable; urgency=medium
* Make sntp KoD path FHS-compliant.
Thanks to Aaron Smith (Closes: #863873)
* Drop historic Breaks/Pre-Depends
* Drop historic conffile handling from pre-jessie
* Adjust ntpdate description stating that it is deprecated
* Move Vcs-* to salsa
* Bump Standards-Version to 4.1.3.0, no changes necessary
* Cherry-pick patch from upstream to increase stack size.
Thanks to Frederic Endner-Dühr for testing (Closes: #887385)
* Temporarily add ntpdate lock for systemd wrapper.
Thanks to Christian Ehrhardt (Closes: #874540)
* Add note about AppArmor tunable in README.Debian (Closes: #883949)
-- Bernhard Schmidt <berni@debian.org> Wed, 24 Jan 2018 22:42:13 +0100
ntp (1:4.2.8p10+dfsg-5) unstable; urgency=medium
* Fix arch:all FTBFS due to improper moving of sntp manpage (Closes: #865227)
......
debian/control
View file @ 892cb60b
......@@ -5,10 +5,10 @@ Maintainer: Debian NTP Team <pkg-ntp-maintainers@lists.alioth.debian.org>
Uploaders: Peter Eisentraut <petere@debian.org>, Kurt Roeckx <kurt@roeckx.be>, Bernhard Schmidt <berni@debian.org>
Build-Depends: debhelper (>= 10), libedit-dev, libcap2-dev [linux-any], libssl-dev (>= 1.0.0e-1), autogen (>= 1:5.11), libopts25-dev (>= 1:5.11), pps-tools [linux-any], dh-apparmor
Build-Conflicts: libavahi-compat-libdnssd-dev, libwww-dev, libwww-ssl-dev
Standards-Version: 3.9.8
Standards-Version: 4.1.3.0
Homepage: http://support.ntp.org/
Vcs-Browser: https://anonscm.debian.org/git/pkg-ntp/pkg-ntp.git/
Vcs-Git: https://anonscm.debian.org/git/pkg-ntp/pkg-ntp.git/
Vcs-Browser: https://salsa.debian.org/pkg-ntp-team/ntp
Vcs-Git: https://salsa.debian.org/pkg-ntp-team/ntp.git
Package: ntp
Architecture: any
......@@ -33,17 +33,20 @@ Description: Network Time Protocol daemon and utility programs
Package: ntpdate
Architecture: any
Depends: netbase, sntp-hooks, ${misc:Depends}, ${shlibs:Depends}
Depends: netbase, ${misc:Depends}, ${shlibs:Depends}
Description: client for setting system time from NTP servers (deprecated)
NTP, the Network Time Protocol, is used to keep computer clocks
accurate by synchronizing them over the Internet or a local network,
or by following an accurate hardware receiver that interprets GPS,
DCF-77, NIST or similar time signals.
.
ntpdate is deprecated. Please use sntp instead.
ntpdate is deprecated. Please use sntp instead for manual or scripted
NTP queries/syncs.
.
The ifupdown hooks previously included in the ntpdate package have been
migrated to the package sntp-hooks.
Historically this package also includes hooks for ifupdown and dhclient.
These will be migrated to sntp in the future. If the full NTP daemon from
the package "ntp" is installed, this package is not necessary and may cause
unwanted behaviour.
Package: ntp-doc
Architecture: all
......@@ -75,23 +78,3 @@ Description: Network Time Protocol - sntp client
sntp can be used as an SNTP client to query a NTP or SNTP server and
either display the time or set the local system's time. It is not
sufficient, however, for maintaining an accurate clock in the long run.
Package: sntp-hooks
Architecture: all
Depends: sntp
Description: Network Time Protocol - hooks for sntp
NTP, the Network Time Protocol, is used to keep computer clocks
accurate by synchronizing them over the Internet or a local network,
or by following an accurate hardware receiver that interprets GPS,
DCF-77, NIST or similar time signals.
.
sntp can be used as an SNTP client to query a NTP or SNTP server and
either display the time or set the local system's time. It is not
sufficient, however, for maintaining an accurate clock in the long run.
.
This package contains hooks to automatically sync the time _once_
when a network interface comes up or dhclient obtains a new DHCP lease.
It is meant to be a replacement for the legacy "ntpdate" package.
.
If the full NTP daemon from the package "ntp" is installed, then
sntp-ifupdown is not necessary.
debian/ntp-systemd-wrapper
View file @ 892cb60b
......@@ -2,6 +2,7 @@
DAEMON=/usr/sbin/ntpd
PIDFILE=/var/run/ntpd.pid
LOCKFILE=/run/lock/ntpdate
if [ -r /etc/default/ntp ]; then
. /etc/default/ntp
......@@ -17,5 +18,13 @@ if test "$(uname -s)" = "Linux"; then
NTPD_OPTS="$NTPD_OPTS -u $UGID"
fi
# Protect the service startup against concurrent ntpdate ifup hooks
(
if flock -w 180 9; then
exec $DAEMON -p $PIDFILE $NTPD_OPTS
else
echo "Timeout waiting for $LOCKFILE"
exit 1
fi
) 9>$LOCKFILE
debian/patches/ntpd-increase-stack-size.patch 0 → 100644
View file @ 892cb60b
From: Juergen Perlinger <perlinger@ntp.org>
Subject: increase stack size to at least 32kB
Origin: upstream, http://bugs.ntp.org/show_bug.cgi?id=3391
Bug: http://bugs.ntp.org/show_bug.cgi?id=3391
Bug-Debian: https://bugs.debian.org/887385
diff -Nru a/ntpd/ntpd.c b/ntpd/ntpd.c
--- a/ntpd/ntpd.c 2017-03-27 08:33:16.690969527 +0200
+++ b/ntpd/ntpd.c 2017-03-27 08:33:16.690969527 +0200
@@ -313,11 +313,16 @@
#if defined(HAVE_PTHREAD_ATTR_GETSTACKSIZE) && \
defined(HAVE_PTHREAD_ATTR_SETSTACKSIZE) && \
defined(PTHREAD_STACK_MIN)
- rc = pthread_attr_setstacksize(&thr_attr, PTHREAD_STACK_MIN);
- if (0 != rc)
- msyslog(LOG_ERR,
- "my_pthread_warmup: pthread_attr_setstacksize() -> %s",
- strerror(rc));
+ {
+ size_t ssmin = 32*1024; /* 32kB should be minimum */
+ if (ssmin < PTHREAD_STACK_MIN)
+ ssmin = PTHREAD_STACK_MIN;
+ rc = pthread_attr_setstacksize(&thr_attr, ssmin);
+ if (0 != rc)
+ msyslog(LOG_ERR,
+ "my_pthread_warmup: pthread_attr_setstacksize() -> %s",
+ strerror(rc));
+ }
#endif
rc = pthread_create(
&thread, &thr_attr, my_pthread_warmup_worker, NULL);
debian/patches/series
View file @ 892cb60b
......@@ -9,3 +9,4 @@ reproducible-build.patch
sntp-sysexits.patch
debian-locfile.patch
sntp-kod-location.patch
ntpd-increase-stack-size.patch