lp:~zulcss/ubuntu/lucid/ntp/ntp-lp-47683

Created by Chuck Short and last modified
Get this branch:
bzr branch lp:~zulcss/ubuntu/lucid/ntp/ntp-lp-47683
Only Chuck Short can upload to this branch. If you are Chuck Short please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Chuck Short
Status:
Development

Recent revisions

36. By Chuck Short

debian/rules: enable debugging (LP: #47683)

35. By Chuck Short

Start new release

34. By Chuck Short

* 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 <email address hidden>
  + 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.

33. By Jamie Strandboge

debian/apparmor-profile: adjust location of drift files (LP: #456308)

32. By Kees Cook

debian/{control,rules}: add and enable hardened build for PIE
(Debian bug 542721).

31. By Jamie Strandboge

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

30. By Jamie Strandboge

* 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

29. By Steve Langasek

* 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 <email address hidden>
* 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

28. By Steve Langasek

Build against libcap2 instead of libcap1, fixing a kernel warning
about using an old interface. LP: #328376.

27. By Alexander Sack

* LP: #314810 - ntpdate typo in manpage
  - debian/man/ntpdate.8 - fix debian shipped manpage; patch by
    Josh Holland <email address hidden>

Branch metadata

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

Subscribers