Merge ~kick-d/ubuntu/+source/ntp:logical/4.2.8p4+dfsg-3-ntpdate.if-up into ~ubuntu-server-dev/ubuntu/+source/ntp:debian/sid

[Kick In]

[Robie Basak (racb)]

For reference, we reviewed this in person. The merge mechanics were all correct, but I additionally wanted some additional changelog explanation and extra consideration for all of the delta that has been carried forward through previous merges without much thought, since it all seemed quite large and much of it didn't seem to be necessarily Ubuntu-specific.

Pierre kindly summarised our conversation with the following TODO:

After Robies's review, stuff to do:

Right now:
----------
Remove cron stuf (per mdeslaur irc comment)
Go to original bug into ubuntu regarding the sed rule, add a note in the PPS section about the need to disable the dhcp ntp stuff. (collective decision)
Explanation of pool to server delta. (better explanation in changelog)
Add fPIC confirmed with Marc Deslauriers. (add the fact that it is acknowledge by security team)
Explain the hardening-wrapper better. (deprecated message at build-package time)
Explain update-rcd-update. ( The fact that it is not supported anymore at dpkg --configure install)
Explain drop empty ntp.conf before trusty. (natty timeframe)
Ask caribou to check CVEs. (to double check with fresh eyes)
Rebase the work, and tag the actual with review. (for ease of use)

Later, after debian bug discussions:
-----------------------------------
Openntp and stop / start, bug to debian. (analyse the correctness of this change, drop or initiate debian discussion accordingly)
The -nt /etc/dhcp.conf, same as above.
Enable-debugging to be dropped, bug to debian, drop later.
Depends bison to get included to debian.

What remains is (again, Pierre's summary):

.-Go to original bug into ubuntu regarding the sed rule,
.-Openntp and stop / start, bug to debian. (analyse the correctness of this change, drop or initiate debian discussion accordingly)
.-The -nt /etc/dhcp.conf, same as above.
.-Enable-debugging to be dropped, bug to debian, drop later.
.-Depends bison to get included to debian.
.-Verify dhclient.conf responsible package for eventual ntp-servers request delta. if ubuntu, change README.Debian in this ntp package, else file a bug against Debian.

I did "Go to original bug into ubuntu regarding the sed rule" since I wanted to mention that in the changelog.

[Robie Basak (racb)]

I made some tweaks to the changelog (I'll push the git tree to ~ubuntu-server-dev shortly with the breakdown) and uploaded. Thanks Pierre - this was a particularly complex merge and you handled it well.

diff --git a/debian/README.Debian b/debian/README.Debian
index 09ffdc2..158fa9b 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -111,10 +111,25 @@ of these keys has not yet been tested; please report success or
 failure in using them to the maintainer.
 
 
-PPSkit
-------
-
-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.
+PPS
+---
+
+This build of ntp has been pps enabled. You can use a pps reference clock,
+the default discipline is ntpd pps. On Xenial you have core_pps kernel driver
+compiled as a module per default. To achieve better accuracy, you may need to
+rebuild your kernel with CONFIG_NTP_PPS, which need CONFIG_NO_HZ=n to be
+set, you may also add CONFIG_RCU_FAST_NO_HZ.
+You can find more information there:
+-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=691672#41
+-http://www.ntp.org/ntpfaq/NTP-s-config-adv.htm#S-CONFIG-ADV-PPS
+-http://www.ntp.org/ntpfaq/NTP-s-algo-kernel.htm#Q-ALGO-KERNEL-HARDPPS
+
+
+Apparmor Profile
+----------------
+
+If your system uses AppArmor, please note that the shipped enforcing profile
+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.
diff --git a/debian/apparmor-profile b/debian/apparmor-profile
new file mode 100644
index 0000000..48e8d7a
--- /dev/null
+++ b/debian/apparmor-profile
@@ -0,0 +1,81 @@
+# vim:syntax=apparmor
+# Updated for Ubuntu by: Jamie Strandboge <[e-mail]>
+# ------------------------------------------------------------------
+#
+#    Copyright (C) 2002-2005 Novell/SUSE
+#    Copyright (C) 2009-2012 Canonical Ltd.
+#
+#    This program is free software; you can redistribute it and/or
+#    modify it under the terms of version 2 of the GNU General Public
+#    License published by the Free Software Foundation.
+#
+# ------------------------------------------------------------------
+
+#include <tunables/global>
+#include <tunables/ntpd>
+/usr/sbin/ntpd {
+  #include <abstractions/base>
+  #include <abstractions/nameservice>
+  #include <abstractions/user-tmp>
+
+  capability ipc_lock,
+  capability net_bind_service,
+  capability setgid,
+  capability setuid,
+  capability sys_chroot,
+  capability sys_resource,
+  capability sys_time,
+  capability sys_nice,
+
+  network inet dgram,
+  network inet6 dgram,
+  network inet stream,
+  network inet6 stream,
+
+  @{PROC}/net/if_inet6 r,
+  @{PROC}/*/net/if_inet6 r,
+  @{NTPD_DEVICE} rw,
+
+  /{,s}bin/      r,
+  /usr/{,s}bin/  r,
+  /usr/sbin/ntpd rmix,
+
+  /etc/ntp.conf r,
+  /etc/ntp.conf.dhcp r,
+  /etc/ntpd.conf r,
+  /etc/ntpd.conf.tmp r,
+  /var/lib/ntp/ntp.conf.dhcp r,
+
+  /etc/ntp.keys r,
+  /etc/ntp/** r,
+
+  /etc/ntp.drift rwl,
+  /etc/ntp.drift.TEMP rwl,
+  /etc/ntp/drift* rwl,
+  /var/lib/ntp/*drift rw,
+  /var/lib/ntp/*drift.TEMP rw,
+
+  /var/log/ntp w,
+  /var/log/ntp.log w,
+  /var/log/ntpd w,
+  /var/log/ntpstats/clockstats* rwl,
+  /var/log/ntpstats/loopstats*  rwl,
+  /var/log/ntpstats/peerstats*  rwl,
+  /var/log/ntpstats/protostats* rwl,
+  /var/log/ntpstats/rawstats*   rwl,
+  /var/log/ntpstats/sysstats*   rwl,
+
+  /{,var/}run/ntpd.pid w,
+
+  # samba4 ntp signing socket
+  /{,var/}run/samba/ntp_signd/socket rw,
+
+  # For use with clocks that report via shared memory (e.g. gpsd),
+  # you may need to give ntpd access to all of shared memory, though
+  # this can be considered dangerous. See https://launchpad.net/bugs/722815
+  # for details. To enable, add this to local/usr.sbin.ntpd:
+  #     capability ipc_owner,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/usr.sbin.ntpd>
+}
diff --git a/debian/apparmor-profile.tunable b/debian/apparmor-profile.tunable
new file mode 100644
index 0000000..1fc2d8f
--- /dev/null
+++ b/debian/apparmor-profile.tunable
@@ -0,0 +1,15 @@
+# vim:syntax=apparmor
+# ------------------------------------------------------------------
+#
+#    Copyright (C) 2002-2005 Novell/SUSE
+#    Copyright (C) 2011 Canonical, Ltd.
+#
+#    This program is free software; you can redistribute it and/or
+#    modify it under the terms of version 2 of the GNU General Public
+#    License published by the Free Software Foundation.
+#
+# ------------------------------------------------------------------
+
+#Add your ntpd devices here eg. if you have a DCF clock
+# @{NTPD_DEVICE}="/dev/ttyS1"
+@{NTPD_DEVICE}="/dev/null"
diff --git a/debian/changelog b/debian/changelog
index 3cad879..7b174ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,60 @@
+ntp (1:4.2.8p4+dfsg-3ubuntu1~ppa12) xenial; urgency=medium
+
+  * Merge from unstable (LP: #1479652). Remaining changes:
+    + debian/rules: enable debugging.
+    + debian/rules, debian/ntp.dirs, debian/source_ntp.py: Add apport hook.
+    + Add enforcing AppArmor profile:
+      - debian/control: Add Conflicts/Replaces on apparmor-profiles.
+      - debian/control: Add Suggests on apparmor.
+      - debian/control: Build-Depends on dh-apparmor.
+      - add debian/apparmor-profile*.
+      - debian/ntp.dirs: Add apparmor directories.
+      - debian/rules: Install apparmor-profile and apparmor-profile.tunable.
+      - debian/source_ntp.py: Add filter on AppArmor profile names to prevent
+        false positives from denials originating in other packages.
+      - debian/README.Debian: Add note on AppArmor.
+    + debian/ntpdate.if-up: Fix interaction with openntpd. Stop ntp before
+      running ntpdate when an interface comes up, then start again afterwards.
+    + debian/ntp.init, debian/rules: Only stop when entering single user mode,
+      don't use /var/lib/ntp/ntp.conf.dhcp if /etc/ntp.conf is newer - it can
+      get stale. Patch by Simon Déziel.
+    + debian/ntp.conf, debian/ntpdate.default: Change default server to
+      ntp.ubuntu.com.
+    + debian/ntp.dhcp: Rewrite sed rules.
+    + debian/control: Add bison to Build-Depends (for ntpd/ntp_parser.y).
+  * Add PPS support (LP: #1512980):
+    + debian/README.Debian: Add a PPS section to the README.Debian, removed all PPSkit one.
+    + debian/ntp.conf: Add some configuration examples from the offical documentation.
+    + debian/control: Add Build-Depends on pps-tools
+  * debian/ntp.cron.daily: Fix security issues wrt to cron.daily (LP: #1528050).
+  * Drop Changes:
+    + debian/rules: Update config.{guess,sub} for AArch64, because upstream use
+      dh_autoreconf now.
+    + debian/rules: Add and enable hardened build for PIE. Upstream use fPIC.
+      Options -fPIC and -fPIE are uncompatible, thus this is never applied,
+      (cf. dpkg-buildflags manual).
+    + debian/control: Add depends on hardening-wrapper, deprecated.
+    + debian/rules: Remove update-rcd-params in dh_installinit command.
+    + debian/rules: Remove ntp/ntp_parser.{c,h} or they don't get properly
+      regenerated for some reason. Seems to have been due to ntpd/ntp_parser.y
+      patches from CVE-2015-5194 and CVE-2015-5196, already upstreamed.
+    + debian/ntpdate.if-up: Drop lockfile mechanism as upstream is using flock
+      now.
+    + debian/ntp.preinst: Remove empty /etc/ntp.conf on fresh intallation.
+    + debian/ntpdate-debian: Disregard empty ntp.conf files.
+  * All previous ubuntu security patches/fixes have been upstreamed:
+    + CVE-2015-5146, CVE-2015-5194, CVE-2015-5195, CVE-2015-5196, CVE-2015-7703,
+      CVE-2015-5219, CVE-2015-5300, CVE-2015-7691, CVE-2015-7692, CVE-2015-7702,
+      CVE-2015-7701, CVE-2015-7704, CVE-2015-7705, CVE-2015-7850, CVE-2015-7852,
+      CVE-2015-7853, CVE-2015-7855, CVE-2015-7871, CVE-2015-1798, CVE-2015-1799,
+      CVE-2014-9297, CVE-2014-9298, CVE-2014-9293, CVE-2014-9294, CVE-2014-9295,
+      CVE-2014-9296
+    + Fix to ignore ENOBUFS on routing netlink socket
+    + Fix use-after-free in routing socket code
+    + ntp-keygen infinite loop or lack of randonmess on big endian platforms
+
+ -- Pierre-André MOREY <[e-mail]>  Sat, 23 Jan 2016 00:26:44 +0100
+
 ntp (1:4.2.8p4+dfsg-3) unstable; urgency=medium
 
   * Remove rlimit memlock from default config file, the default is now
@@ -105,6 +162,200 @@ ntp (1:4.2.6.p5+dfsg-3.1) unstable; urgency=low
 
  -- Wookey <[e-mail]>  Tue, 15 Jul 2014 11:54:21 +0800
 
+ntp (1:4.2.6.p5+dfsg-3ubuntu9) xenial; urgency=medium
+
+  [ Cam Cope ]
+  * Use a single lockfile again - instead unlock the file before starting the
+    init script. The lock sho uld be shared - both services can't run at the
+    same time. (LP: #1125726)
+
+ -- Iain Lane <[e-mail]>  Mon, 07 Dec 2015 13:38:16 +0000
+
+ntp (1:4.2.6.p5+dfsg-3ubuntu8.1) wily-security; urgency=medium
+
+  * SECURITY UPDATE: denial of service via crafted NUL-byte in
+    configuration directive
+    - debian/patches/CVE-2015-5146.patch: properly validate command in
+      ntpd/ntp_control.c.
+    - CVE-2015-5146
+  * SECURITY UPDATE: denial of service via malformed logconfig commands
+    - debian/patches/CVE-2015-5194.patch: fix logconfig logic in
+      ntpd/ntp_parser.y.
+    - CVE-2015-5194
+  * SECURITY UPDATE: denial of service via disabled statistics type
+    - debian/patches/CVE-2015-5195.patch: handle unrecognized types in
+      ntpd/ntp_config.c.
+    - CVE-2015-5195
+  * SECURITY UPDATE: file overwrite via remote pidfile and driftfile
+    configuration directives
+    - debian/patches/CVE-2015-5196.patch: disable remote configuration in
+      ntpd/ntp_parser.y.
+    - CVE-2015-5196
+    - CVE-2015-7703
+  * SECURITY UPDATE: denial of service via precision value conversion
+    - debian/patches/CVE-2015-5219.patch: use ldexp for LOGTOD in
+      include/ntp.h.
+    - CVE-2015-5219
+  * SECURITY UPDATE: timeshifting by reboot issue
+    - debian/patches/CVE-2015-5300.patch: disable panic in
+      ntpd/ntp_loopfilter.c.
+    - CVE-2015-5300
+  * SECURITY UPDATE: incomplete autokey data packet length checks
+    - debian/patches/CVE-2015-7691.patch: add length and size checks to
+      ntpd/ntp_crypto.c.
+    - CVE-2015-7691
+    - CVE-2015-7692
+    - CVE-2015-7702
+  * SECURITY UPDATE: memory leak in CRYPTO_ASSOC
+    - debian/patches/CVE-2015-7701.patch: add missing free in
+      ntpd/ntp_crypto.c.
+    - CVE-2015-7701
+  * SECURITY UPDATE: denial of service by spoofed KoD
+    - debian/patches/CVE-2015-7704.patch: add check to ntpd/ntp_proto.c.
+    - CVE-2015-7704
+    - CVE-2015-7705
+  * SECURITY UPDATE: denial of service via same logfile and keyfile
+    - debian/patches/CVE-2015-7850.patch: rate limit errors in
+      include/ntp_stdlib.h, include/ntp_syslog.h, libntp/authreadkeys.c,
+      libntp/msyslog.c.
+    - CVE-2015-7850
+  * SECURITY UPDATE: ntpq atoascii memory corruption
+    - debian/patches/CVE-2015-7852.patch: avoid buffer overrun in
+      ntpq/ntpq.c.
+    - CVE-2015-7852
+  * SECURITY UPDATE: buffer overflow via custom refclock driver
+    - debian/patches/CVE-2015-7853.patch: properly calculate length in
+      ntpd/ntp_io.c.
+    - CVE-2015-7853
+  * SECURITY UPDATE: denial of service via ASSERT in decodenetnum
+    - debian/patches/CVE-2015-7855.patch: simply return fail in
+      libntp/decodenetnum.c.
+    - CVE-2015-7855
+  * SECURITY UPDATE: symmetric association authentication bypass via
+    crypto-NAK
+    - debian/patches/CVE-2015-7871.patch: drop unhandled packet in
+      ntpd/ntp_proto.c.
+    - CVE-2015-7871
+  * debian/control: add bison to Build-Depends.
+  * debian/rules: remove ntp/ntp_parser.{c,h} or they don't get properly
+    regenerated for some reason.
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 22 Oct 2015 16:38:14 -0400
+
+ntp (1:4.2.6.p5+dfsg-3ubuntu8) wily; urgency=medium
+
+  * debian/ntp.init: Don't use /var/lib/ntp/ntp.conf.dhcp if /etc/ntp.conf is
+    newer - it can get stale. Patch by Simon Déziel. (LP: #1472056)
+
+ -- Iain Lane <[e-mail]>  Fri, 02 Oct 2015 10:45:41 +0100
+
+ntp (1:4.2.6.p5+dfsg-3ubuntu7) wily; urgency=medium
+
+  * Fix use-after-free in routing socket code (LP: #1481388)
+    - debian/patches/use-after-free-in-routing-socket.patch
+      fix logic in ntpd/ntp_io.c
+  * Fix to ignore ENOBUFS on routing netlink socket
+    - debian/patches/ignore-ENOBUFS-on-routing-netlink-socket.patch 
+      fix logic in ntpd/ntp_io.c
+
+ -- Eric Desrochers <[e-mail]>  Wed, 02 Sep 2015 09:57:16 -0400
+
+ntp (1:4.2.6.p5+dfsg-3ubuntu6) vivid; urgency=medium
+
+  * SECURITY UPDATE: ntp-keygen infinite loop or lack of randonmess on big
+    endian platforms
+    - debian/patches/ntp-keygen-endless-loop.patch: fix logic in
+      util/ntp-keygen.c.
+    - CVE number pending
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 13 Apr 2015 08:58:57 -0400
+
+ntp (1:4.2.6.p5+dfsg-3ubuntu5) vivid; urgency=medium
+
+  * SECURITY UPDATE: symmetric key unauthenticated packet MITM attack
+    - debian/patches/CVE-2015-1798.patch: reject packets without MAC in
+      ntpd/ntp_proto.c.
+    - CVE-2015-1798
+  * SECURITY UPDATE: symmetric association DoS attack
+    - debian/patches/CVE-2015-1799.patch: don't update state variables when
+      authentication fails in ntpd/ntp_proto.c.
+    - CVE-2015-1799
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 07 Apr 2015 12:48:31 -0400
+
+ntp (1:4.2.6.p5+dfsg-3ubuntu4) vivid; urgency=medium
+
+  * SECURITY UPDATE: denial of service and possible info leakage via
+    extension fields
+    - debian/patches/CVE-2014-9297.patch: properly check lengths in
+      ntpd/ntp_crypto.c, ntpd/ntp_proto.c.
+    - CVE-2014-9297
+  * SECURITY UPDATE: IPv6 ACL bypass
+    - debian/patches/CVE-2014-9298.patch: check for spoofed ::1 in
+      ntpd/ntp_io.c.
+    - CVE-2014-9298
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 09 Feb 2015 13:03:44 -0500
+
+ntp (1:4.2.6.p5+dfsg-3ubuntu3) vivid; urgency=medium
+
+  * SECURITY UPDATE: weak default key in config_auth()
+    - debian/patches/CVE-2014-9293.patch: use openssl for random key in
+      ntpd/ntp_config.c, ntpd/ntpd.c.
+    - CVE-2014-9293
+  * SECURITY UPDATE: non-cryptographic random number generator with weak
+    seed used by ntp-keygen to generate symmetric keys
+    - debian/patches/CVE-2014-9294.patch: use openssl for random key in
+      include/ntp_random.h, libntp/ntp_random.c, util/ntp-keygen.c.
+    - CVE-2014-9294
+  * SECURITY UPDATE: buffer overflows in crypto_recv(), ctl_putdata(),
+    configure()
+    - debian/patches/CVE-2014-9295.patch: check lengths in
+      ntpd/ntp_control.c, ntpd/ntp_crypto.c.
+    - CVE-2014-9295
+  * SECURITY UPDATE: missing return on error in receive()
+    - debian/patches/CVE-2015-9296.patch: add missing return in
+      ntpd/ntp_proto.c.
+    - CVE-2014-9296
+
+ -- Marc Deslauriers <[e-mail]>  Sat, 20 Dec 2014 05:47:10 -0500
+
+ntp (1:4.2.6.p5+dfsg-3ubuntu2) saucy; urgency=low
+
+  * debian/apparmor-profile: fix spurious noisy denials (LP: #1237508)
+
+ -- Jamie Strandboge <[e-mail]>  Wed, 09 Oct 2013 12:28:02 -0500
+
+ntp (1:4.2.6.p5+dfsg-3ubuntu1) saucy; urgency=low
+
+  * Merge from Debian testing to regain crypto support (LP: #1236065). Remaining
+    changes:
+    + debian/ntp.conf, debian/ntpdate.default: Change default server to
+      ntp.ubuntu.com.
+    + debian/ntpdate.if-up: Stop ntp before running ntpdate when an interface
+      comes up, then start again afterwards.
+    + debian/ntp.init, debian/rules: Only stop when entering single user mode.
+    + Add enforcing AppArmor profile:
+      - debian/control: Add Conflicts/Replaces on apparmor-profiles.
+      - debian/control: Add Suggests on apparmor.
+      - debian/ntp.dirs: Add apparmor directories.
+      - debian/ntp.preinst: Force complain on certain upgrades.
+      - debian/ntp.postinst: Reload apparmor profile.
+      - debian/ntp.postrm: Remove the force-complain file.
+      - add debian/apparmor-profile*.
+      - debian/rules: install apparmor-profile and apparmor-profile.tunable.
+      - debian/README.Debian: Add note on AppArmor.
+    + debian/{control,rules}: Add and enable hardened build for PIE.
+    + debian/rules, debian/ntp.dirs, debian/source_ntp.py: Add apport hook.
+    + debian/ntpdate-debian: Disregard empty ntp.conf files.
+    + debian/ntp.preinst: Remove empty /etc/ntp.conf on fresh intallation.
+    + debian/ntpdate.if-up: Fix interaction with openntpd.
+    + debian/source_ntp.py: Add filter on AppArmor profile names to prevent
+      false positives from denials originating in other packages.
+    + debian/rules: Update config.{guess,sub} for AArch64.
+
+ -- Tyler Hicks <[e-mail]>  Sun, 06 Oct 2013 12:34:00 -0700
+
 ntp (1:4.2.6.p5+dfsg-3) unstable; urgency=low
 
   * Look for <openssl/opensslv.h> rather than <openssl/opensslconf.h>, which
@@ -113,6 +364,51 @@ ntp (1:4.2.6.p5+dfsg-3) unstable; urgency=low
 
  -- Kurt Roeckx <[e-mail]>  Mon, 20 May 2013 16:14:07 +0200
 
+ntp (1:4.2.6.p5+dfsg-2ubuntu3) saucy; urgency=low
+
+  * Update config.{guess,sub} for AArch64.
+
+ -- Matthias Klose <[e-mail]>  Mon, 05 Aug 2013 18:51:48 +0200
+
+ntp (1:4.2.6.p5+dfsg-2ubuntu2) saucy; urgency=low
+
+  * debian/apparmor-profile: Add /var/log/ntpstats/protostats* (LP: #1195898)
+
+ -- Jamie Strandboge <[e-mail]>  Fri, 05 Jul 2013 10:06:47 -0500
+
+ntp (1:4.2.6.p5+dfsg-2ubuntu1) raring; urgency=low
+
+  * New upstream version, fixing build failure in raring.
+  * Merge with Debian; remaining changes:
+    + debian/ntp.conf, debian/ntpdate.default: Change default server to
+      ntp.ubuntu.com.
+    + debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface
+      comes up, then start again afterwards.
+    + debian/ntp.init, debian/rules: Only stop when entering single user mode.
+    + Add enforcing AppArmor profile:
+      - debian/control: Add Conflicts/Replaces on apparmor-profiles.
+      - debian/control: Add Suggests on apparmor.
+      - debian/ntp.dirs: Add apparmor directories.
+      - debian/ntp.preinst: Force complain on certain upgrades.
+      - debian/ntp.postinst: Reload apparmor profile.
+      - debian/ntp.postrm: Remove the force-complain file.
+      - add debian/apparmor-profile*.
+      - debian/rules: install apparmor-profile and apparmor-profile.tunable.
+      - debian/README.Debian: Add note on AppArmor.
+    + debian/{control,rules}: Add and enable hardened build for PIE.
+    + debian/apparmor-profile: Adjust location of drift files.
+    + debian/rules, debian/ntp.dirs, debian/source_ntp.py: Add apport hook.
+    + debian/ntpdate-debian: Disregard empty ntp.conf files.
+    + debian/ntp.preinst: Remove empty /etc/ntp.conf on fresh intallation.
+    + debian/ntpdate.ifup: Fix interaction with openntpd.
+    + debian/source_ntp.py: Add filter on AppArmor profile names to prevent
+      false positives from denials originating in other packages.
+    + debian/apparmor-profile: Add samba4 ntp signing socket to ntpd apparmor
+      profile.
+    + debian/apparmor-profile: adjust for IPv6.
+
+ -- Matthias Klose <[e-mail]>  Wed, 03 Apr 2013 07:21:01 +0200
+
 ntp (1:4.2.6.p5+dfsg-2) unstable; urgency=medium
 
   * Re-enable crypto support by pointing openssl libdir to multiarch dir.
@@ -167,6 +463,67 @@ ntp (1:4.2.6.p3+dfsg-2) unstable; urgency=low
 
  -- Peter Eisentraut <[e-mail]>  Sat, 17 Dec 2011 19:00:10 +0200
 
+ntp (1:4.2.6.p3+dfsg-1dbuntu5) quantal; urgency=low
+
+  * debian/source_ntp.py: add filter on AppArmor profile names to prevent
+    false positives from denials originating in other packages.
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 20 Aug 2012 10:13:30 -0400
+
+ntp (1:4.2.6.p3+dfsg-1ubuntu4) quantal; urgency=low
+
+  * Re-enable crypto support by pointing openssl libdir to multiarch dir,
+    change backported from Debian, thanks Yves-Alexis Perez (lp: #998403)
+
+ -- Sebastien Bacher <[e-mail]>  Mon, 04 Jun 2012 16:35:25 +0200
+
+ntp (1:4.2.6.p3+dfsg-1ubuntu3) precise; urgency=low
+
+  * debian/apparmor-profile: Add samba4 ntp signing socket to ntpd apparmor
+    profile (LP: #930266)
+  * debian/control: Build-Depends on dh-apparmor
+
+ -- Jamie Strandboge <[e-mail]>  Tue, 06 Mar 2012 08:06:06 -0600
+
+ntp (1:4.2.6.p3+dfsg-1ubuntu2) precise; urgency=low
+
+  * debian/apparmor-profile: adjust for IPv6 (LP: #892332)
+
+ -- Jamie Strandboge <[e-mail]>  Tue, 03 Jan 2012 17:03:44 -0600
+
+ntp (1:4.2.6.p3+dfsg-1ubuntu1) precise; urgency=low
+
+  * Merge from debian unstable, remaining changes are:
+    + debian/ntp.conf, debian/ntpdate.default: Change default server to
+      ntp.ubuntu.com.
+    + debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface
+      comes up, then start again afterwards.
+    + debian/ntp.init, debian/rules: Only stop when entering single user mode.
+    + Add enforcing AppArmor profile (LP: #382905):
+      - debian/control: add Conflicts/Replaces on apparmor-profiles <
+        2.3.1+1403-0ubuntu10 (since we are now shipping usr.sbin.ntpd) and
+        apparmor < 2.3.1+1403-0ubuntu10 (since we are now shipping tunables/ntpd)
+      - debian/control: add Suggests on apparmor
+      - debian/ntp.dirs: add apparmor directories
+      - debian/ntp.preinst: force complain on certain upgrades
+      - debian/ntp.postinst: reload apparmor profile
+      - debian/ntp.postrm: remove the force-complain file
+      - add debian/apparmor-profile*
+      - debian/rules: install apparmor-profile and apparmor-profile.tunable
+      - debian/README.Debian: add note on AppArmor
+    + debian/{control,rules}: add and enable hardened build for PIE
+      (Debian bug 542721).
+    + debian/apparmor-profile: adjust location of drift files (LP: #456308)
+    + debian/rules, debian/ntp.dirs, debian/source_ntp.py: Add apport hook.
+    + debian/ntpdate-debian: Disregard empty ntp.conf files. (LP: #83604)
+    + debian/ntp.preinst: Remove empty /etc/ntp.conf on fresh intallation,
+      to work around  the system-tools-backends part of LP #83604.
+    + debian/ntpdate.ifup: Fix interaction with openntpd. (LP: #877210)
+    + Dropped:
+      - ntpdate-accept-same-timestamp-replies.patch: Accepted upstream
+
+ -- Chuck Short <[e-mail]>  Wed, 26 Oct 2011 10:24:21 -0400
+
 ntp (1:4.2.6.p3+dfsg-1) unstable; urgency=low
 
   * New upstream version
@@ -182,6 +539,117 @@ ntp (1:4.2.6.p3+dfsg-1) unstable; urgency=low
 
  -- Kurt Roeckx <[e-mail]>  Fri, 03 Jun 2011 16:39:02 +0200
 
+ntp (1:4.2.6.p2+dfsg-1ubuntu13) precise; urgency=low
+
+  * debian/ntpdate.if-up: Fix interaction with openntpd, LP: #872210
+
+ -- Reinhard Tartler <[e-mail]>  Tue, 11 Oct 2011 12:33:01 +0200
+
+ntp (1:4.2.6.p2+dfsg-1ubuntu12) oneiric; urgency=low
+
+  * debian/apparmor-profile: also allow access to /var/log/ntpstats/rawstats*
+
+ -- Jamie Strandboge <[e-mail]>  Fri, 02 Sep 2011 12:35:08 -0500
+
+ntp (1:4.2.6.p2+dfsg-1ubuntu11) oneiric; urgency=low
+
+  * debian/apparmor-profile: allow sys_nice for -N option to work. More
+    work is needed to make ntpd start niced, so not auto-closing the bug.
+    - LP: 229632
+
+ -- Jamie Strandboge <[e-mail]>  Fri, 19 Aug 2011 07:39:20 -0500
+
+ntp (1:4.2.6.p2+dfsg-1ubuntu10) oneiric; urgency=low
+
+  * debian/source_ntp.py: use new apport MAC function instead of parsing
+    and attaching AppArmor events here.
+
+ -- Marc Deslauriers <[e-mail]>  Fri, 15 Jul 2011 08:33:08 -0400
+
+ntp (1:4.2.6.p2+dfsg-1ubuntu9) oneiric; urgency=low
+
+  * debian/apparmor-profile: Allow /var/run and /run. (LP: #810270)
+
+ -- Martin Pitt <[e-mail]>  Thu, 14 Jul 2011 15:12:09 +0200
+
+ntp (1:4.2.6.p2+dfsg-1ubuntu8) oneiric; urgency=low
+
+  * debian/patches/ntpdate-accept-same-timestamp-replies.patch: 
+    Resolving regression where ntpdate ignores replies from some
+    ntp servers where recieve and transmit timestamps are equal.  
+    Patch cherry picked from upstream commit. (LP: #787551)
+
+ -- Dave Walker (Daviey) <[e-mail]>  Mon, 13 Jun 2011 15:22:29 +0100
+
+ntp (1:4.2.6.p2+dfsg-1ubuntu7) oneiric; urgency=low
+
+  * Fix a number of -Wformat-security warnings.
+
+ -- Colin Watson <[e-mail]>  Fri, 20 May 2011 12:20:07 +0100
+
+ntp (1:4.2.6.p2+dfsg-1ubuntu6) oneiric; urgency=low
+
+  * Rebuild for OpenSSL 1.0.0.
+
+ -- Colin Watson <[e-mail]>  Tue, 17 May 2011 17:24:01 +0100
+
+ntp (1:4.2.6.p2+dfsg-1ubuntu5) natty; urgency=low
+
+  * debian/apparmor-profile: add note about using shared memory for
+    a clock source (LP: #722815).
+
+ -- Kees Cook <[e-mail]>  Thu, 10 Mar 2011 12:54:59 -0800
+
+ntp (1:4.2.6.p2+dfsg-1ubuntu4) natty; urgency=low
+
+  * debian/ntp.conf: adjust to use X.ubuntu.pool.ntp.org in addition to
+    ntp.ubuntu.com (LP: #104525)
+
+ -- Jamie Strandboge <[e-mail]>  Tue, 08 Feb 2011 10:03:19 -0600
+
+ntp (1:4.2.6.p2+dfsg-1ubuntu3) natty; urgency=low
+
+  * debian/apparmor-profile: allow access to clockstats too (LP: #701896)
+
+ -- Jamie Strandboge <[e-mail]>  Wed, 12 Jan 2011 10:05:41 -0600
+
+ntp (1:4.2.6.p2+dfsg-1ubuntu2) natty; urgency=low
+
+  * debian/ntpdate-debian: Disregard empty ntp.conf files (thanks, Mika
+    Wahlroos; LP: #83604).
+  * debian/ntp.preinst: Remove empty /etc/ntp.conf on fresh installation, to
+    work around the system-tools-backends part of LP #83604.
+
+ -- Colin Watson <[e-mail]>  Mon, 06 Dec 2010 11:13:04 +0000
+
+ntp (1:4.2.6.p2+dfsg-1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable, remaining changes are:
+    + debian/ntp.conf, debian/ntpdate.default: Change default server to
+      ntp.ubuntu.com.
+    + debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface
+      comes up, then start again afterwards.
+    + debian/ntp.init, debian/rules: Only stop when entering single user mode.
+    + Add enforcing AppArmor profile (LP: #382905):
+      - debian/control: add Conflicts/Replaces on apparmor-profiles <
+        2.3.1+1403-0ubuntu10 (since we are now shipping usr.sbin.ntpd) and
+        apparmor < 2.3.1+1403-0ubuntu10 (since we are now shipping tunables/ntpd)
+      - debian/control: add Suggests on apparmor
+      - debian/ntp.dirs: add apparmor directories
+      - debian/ntp.preinst: force complain on certain upgrades
+      - debian/ntp.postinst: reload apparmor profile
+      - debian/ntp.postrm: remove the force-complain file
+      - add debian/apparmor-profile*
+      - debian/rules: install apparmor-profile and apparmor-profile.tunable
+      - debian/README.Debian: add note on AppArmor
+    + debian/{control,rules}: add and enable hardened build for PIE
+      (Debian bug 542721).
+    + debian/apparmor-profile: adjust location of drift files (LP: #456308)
+    + debian/rules, debian/ntp.dirs, debian/source_ntp.py: Add apport hook.
+
+
+ -- Chuck Short <[e-mail]>  Tue, 30 Nov 2010 11:14:31 -0500
+
 ntp (1:4.2.6.p2+dfsg-1) unstable; urgency=low
 
   [ Peter Eisentraut ]
@@ -265,6 +733,80 @@ ntp (1:4.2.6+dfsg-1) unstable; urgency=low
 
  -- Kurt Roeckx <[e-mail]>  Sat, 26 Dec 2009 14:12:22 +0100
 
+ntp (1:4.2.4p8+dfsg-1ubuntu6) maverick; urgency=low
+
+  * debian/rules: move dh_apparmor before dh_installinit
+
+ -- Jamie Strandboge <[e-mail]>  Fri, 06 Aug 2010 17:40:04 -0500
+
+ntp (1:4.2.4p8+dfsg-1ubuntu5) maverick; urgency=low
+
+  * convert to dh_apparmor:
+    - debian/rules, debian/ntp.postrm, debian/ntp.postinst: use dh_apparmor
+    - control: Build-Depends on debhelper >= 7.4.20ubuntu5
+  * debian/apparmor-profile: include local override
+  * remove now unneeded debian/ntp.preinst
+
+ -- Jamie Strandboge <[e-mail]>  Fri, 06 Aug 2010 13:55:12 -0500
+
+ntp (1:4.2.4p8+dfsg-1ubuntu4) maverick; urgency=low
+
+  * debian/dhcp.ntp: Dont remove *all* ntp server from ntp.conf.
+    (LP: #575458) 
+  * debian/apparmor-profile: Allow access to /dev/ttyS* 
+    (LP: #596859)
+
+ -- Chuck Short <[e-mail]>  Tue, 22 Jun 2010 09:24:02 -0400
+
+ntp (1:4.2.4p8+dfsg-1ubuntu3) maverick; urgency=low
+
+  * debian/apparmor-profile: allow access to /var/log/ntpstats/sysstats*
+    (LP: #574343)
+
+ -- Jamie Strandboge <[e-mail]>  Fri, 18 Jun 2010 07:54:24 -0500
+
+ntp (1:4.2.4p8+dfsg-1ubuntu2) lucid; urgency=low
+
+  * debian/apparmor-profile: allow reading of /var/lib/ntp/ntp.conf.dhcp
+    (LP: #517701)
+
+ -- Jamie Strandboge <[e-mail]>  Thu, 08 Apr 2010 16:24:42 -0500
+
+ntp (1:4.2.4p8+dfsg-1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes:
+    + debian/ntp.conf, debian/ntpdate.default: Change default server to
+      ntp.ubuntu.com.
+    + debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface
+      comes up, then start again afterwards.
+    + debian/ntp.init, debian/rules: Only stop when entering single user mode.
+    + Add enforcing AppArmor profile (LP: #382905):
+      - debian/control: add Conflicts/Replaces on apparmor-profiles <
+        2.3.1+1403-0ubuntu10 (since we are now shipping usr.sbin.ntpd) and
+        apparmor < 2.3.1+1403-0ubuntu10 (since we are now shipping tunables/ntpd)
+      - debian/control: add Suggests on apparmor
+      - debian/ntp.dirs: add apparmor directories
+      - debian/ntp.preinst: force complain on certain upgrades
+      - debian/ntp.postinst: reload apparmor profile
+      - debian/ntp.postrm: remove the force-complain file
+      - add debian/apparmor-profile*
+      - debian/rules: install apparmor-profile and apparmor-profile.tunable
+      - debian/README.Debian: add note on AppArmor
+    + debian/{control,rules}: add and enable hardened build for PIE
+      (Debian bug 542721).
+    + debian/apparmor-profile: adjust location of drift files (LP: #456308)
+    + Dropped changes, merged in debian:
+      - fix-nano.patch: Use mod_nano.patch from debian.
+    + Dropped changes, superseded upstream/in Debian:
+      - debian/patches/CVE-2009-1252.patch: No longer needed.
+      - debian/patches/debian/patches/CVE-2009-0159.patch: No longer needed.
+
+   [Chuck Short]
+   + debian/rules, debian/ntp.dirs, debian/source_ntp.py: Add apport
+     hook, apart of the server-lucid-apport-hooks specification.
+
+ -- Chuck Short <[e-mail]>  Tue, 02 Feb 2010 18:36:29 -0500
+
 ntp (1:4.2.4p8+dfsg-1) unstable; urgency=high
 
   * New upstream release.
@@ -315,6 +857,65 @@ ntp (1:4.2.4p7+dfsg-1) unstable; urgency=low
 
  -- Kurt Roeckx <[e-mail]>  Sat, 21 Nov 2009 17:27:11 +0100
 
+ntp (1:4.2.4p6+dfsg-2ubuntu4) lucid; urgency=low
+
+  * debian/rules: install symlink for early loading of per-interface
+    triggered ntp AppArmor profile.
+
+ -- Kees Cook <[e-mail]>  Tue, 15 Dec 2009 11:35:33 -0800
+
+ntp (1:4.2.4p6+dfsg-2ubuntu3) lucid; urgency=low
+
+  * SECURITY UPDATE: fix DoS with mode 7 (MODE_PRIVATE) packets
+    - debian/patches/CVE-2009-3563.patch: update ntpd/ntp_request.c to
+      not send a response packet for and rate limit logging of invalid mode 7
+      requests and responses
+    - CVE-2009-3563
+
+ -- Jamie Strandboge <[e-mail]>  Tue, 08 Dec 2009 13:52:12 -0600
+
+ntp (1:4.2.4p6+dfsg-2ubuntu2) lucid; urgency=low
+
+  * debian/rules: enable debugging (LP: #47683)
+  * debian/ntpdate-if.up: Hide invoke-rc.d output. (LP: #489585)
+  * debian/man/ntptrace.1:  Update man page removed ghost options. (LP: #351989)
+
+ -- Chuck Short <[e-mail]>  Mon, 07 Dec 2009 14:59:28 -0500
+
+ntp (1:4.2.4p6+dfsg-2ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes:
+    + debian/ntp.conf, debian/ntpdate.default: Change default server to
+      ntp.ubuntu.com.
+    + debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface
+      comes up, then start again afterwards
+    + debian/ntp.init, debian/rules: Only stop when entering single user mode.
+    + Add enforcing AppArmor profile (LP: #382905)
+      - debian/control: add Conflicts/Replaces on apparmor-profiles <
+        2.3.1+1403-0ubuntu10 (since we are now shipping usr.sbin.ntpd) and
+        apparmor < 2.3.1+1403-0ubuntu10 (since we are now shipping
+        tunables/ntpd)
+      - debian/control: add Suggests on apparmor
+      - debian/ntp.dirs: add apparmor directories
+      - debian/ntp.preinst: force complain on certain upgrades
+      - debian/ntp.postinst: reload apparmor profile
+      - debian/ntp.postrm: remove the force-complain file
+      - add debian/apparmor-profile*
+      - debian/rules: install apparmor-profile and apparmor-profile.tunable
+      - debian/README.Debian: add note on AppArmor
+    + debian/patches/fix-nano.patch: enable nanokernel support (LP: #412242)
+    + debian/{control,rules}: add and enable hardened build for PIE
+      (Debian bug 542721).
+    + debian/apparmor-profile: adjust location of drift files (LP: #456308)
+    + Dropped changes, merged in Debian:
+      - debian/man/ntpdate.8 - fix debian shipped manpage; patch by
+        Josh Holland <[e-mail]>
+    + Dropped changes, superseded upstream/in Debian:
+      - debian/patches/CVE-2009-0159.patch: Use Debian's version of the patch.
+      - debian/patches/CVE-2009-1252.patch: Use Debian's version of the patch.
+
+ -- Chuck Short <[e-mail]>  Fri, 06 Nov 2009 01:34:35 +0000
+
 ntp (1:4.2.4p6+dfsg-2) unstable; urgency=medium
 
   * Fixed typo in ntpdate man page (closes: #526086)
@@ -331,6 +932,75 @@ ntp (1:4.2.4p6+dfsg-2) unstable; urgency=medium
 
  -- Peter Eisentraut <[e-mail]>  Fri, 12 Jun 2009 17:24:22 +0300
 
+ntp (1:4.2.4p6+dfsg-1ubuntu5) karmic; urgency=low
+
+  * debian/apparmor-profile: adjust location of drift files (LP: #456308)
+
+ -- Jamie Strandboge <[e-mail]>  Wed, 21 Oct 2009 07:07:31 -0500
+
+ntp (1:4.2.4p6+dfsg-1ubuntu4) karmic; urgency=low
+
+  * debian/{control,rules}: add and enable hardened build for PIE
+    (Debian bug 542721).
+
+ -- Kees Cook <[e-mail]>  Thu, 20 Aug 2009 17:12:44 -0700
+
+ntp (1:4.2.4p6+dfsg-1ubuntu3) karmic; urgency=low
+
+  * Add enforcing AppArmor profile (LP: #382905)
+    - debian/control: add Conflicts/Replaces on apparmor-profiles <
+      2.3.1+1403-0ubuntu10 (since we are now shipping usr.sbin.ntpd) and
+      apparmor < 2.3.1+1403-0ubuntu10 (since we are now shipping
+      tunables/ntpd)
+    - debian/control: add Suggests on apparmor
+    - debian/ntp.dirs: add apparmor directories
+    - debian/ntp.preinst: force complain on certain upgrades
+    - debian/ntp.postinst: reload apparmor profile
+    - debian/ntp.postrm: remove the force-complain file
+    - add debian/apparmor-profile*
+    - debian/rules: install apparmor-profile and apparmor-profile.tunable
+    - debian/README.Debian: add note on AppArmor
+  * debian/patches/fix-nano.patch: enable nanokernel support (LP: #412242)
+
+ -- Jamie Strandboge <[e-mail]>  Tue, 11 Aug 2009 18:25:50 -0500
+
+ntp (1:4.2.4p6+dfsg-1ubuntu2) karmic; urgency=low
+
+  * SECURITY UPDATE: stack overflow in ntpd when autokey is enabled
+    - debian/patches/CVE-2009-1252.patch: update ntpd/ntp_crypto.c to use
+      snprintf() with NTP_MAXSTRLEN when writing to statstr. Also defensively
+      adjust ntp_peer.c and ntp_timer.c to do the same.
+    - CVE-2009-1252
+  * SECURITY UPDATE: stack overflow in ntpq when contacting malicious ntp
+    server
+    - debian/patches/CVE-2009-0159.patch: increase size of buffer in
+      cookedprint() in ntpq/ntpq.c and adjust to use snprintf()
+    - CVE-2009-0159
+
+ -- Jamie Strandboge <[e-mail]>  Tue, 19 May 2009 15:26:41 -0500
+
+ntp (1:4.2.4p6+dfsg-1ubuntu1) karmic; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/ntp.conf, debian/ntpdate.default: Change default server to
+      ntp.ubuntu.com.
+    - debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface 
+      comes up, then start again afterwards
+    - debian/ntp.init, debian/rules: Only stop when entering single user mode.
+    - debian/man/ntpdate.8 - fix debian shipped manpage; patch by
+      Josh Holland <[e-mail]>
+  * Dropped changes, merged in Debian:
+    - Build against libcap2 instead of libcap1, fixing a kernel warning
+      about using an old interface.
+  * Dropped changes, superseded upstream/in Debian:
+    - debian/patches/CVE-2009-0021.patch: update ntpd/ntp_crypto.c to properly
+      check the return code of EVP_VerifyFinal()
+    - debian/patches/ipv6-gnu-source.patch: Define _GNU_SOURCE to make IPv6
+      work.
+  * Fixes LP: #217699
+
+ -- Steve Langasek <[e-mail]>  Wed, 29 Apr 2009 06:08:19 +0000
+
 ntp (1:4.2.4p6+dfsg-1) unstable; urgency=low
 
   * New upstream release
@@ -352,6 +1022,49 @@ ntp (1:4.2.4p4+dfsg-8) unstable; urgency=low
 
  -- Kurt Roeckx <[e-mail]>  Mon, 05 Jan 2009 21:10:03 +0100
 
+ntp (1:4.2.4p4+dfsg-7ubuntu5) jaunty; urgency=low
+
+  * Build against libcap2 instead of libcap1, fixing a kernel warning
+    about using an old interface.  LP: #328376.
+
+ -- Steve Langasek <[e-mail]>  Fri, 20 Mar 2009 19:53:25 +0000
+
+ntp (1:4.2.4p4+dfsg-7ubuntu4) jaunty; urgency=low
+
+  * LP: #314810 - ntpdate typo in manpage
+    - debian/man/ntpdate.8 - fix debian shipped manpage; patch by
+      Josh Holland <[e-mail]>
+
+ -- Alexander Sack <[e-mail]>  Mon, 23 Feb 2009 11:57:32 +0100
+
+ntp (1:4.2.4p4+dfsg-7ubuntu3) jaunty; urgency=low
+
+  * SECURITY UPDATE: clients treat malformed signatures as good when verifying
+    server DSA and ECDSA certificates.
+    - debian/patches/CVE-2009-0021.patch: update ntpd/ntp_crypto.c to properly
+      check the return code of EVP_VerifyFinal()
+    - CVE-2009-0021
+
+ -- Jamie Strandboge <[e-mail]>  Tue, 06 Jan 2009 01:19:55 -0600
+
+ntp (1:4.2.4p4+dfsg-7ubuntu2) jaunty; urgency=low
+
+  * Add ipv6-gnu-source.patch: Define _GNU_SOURCE to make IPv6 work. 
+    (LP: #305043)
+
+ -- Matt LaPlante <[e-mail]>  Thu, 04 Dec 2008 00:39:51 -0600
+
+ntp (1:4.2.4p4+dfsg-7ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/ntp.conf, debian/ntpdate.default: Change default server to
+      ntp.ubuntu.com.
+    - debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface 
+      comes up, then start again afterwards (LP: #114505)
+    - debian/ntp.init, debian/rules: Only stop when entering single user mode.
+
+ -- Scott James Remnant <[e-mail]>  Tue, 11 Nov 2008 17:18:15 +0000
+
 ntp (1:4.2.4p4+dfsg-7) unstable; urgency=low
 
   * Added support for numeric IPv6 address in ntpdate-debian (closes: #489712)
@@ -360,6 +1073,39 @@ ntp (1:4.2.4p4+dfsg-7) unstable; urgency=low
 
  -- Peter Eisentraut <[e-mail]>  Wed, 16 Jul 2008 14:09:41 +0200
 
+ntp (1:4.2.4p4+dfsg-6ubuntu2) intrepid; urgency=low
+
+  * debian/ntpdate.ifup: use a different lockfile to avoid dead-locks
+    when restarting ntpd (LP: #246203).
+
+ -- Kees Cook <[e-mail]>  Wed, 20 Aug 2008 09:48:33 -0700
+
+ntp (1:4.2.4p4+dfsg-6ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/ntp.conf, debian/ntpdate.default:
+      - Change default server to ntp.ubuntu.com.
+    - debian/control:
+      - Set Ubuntu maintainer address.
+    - debian/ntpdate.ifup:
+      Stop ntp before running ntpdate when an interface 
+      comes up, then start again afterwards (LP: #114505)
+  * debian/rules:
+    - Call update-rcd-params with manual arguments instead of defaults.
+  * debian/ntp.init:
+    - Update LSB Default-Stop header.
+  * Dropped: 
+    - Update TearDown spec implementation:
+      - Update version in conflicts/replaces to that which was shipped in
+        edgy, which was later than that in Debian (due to the ubuntuX).
+      - Add sysv-rc dependency.
+      - debian/rules:
+        - Call update-rcd-params with multiuser instead defaults.
+    - debian/ntp-server.postinst (dapper upgrade):
+      - Remove stop script symlinks from rc0 and rc6.
+
+ -- Mathias Gug <[e-mail]>  Wed, 18 Jun 2008 22:28:16 -0400
+
 ntp (1:4.2.4p4+dfsg-6) unstable; urgency=low
 
   * Put back accidentally removed /etc/defaults/ntpdate (closes: #482605)
@@ -406,6 +1152,30 @@ ntp (1:4.2.4p4+dfsg-4) unstable; urgency=low
 
  -- Peter Eisentraut <[e-mail]>  Tue, 29 Apr 2008 11:19:54 +0200
 
+ntp (1:4.2.4p4+dfsg-3ubuntu2) hardy; urgency=low
+
+  * Stop ntp before running ntpdate when an interface 
+    comes up, then start again afterwards (LP: #114505)
+
+ -- Onno Benschop <[e-mail]>  Thu,  6 Mar 2008 14:00:42 +0900
+
+ntp (1:4.2.4p4+dfsg-3ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/ntp.conf, debian/ntpdate.default:
+      - Change default server to ntp.ubuntu.com.
+    - debian/rules:
+      - Call update-rcd-params with multiuser instead defaults.
+    - debian/control:
+      - Set Ubuntu maintainer address.
+      - Update version in conflicts/replaces to that which was shipped in
+        edgy, which was later than that in Debian (due to the ubuntuX).
+      - Add sysv-rc dependency.
+    - debian/ntp-server.postinst:
+      - Remove stop script symlinks from rc0 and rc6.
+
+ -- Scott Kitterman <[e-mail]>  Mon, 25 Feb 2008 19:36:36 -0500
+
 ntp (1:4.2.4p4+dfsg-3) unstable; urgency=low
 
   * Various man page and NEWS fixes (patches by Justin Pryzby and Vincent
@@ -428,6 +1198,23 @@ ntp (1:4.2.4p4+dfsg-3) unstable; urgency=low
 
  -- Peter Eisentraut <[e-mail]>  Sun, 13 Jan 2008 12:18:13 +0100
 
+ntp (1:4.2.4p4+dfsg-2ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/ntp.conf, debian/ntpdate.default:
+      - Change default server to ntp.ubuntu.com.
+    - debian/rules:
+      - Call update-rcd-params with multiuser instead defaults.
+    - debian/control:
+      - Set Ubuntu maintainer address.
+      - Update version in conflicts/replaces to that which was shipped in edgy,
+        which was later than that in Debian (due to the ubuntuX).
+      - Add sysv-rc dependency.
+    - debian/ntp-server.postinst:
+      - Remove stop script symlinks from rc0 and rc6.
+
+ -- Mathias Gug <[e-mail]>  Mon, 26 Nov 2007 15:42:41 -0500
+
 ntp (1:4.2.4p4+dfsg-2) unstable; urgency=low
 
   * Disable checking of openssl library version.  
@@ -462,6 +1249,25 @@ ntp (1:4.2.4p3+dfsg-1) unstable; urgency=low
 
  -- Kurt Roeckx <[e-mail]>  Mon, 13 Aug 2007 15:58:08 +0000
 
+ntp (1:4.2.4p0+dfsg-1ubuntu2) gutsy; urgency=low
+
+  * Trigger rebuild for hppa
+
+ -- LaMont Jones <[e-mail]>  Thu, 04 Oct 2007 12:15:33 -0600
+
+ntp (1:4.2.4p0+dfsg-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable.
+  * Remaining Ubuntu changes:
+    - Update version in conflicts/replaces to that which was shipped in edgy,
+      which was later than that in Debian (due to the ubuntuX).
+    - Change default server to ntp.ubuntu.com.
+    - Remove stop links from rc0 and rc6
+    - Call dh_installinit with --error-handler
+    - Set Ubuntu maintainer address.
+
+ -- Steve Kowalik <[e-mail]>  Fri, 18 May 2007 22:41:56 +1000
+
 ntp (1:4.2.4p0+dfsg-1) unstable; urgency=low
 
   [ Peter Eisentraut ]
@@ -507,6 +1313,28 @@ ntp (1:4.2.2.p4+dfsg-2) unstable; urgency=low
 
  -- Kurt Roeckx <[e-mail]>  Sun,  4 Mar 2007 13:01:11 +0000
 
+ntp (1:4.2.2.p4+dfsg-1ubuntu3) feisty; urgency=low
+
+  * Rebuild for changes in the amd64 toolchain.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <[e-mail]>  Mon,  5 Mar 2007 01:23:22 +0000
+
+ntp (1:4.2.2.p4+dfsg-1ubuntu2) feisty; urgency=low
+
+  * Update version in conflicts/replaces to that which was shipped in edgy,
+    which was later than that in Debian (due to the ubuntuX).  LP: #73506.
+
+ -- Scott James Remnant <[e-mail]>  Tue, 28 Nov 2006 10:27:08 +0000
+
+ntp (1:4.2.2.p4+dfsg-1ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - change default server to ntp.ubuntu.com
+    - remove stop links from rc0 and rc6
+
+ -- Scott James Remnant <[e-mail]>  Mon, 27 Nov 2006 13:51:15 +0000
+
 ntp (1:4.2.2.p4+dfsg-1) unstable; urgency=low
 
   * New upstream release
@@ -666,6 +1494,18 @@ ntp (1:4.2.2+dfsg-1) unstable; urgency=low
 
  -- Peter Eisentraut <[e-mail]>  Fri, 14 Jul 2006 22:55:36 +0200
 
+ntp (1:4.2.0a+stable-9ubuntu2) edgy; urgency=low
+
+  * Remove stop script symlinks from rc0 and rc6.
+
+ -- Scott James Remnant <[e-mail]>  Fri, 15 Sep 2006 17:47:40 +0100
+
+ntp (1:4.2.0a+stable-9ubuntu1) edgy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Tollef Fog Heen <[e-mail]>  Fri, 30 Jun 2006 16:02:07 +0200
+
 ntp (1:4.2.0a+stable-9) unstable; urgency=low
 
   [ Peter Eisentraut ]
@@ -699,6 +1539,51 @@ ntp (1:4.2.0a+stable-8.2) unstable; urgency=high
 
  -- Peter Eisentraut <[e-mail]>  Tue,  6 Jun 2006 02:27:42 +0200
 
+ntp (1:4.2.0a+stable-8.1ubuntu6) dapper; urgency=low
+
+  * Call dh_installinit with --error-handler=true, which will prevent
+    ntp-server's prerm and postinst from bombing out on upgrades from
+    previous broken versions.  ntp-{simple,refclock} still try to
+    restart the server in their postinst, so it won't be left dead.
+
+ -- Adam Conrad <[e-mail]>  Mon, 29 May 2006 10:25:43 +1000
+
+ntp (1:4.2.0a+stable-8.1ubuntu5) dapper; urgency=low
+
+  * Attempt to create the ntp user in ntp-server's postinst, as the
+    dependency loops between ntp-server and ntp-* means we have no
+    way of knowing which gets configured first (launchpad.net/33351)
+
+ -- Adam Conrad <[e-mail]>  Sun, 28 May 2006 02:20:57 +1000
+
+ntp (1:4.2.0a+stable-8.1ubuntu4) dapper; urgency=low
+
+  * Hide output from ntpdate unless ifup is run with -v.
+
+ -- Scott James Remnant <[e-mail]>  Wed, 17 May 2006 22:45:19 +0100
+
+ntp (1:4.2.0a+stable-8.1ubuntu3) dapper; urgency=low
+
+  * Ignore errors from ntpdate, otherwise the interface might not come
+    fully up.
+
+ -- Scott James Remnant <[e-mail]>  Wed,  8 Feb 2006 15:48:19 +0000
+
+ntp (1:4.2.0a+stable-8.1ubuntu2) dapper; urgency=low
+
+  * Remove ntpdate init script, instead install a script in
+    /etc/network/if-up.d that sets the clock whenever we bring up a network
+    interface.
+
+ -- Scott James Remnant <[e-mail]>  Wed,  4 Jan 2006 15:56:23 +0000
+
+ntp (1:4.2.0a+stable-8.1ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+  * Use ntp.ubuntu.com rather than ntp.ubuntulinux.org.
+
+ -- Colin Watson <[e-mail]>  Tue,  1 Nov 2005 23:06:49 -0500
+
 ntp (1:4.2.0a+stable-8.1) unstable; urgency=low
 
   * 0-day BSP NMU.
@@ -707,6 +1592,20 @@ ntp (1:4.2.0a+stable-8.1) unstable; urgency=low
 
  -- Christoph Berg <[e-mail]>  Fri, 28 Oct 2005 15:33:37 +0200
 
+ntp (1:4.2.0a+stable-8ubuntu2) breezy; urgency=low
+
+  * Fix error message in ntp-server init script.
+  (Closes: #14726)
+
+ -- Fabio M. Di Nitto <[e-mail]>  Fri, 09 Sep 2005 06:35:08 +0200
+
+ntp (1:4.2.0a+stable-8ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian, resolving merge conflicts brought
+    on by Debian incorporating some of our changes upstream.
+
+ -- Adam Conrad <[e-mail]>  Wed, 20 Apr 2005 04:18:50 +0000
+
 ntp (1:4.2.0a+stable-8) unstable; urgency=medium
 
   * The "Well, I certainly could have done that better" version,
@@ -737,22 +1636,6 @@ ntp (1:4.2.0a+stable-5) unstable; urgency=low
 
  -- Matthias Urlichs <[e-mail]>  Mon, 14 Mar 2005 15:25:03 +0100
 
-ntp (1:4.2.0a-11ubuntu3) hoary; urgency=low
-
-  * ntpd/ntpd.c:
-    - Revert the hardcoded root dropping parameters from previous version.
-      This is now done in init script.
-    - Bugfix: If group was specified as name, previous versions erroneously
-      used the uid as gid.
-  * debian/ntp-server.init.d:
-    - Run as user/group ntp by default (previously hardcoded in ntpd.c).
-    - Already determine the uid/gid of 'ntp' instead of doing it in ntpd.c
-      (for some reason this fails directly after boot). (Ubuntu #5399)
-    - Add -e to interpreter to stop on errors.
-    - append "/usr/bin/" to PATH setting (for getent and cut).
-
- -- Martin Pitt <[e-mail]>  Mon, 14 Mar 2005 13:24:46 +0100
-
 ntp (1:4.2.0a+stable-4) unstable; urgency=low
 
   * Merged Upstream fix for ntpdate IPv4/IPv6 problems.
@@ -775,29 +1658,6 @@ ntp (1:4.2.0a+stable-4) unstable; urgency=low
 
  -- Matthias Urlichs <[e-mail]>  Sat, 12 Mar 2005 06:16:39 +0100
 
-ntp (1:4.2.0a-11ubuntu2) hoary; urgency=low
-
-  * Run ntpd as normal user (with CAP_SYS_TIME) instead of root
-  * ntpd/ntpd.c:
-    - activate root dropping to user and group "ntp"
-    - add runtime check whether the kernel really supports capabilities; do
-      not drop root privileges if not
-    - do not set CAP_SYS_TIME as inheritable
-  * debian/rules:
-    - configure with --enable-linuxcaps
-  * debian/control, packages ntp-simple/ntp-refclock:
-    - add "adduser" dependency
-  * debian/ntp-{simple,refclock}.postinst:
-    - create system user and group "ntp"
-    - chown /var/lib/ntp and /var/log/ntpstats to ntp:ntp to allow ntpd to
-      write into them
-    - restart the server (for the case that ntp-server's postinst ran before
-      ntp-{simple,refclock}'s)
-  * debian/ntp-{simple,refclock}.postrm:
-    - remove user and group ntp on package purge
-
- -- Martin Pitt <[e-mail]>  Thu, 25 Nov 2004 15:23:53 +0100
-
 ntp (1:4.2.0a+stable-3) unstable; urgency=low
 
   * Re-upload due to Debian FTP archive problems.
@@ -849,6 +1709,12 @@ ntp (1:4.2.0a+bk20040620-2) experimental; urgency=low
 
  -- Matthias Urlichs <[e-mail]>  Sat, 25 Sep 2004 11:43:37 +0200
 
+ntp (1:4.2.0a+bk20040620-1) experimental; urgency=low
+
+  * Merge current stable Upstream
+
+ -- Matthias Urlichs <[e-mail]>  Mon, 21 Jun 2004 10:17:28 +0200
+
 ntp (1:4.2.0a-12) unstable; urgency=low
 
   * Doc how to use multiple servers in ntp.default.
@@ -856,6 +1722,51 @@ ntp (1:4.2.0a-12) unstable; urgency=low
 
  -- Matthias Urlichs <[e-mail]>  Mon,  9 Aug 2004 19:57:58 +0200
 
+ntp (1:4.2.0a-11ubuntu3) hoary; urgency=low
+
+  * ntpd/ntpd.c:
+    - Revert the hardcoded root dropping parameters from previous version.
+      This is now done in init script.
+    - Bugfix: If group was specified as name, previous versions erroneously
+      used the uid as gid.
+  * debian/ntp-server.init.d:
+    - Run as user/group ntp by default (previously hardcoded in ntpd.c).
+    - Already determine the uid/gid of 'ntp' instead of doing it in ntpd.c
+      (for some reason this fails directly after boot). (Ubuntu #5399)
+    - Add -e to interpreter to stop on errors.
+    - append "/usr/bin/" to PATH setting (for getent and cut).
+
+ -- Martin Pitt <[e-mail]>  Mon, 14 Mar 2005 13:24:46 +0100
+
+ntp (1:4.2.0a-11ubuntu2) hoary; urgency=low
+
+  * Run ntpd as normal user (with CAP_SYS_TIME) instead of root
+  * ntpd/ntpd.c:
+    - activate root dropping to user and group "ntp"
+    - add runtime check whether the kernel really supports capabilities; do
+      not drop root privileges if not
+    - do not set CAP_SYS_TIME as inheritable
+  * debian/rules:
+    - configure with --enable-linuxcaps
+  * debian/control, packages ntp-simple/ntp-refclock:
+    - add "adduser" dependency
+  * debian/ntp-{simple,refclock}.postinst:
+    - create system user and group "ntp"
+    - chown /var/lib/ntp and /var/log/ntpstats to ntp:ntp to allow ntpd to
+      write into them
+    - restart the server (for the case that ntp-server's postinst ran before
+      ntp-{simple,refclock}'s)
+  * debian/ntp-{simple,refclock}.postrm:
+    - remove user and group ntp on package purge
+
+ -- Martin Pitt <[e-mail]>  Thu, 25 Nov 2004 15:23:53 +0100
+
+ntp (1:4.2.0a-11ubuntu1) hoary; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Scott James Remnant <[e-mail]>  Wed, 27 Oct 2004 13:54:06 +0100
+
 ntp (1:4.2.0a-11) unstable; urgency=low
 
   * Fix building on non-Linux Debian systems.
@@ -866,6 +1777,19 @@ ntp (1:4.2.0a-11) unstable; urgency=low
 
  -- Matthias Urlichs <[e-mail]>  Tue,  6 Jul 2004 05:26:07 +0200
 
+ntp (1:4.2.0a-10ubuntu2) warty; urgency=low
+
+  * Use ntp.ubuntulinux.org instead of pool.ntp.org
+
+ -- Matt Zimmerman <[e-mail]>  Mon, 11 Oct 2004 16:10:27 -0700
+
+ntp (1:4.2.0a-10ubuntu1) warty; urgency=low
+
+  * Added versioned depend on lsb-base
+  * debian/ntpdate.init.d,ntp-server.init.d: pretty initscripts
+
+ -- Nathaniel McCallum <[e-mail]>  Fri,  3 Sep 2004 15:12:27 -0400
+
 ntp (1:4.2.0a-10) unstable; urgency=medium
 
   * Kill spuriously-running servers when updating.
diff --git a/debian/control b/debian/control
index 9d77642..64fd237 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,10 @@
 Source: ntp
 Section: net
 Priority: optional
-Maintainer: Debian NTP Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian NTP Team <[e-mail]>
 Uploaders: Bdale Garbee <[e-mail]>, Peter Eisentraut <[e-mail]>, Kurt Roeckx <[e-mail]>
-Build-Depends: dh-autoreconf, debhelper (>= 6), libedit-dev, libcap2-dev [linux-any], libssl-dev (>= 1.0.0e-1), autogen (>= 1:5.11)
+Build-Depends: dh-autoreconf, debhelper (>= 6), libedit-dev, libcap2-dev [linux-any], libssl-dev (>= 1.0.0e-1), autogen (>= 1:5.11), dh-apparmor, bison, pps-tools
 Build-Conflicts: libavahi-compat-libdnssd-dev, libwww-dev, libwww-ssl-dev
 Standards-Version: 3.9.5
 Homepage: http://support.ntp.org/
@@ -15,7 +16,9 @@ Architecture: any
 Depends: adduser, lsb-base (>= 3.2-13), netbase, ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: dpkg (>= 1.15.7.2)
 Recommends: ${perl:Depends}
-Suggests: ntp-doc
+Suggests: ntp-doc, apparmor (>= 2.1+1075-0ubuntu6)
+Conflicts: apparmor-profiles (<< 2.3.1+1403-0ubuntu10), apparmor (<< 2.3.1+1403-0ubuntu10)
+Replaces: apparmor-profiles (<< 2.3.1+1403-0ubuntu10), apparmor (<< 2.3.1+1403-0ubuntu10)
 Breaks: dhcp3-client (<< 4.1.0-1)
 Description: Network Time Protocol daemon and utility programs
  NTP, the Network Time Protocol, is used to keep computer clocks
diff --git a/debian/ntp.conf b/debian/ntp.conf
index b51b4f9..c84d0f6 100644
--- a/debian/ntp.conf
+++ b/debian/ntp.conf
@@ -10,18 +10,18 @@ filegen loopstats file loopstats type day enable
 filegen peerstats file peerstats type day enable
 filegen clockstats file clockstats type day enable
 
+# Specify one or more NTP servers.
 
-# You do need to talk to an NTP server or two (or three).
-#server ntp.your-provider.example
-
-# pool.ntp.org maps to about 1000 low-stratum NTP servers.  Your server will
-# pick a different set every time it starts up.  Please consider joining the
-# pool: <http://www.pool.ntp.org/join.html>
-pool 0.debian.pool.ntp.org iburst
-pool 1.debian.pool.ntp.org iburst
-pool 2.debian.pool.ntp.org iburst
-pool 3.debian.pool.ntp.org iburst
+# Use servers from the NTP Pool Project. Approved by Ubuntu Technical Board
+# on 2011-02-08 (LP: #104525). See http://www.pool.ntp.org/join.html for
+# more information.
+server 0.ubuntu.pool.ntp.org iburst
+server 1.ubuntu.pool.ntp.org iburst
+server 2.ubuntu.pool.ntp.org iburst
+server 3.ubuntu.pool.ntp.org iburst
 
+# Use Ubuntu's ntp server as a fallback.
+server ntp.ubuntu.com
 
 # Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for
 # details.  The web page <http://support.ntp.org/bin/view/Support/AccessRestrictions>
@@ -55,3 +55,12 @@ restrict source notrap nomodify noquery
 # next lines.  Please do this only if you trust everybody on the network!
 #disable auth
 #broadcastclient
+
+#Changes recquired to use pps synchonisation as explained in documentation:
+#http://www.ntp.org/ntpfaq/NTP-s-config-adv.htm#AEN3918
+
+#server 127.127.8.1 mode 135 prefer    # Meinberg GPS167 with PPS
+#fudge 127.127.8.1 time1 0.0042        # relative to PPS for my hardware
+
+#server 127.127.22.1                   # ATOM(PPS)
+#fudge 127.127.22.1 flag3 1            # enable PPS API
diff --git a/debian/ntp.cron.daily b/debian/ntp.cron.daily
index 65e11d4..8b77b73 100644
--- a/debian/ntp.cron.daily
+++ b/debian/ntp.cron.daily
@@ -9,19 +9,29 @@
 statsdir=$(cat /etc/ntp.conf | grep -v '^#' | sed -nr 's/^statsdir[[:space:]]+([^[:space:]]+).*$/\1/p')
 
 if [ -n "$statsdir" ] && [ -d "$statsdir" ]; then
-	# only keep a week's depth of these
-	find "$statsdir" -type f -mtime +7 -exec rm {} \;
+	if [ "$(id -u)" = "0" ]; then
+	# For security reasons, do not run this script as root.
+		exec su -c "exec \"$0\"" ntp
+		exit 1
+	fi
+
+	# only keep a week's depth of these. Delete only files exactly
+	# within the directory and do not descend into subdirectories
+	# to avoid security risks on platforms where find is not using
+	# fts-library.
+	find "$statsdir" -maxdepth 1 -type f -mtime +7 -delete
 
-	# compress whatever is left to save space
-	cd "$statsdir"
-	ls *stats.???????? > /dev/null 2>&1
+	# compress whatever is left to save space but make sure to really
+	# do it only in the expected directory.
+	cd "$statsdir" || exit 1
+	ls -d -- *stats.???????? > /dev/null 2>&1
 	if [ $? -eq 0 ]; then
 		# Note that gzip won't compress the file names that
 		# are hard links to the live/current files, so this
 		# compresses yesterday and previous, leaving the live
 		# log alone.  We supress the warnings gzip issues
 		# about not compressing the linked file.
-		gzip --best --quiet *stats.???????? 
+		gzip --best --quiet -- *stats.???????? 
 		return=$?
 		case $return in
 		    2)
diff --git a/debian/ntp.dhcp b/debian/ntp.dhcp
index a1acb21..a629d16 100644
--- a/debian/ntp.dhcp
+++ b/debian/ntp.dhcp
@@ -40,7 +40,7 @@ ntp_servers_setup_add() {
 		echo "server $server iburst"
 	  done
 	  echo
-	  sed -r -e '/^ *(server|peer).*$/d' $NTP_CONF
+	  sed -r -e '/^ *(server *[^1][^2][^7]\.|peer).*$/d' $NTP_CONF
 	) >>$tmp
 	
 	mv $tmp $NTP_DHCP_CONF
diff --git a/debian/ntp.dirs b/debian/ntp.dirs
index 49d3819..314ad95 100644
--- a/debian/ntp.dirs
+++ b/debian/ntp.dirs
@@ -1,3 +1,6 @@
 usr/sbin
 var/lib/ntp
 var/log/ntpstats
+etc/apparmor.d/force-complain
+etc/apparmor.d/tunables
+usr/share/apport/package-hooks
diff --git a/debian/ntp.init b/debian/ntp.init
index 3a5ccc5..9755091 100644
--- a/debian/ntp.init
+++ b/debian/ntp.init
@@ -5,7 +5,7 @@
 # Required-Start:  $network $remote_fs $syslog
 # Required-Stop:   $network $remote_fs $syslog
 # Default-Start:   2 3 4 5
-# Default-Stop: 
+# Default-Stop:    1
 # Short-Description: Start NTP daemon
 ### END INIT INFO
 
@@ -22,7 +22,7 @@ if [ -r /etc/default/ntp ]; then
 	. /etc/default/ntp
 fi
 
-if [ -e /var/lib/ntp/ntp.conf.dhcp ]; then
+if [ /var/lib/ntp/ntp.conf.dhcp -nt /etc/ntp.conf ]; then
 	NTPD_OPTS="$NTPD_OPTS -c /var/lib/ntp/ntp.conf.dhcp"
 fi
 
diff --git a/debian/ntpdate.default b/debian/ntpdate.default
index 3241694..f239b18 100644
--- a/debian/ntpdate.default
+++ b/debian/ntpdate.default
@@ -7,7 +7,7 @@ NTPDATE_USE_NTP_CONF=yes
 
 # List of NTP servers to use  (Separate multiple servers with spaces.)
 # Not used if NTPDATE_USE_NTP_CONF is yes.
-NTPSERVERS="0.debian.pool.ntp.org 1.debian.pool.ntp.org 2.debian.pool.ntp.org 3.debian.pool.ntp.org"
+NTPSERVERS="ntp.ubuntu.com"
 
 # Additional options to pass to ntpdate
 NTPOPTIONS=""
diff --git a/debian/ntpdate.if-up b/debian/ntpdate.if-up
index 078d094..6dd3673 100644
--- a/debian/ntpdate.if-up
+++ b/debian/ntpdate.if-up
@@ -30,7 +30,17 @@ if [ -r /lib/udev/hotplug.functions ]; then
 	wait_for_file /usr/sbin/ntpdate-debian
 fi
 
+if [ -e /usr/sbin/openntpd ]; then
+    service='openntpd'
+else
+    service='ntp'
+fi
+
+invoke-rc.d --quiet $service stop >/dev/null 2>&1 || true
+
 # Avoid running more than one at a time
 flock -n /run/lock/ntpdate /usr/sbin/ntpdate-debian -s $OPTS 2>/dev/null || :
 
+invoke-rc.d --quiet $service start >/dev/null 2>&1 || true
+
 ) &
diff --git a/debian/rules b/debian/rules
index 6caa1b0..fb7da83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ endif
 	./configure CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' \
 		--prefix=/usr \
 		--enable-all-clocks --enable-parse-clocks --enable-SHM \
-		--disable-debugging --sysconfdir=/var/lib/ntp \
+		--enable-debugging --sysconfdir=/var/lib/ntp \
 		--with-sntp=no \
 		--with-lineeditlibs=edit \
 		--without-ntpsnmpd \
@@ -65,6 +65,14 @@ install: build-stamp
 
 	install -D -m 0644 debian/ntp.conf debian/ntp/etc/ntp.conf
 
+	# install apparmor profile
+	install -D -m 0644 debian/apparmor-profile debian/ntp/etc/apparmor.d/usr.sbin.ntpd
+	install -D -m 0644 debian/apparmor-profile.tunable debian/ntp/etc/apparmor.d/tunables/ntpd
+	dh_link -pntp etc/apparmor.d/usr.sbin.ntpd etc/apparmor/init/network-interface-security/usr.sbin.ntpd
+
+	# install apport hook
+	install -D -m 644 debian/source_ntp.py debian/ntp/usr/share/apport/package-hooks/source_ntp.py
+
 	# remove upstream man pages, which are currently not as nice as ours / ntpsnmpd we don't want
 	rm $(addprefix debian/tmp/usr/share/man/man1/,ntpd.1 ntpdc.1 ntp-keygen.1 ntpq.1)
 
@@ -99,6 +107,7 @@ binary-arch: build install
 	dh_installexamples -a
 	dh_installman -a
 	dh_installinit -pntp --error-handler=installinit_error
+	dh_apparmor -pntp --profile-name=usr.sbin.ntpd
 	dh_installinit -pntpdate
 	dh_installcron -a
 	dh_installlogcheck -a
diff --git a/debian/source_ntp.py b/debian/source_ntp.py
new file mode 100644
index 0000000..3debc68
--- /dev/null
+++ b/debian/source_ntp.py
@@ -0,0 +1,22 @@
+'''apport package hook for ntp
+
+(c) 2010-2011 Canonical Ltd.
+Author: Chuck Short <[e-mail]>
+'''
+
+from apport.hookutils import *
+from os import path
+import re
+
+def add_info(report):
+	attach_conffiles(report, 'ntp')
+
+	# get apparmor stuff
+	attach_mac_events(report, '/usr/sbin/ntpd')
+	attach_file(report, '/etc/apparmor.d/usr.sbin.ntpd')
+
+	# get syslog stuff
+	recent_syslog(re.compile(r'ntpd\['))
+
+	# Get debug information
+	report['NtpStatus'] = command_output(['ntpq', '-p'])