Makefile.am | 4 0 + 4 - 0 !
adjtimed/adjtimed.c | 2 0 + 2 - 0 !
configure.ac | 50 24 + 26 - 0 !
include/Makefile.am | 4 0 + 4 - 0 !
libntp/Makefile.am | 1 0 + 1 - 0 !
libparse/Makefile.am | 2 0 + 2 - 0 !
ntpd/Makefile.am | 1 0 + 1 - 0 !
scripts/Makefile.am | 1 0 + 1 - 0 !
8 files changed, 24 insertions(+), 41 deletions(-)

 make the package compile with non dfsg compatible parts removed.

include/ntp_control.h | 4 4 + 0 - 0 !
include/ntpd.h | 1 1 + 0 - 0 !
2 files changed, 5 insertions(+)

---

ntpdate/ntpdate.c | 3 1 + 2 - 0 !
1 file changed, 1 insertion(+), 2 deletions(-)

---

ntpd/ntpd.c | 23 23 + 0 - 0 !
1 file changed, 23 insertions(+)

 runtime check for capabilities
Bug: http://bugs.ntp.org/1433
Bug-Debian: http://bugs.debian.org/282941
Bug-Debian: http://bugs.debian.org/298059

add runtime check whether the kernel really supports capabilities; do
not drop root privileges if not

ntpd/ntpd.c | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 do not set cap_sys_time as inheritable
Bug: http://bugs.ntp.org/1432
Bug-Debian: http://bugs.debian.org/282941
Bug-Debian: http://bugs.debian.org/298059

ntpd/ntp_intres.c | 8 4 + 4 - 0 !
1 file changed, 4 insertions(+), 4 deletions(-)

---

libntp/ssl_init.c | 9 0 + 9 - 0 !
1 file changed, 9 deletions(-)

---

libntp/ntp_lineedit.c | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

---

Makefile.in | 43 28 + 15 - 0 !
aclocal.m4 | 6175 8 + 6167 - 0 !
adjtimed/Makefile.in | 24 19 + 5 - 0 !
clockstuff/Makefile.in | 24 19 + 5 - 0 !
config.h.in | 10 4 + 6 - 0 !
configure | 18441 8689 + 9752 - 0 !
include/Makefile.in | 32 21 + 11 - 0 !
include/isc/Makefile.in | 24 19 + 5 - 0 !
kernel/Makefile.in | 28 21 + 7 - 0 !
kernel/sys/Makefile.in | 24 19 + 5 - 0 !
libntp/Makefile.in | 37 24 + 13 - 0 !
libopts/Makefile.in | 24 19 + 5 - 0 !
libparse/Makefile.in | 41 25 + 16 - 0 !
ltmain.sh | 12923 7403 + 5520 - 0 !
m4/libtool.m4 | 7377 7377 + 0 - 0 !
m4/ltoptions.m4 | 368 368 + 0 - 0 !
m4/ltsugar.m4 | 123 123 + 0 - 0 !
m4/ltversion.m4 | 23 23 + 0 - 0 !
m4/lt~obsolete.m4 | 92 92 + 0 - 0 !
ntpd/Makefile.in | 44 28 + 16 - 0 !
ntpdate/Makefile.in | 24 19 + 5 - 0 !
ntpdc/Makefile.in | 24 19 + 5 - 0 !
ntpq/Makefile.in | 24 19 + 5 - 0 !
parseutil/Makefile.in | 24 19 + 5 - 0 !
scripts/Makefile.in | 33 22 + 11 - 0 !
25 files changed, 24427 insertions(+), 21579 deletions(-)

 regenerate auto* because we modified some of the auto generated files.

include/ntp_syscall.h | 8 8 + 0 - 0 !
1 file changed, 8 insertions(+)

---

ntpd/ntp_loopfilter.c | 57 28 + 29 - 0 !
1 file changed, 28 insertions(+), 29 deletions(-)

 detect that the kernel has nano support or not.
Bug: https://support.ntp.org/bugs/show_bug.cgi?id=888

The code assumed that if STA_NANO is defined the kernel has nano
support.  But on Linux, only kernel 2.6.26 and later have nano
kernel support.  If run on an older kernel, ntpd does not behave
properly because all values it sends to the kernel are
off by a factor 1000.

When the nano kernel was designed there was logic added to
detect it.  But this got removed from the ntpd binary.  This
adds the code again like it was in 4.2.0.