Created by James Westby on 2010-10-13 and last modified on 2011-03-11
Get this branch:
bzr branch lp:ubuntu/natty/ntp
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches

Recent revisions

49. By Kees Cook on 2011-03-10

debian/apparmor-profile: add note about using shared memory for
a clock source (LP: #722815).

48. By Jamie Strandboge on 2011-02-08

debian/ntp.conf: adjust to use X.ubuntu.pool.ntp.org in addition to
ntp.ubuntu.com (LP: #104525)

47. By Jamie Strandboge on 2011-01-12

debian/apparmor-profile: allow access to clockstats too (LP: #701896)

46. By Colin Watson on 2010-12-06

* 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.

45. By Chuck Short on 2010-11-30

* Merge from debian unstable, remaining changes are:
  + debian/ntp.conf, debian/ntpdate.default: Change default server to
  + 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.

44. By Jamie Strandboge on 2010-08-06

debian/rules: move dh_apparmor before dh_installinit

43. By Jamie Strandboge on 2010-08-06

* 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

42. By Chuck Short on 2010-06-22

* debian/dhcp.ntp: Dont remove *all* ntp server from ntp.conf.
  (LP: #575458)
* debian/apparmor-profile: Allow access to /dev/ttyS*
  (LP: #596859)

41. By Jamie Strandboge on 2010-06-18

debian/apparmor-profile: allow access to /var/log/ntpstats/sysstats*
(LP: #574343)

40. By Jamie Strandboge on 2010-04-08

debian/apparmor-profile: allow reading of /var/lib/ntp/ntp.conf.dhcp
(LP: #517701)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.