-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short
-
Date:
2009-11-06 01:34:35 UTC
-
mfrom:
(4.1.3 sid)
-
Revision ID:
james.westby@ubuntu.com-20091106013435-57honvoaqg1575po
Tags: 1:4.2.4p6+dfsg-2ubuntu1
* 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 <jrh@joshh.co.uk>
+ 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.