- Committer: Bazaar Package Importer
- Date: 2009-11-06 01:34:35 UTC
- mfrom: (4.1.3 sid)
- Revision ID: james.westby@ubuntu.com-20091106013435-57honvoaqg1575po
* 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.
+ 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.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
adjtimed
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
|
clockstuff
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
|
conf
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
|
debian
|
2 | 22 years ago | Bazaar Package Importer | move to US main! Yippee! |
|
||
|
html
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
|
include
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
|
kernel
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
|
libisc
|
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: |
|
||
|
libntp
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
|
libopts
|
1.2.3 | 17 years ago | Bazaar Package Importer | Import upstream version 4.2.4p0+dfsg |
|
||
|
libparse
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
|
m4
|
1.2.2 | 17 years ago | Bazaar Package Importer | Import upstream version 4.2.2.p4+dfsg |
|
||
|
ntpd
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
|
ntpdate
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
|
ntpdc
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
|
ntpq
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
|
parseutil
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
|
ports
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
|
scripts
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
|
util
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 |
|
||
aclocal.m4 |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 245 KB |
|
|
|
bincheck.mf |
1.2.2 | 17 years ago | Bazaar Package Importer | Import upstream version 4.2.2.p4+dfsg | 525 bytes |
|
|
bootstrap |
1.2.4 | 16 years ago | Bazaar Package Importer | Import upstream version 4.2.4p4+dfsg | 2.7 KB |
|
|
|
build |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 1.5 KB |
|
|
|
ChangeLog |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 13.4 KB |
|
|
|
CommitLog |
1.2.5 | 15 years ago | Bazaar Package Importer | Import upstream version 4.2.4p6+dfsg | 0.9 MB |
|
|
|
CommitLog-4.1.0 |
1.2.3 | 17 years ago | Bazaar Package Importer | Import upstream version 4.2.4p0+dfsg | 190 KB |
|
|
|
compile |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 3.6 KB |
|
|
|
config.guess |
34 | 14 years ago | Bazaar Package Importer | * Merge from debian testing, remaining changes: | 42.4 KB |
|
|
|
config.h.in |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 31.2 KB |
|
|
|
config.sub |
34 | 14 years ago | Bazaar Package Importer | * Merge from debian testing, remaining changes: | 30.9 KB |
|
|
|
configure |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 1.5 MB |
|
|
|
configure.ac |
1.2.5 | 15 years ago | Bazaar Package Importer | Import upstream version 4.2.4p6+dfsg | 104 KB |
|
|
|
COPYRIGHT |
4.1.2 | 15 years ago | Bazaar Package Importer | * New upstream release - Updated ntpdate-ipv6.pa | 8.6 KB |
|
|
|
depcomp |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 15.5 KB |
|
|
|
dot.emacs |
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 | 496 bytes |
|
|
|
excludes |
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 | 65 bytes |
|
|
|
flock-build |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 1.2 KB |
|
|
|
INSTALL |
1.2.2 | 17 years ago | Bazaar Package Importer | Import upstream version 4.2.2.p4+dfsg | 7.3 KB |
|
|
|
install-sh |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 9 KB |
|
|
|
ltmain.sh |
1.2.3 | 17 years ago | Bazaar Package Importer | Import upstream version 4.2.4p0+dfsg | 191 KB |
|
|
|
Makefile.am |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 4 KB |
|
|
|
Makefile.in |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 23.9 KB |
|
|
|
missing |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 10.7 KB |
|
|
|
NEWS |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 2.8 KB |
|
|
|
NOTES.y2kfixes |
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 | 2.6 KB |
|
|
|
packageinfo.sh |
1.2.5 | 15 years ago | Bazaar Package Importer | Import upstream version 4.2.4p6+dfsg | 756 bytes |
|
|
|
README |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 5.4 KB |
|
|
|
README.bk |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 215 bytes |
|
|
|
README.hackers |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 735 bytes |
|
|
|
README.patches |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 1.6 KB |
|
|
|
README.refclocks |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 2 KB |
|
|
|
README.versions |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 817 bytes |
|
|
|
readme.y2kfixes |
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 | 8 KB |
|
|
|
results.y2kfixes |
1 | 22 years ago | Bazaar Package Importer | Import upstream version 4.1.0 | 2.8 KB |
|
|
|
TODO |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 2.7 KB |
|
|
|
version |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 7 bytes |
|
|
|
version.m4 |
29 | 15 years ago | Bazaar Package Importer | * Merge from Debian unstable, remaining changes: | 38 bytes |
|
|
|
WHERE-TO-START |
1.2.2 | 17 years ago | Bazaar Package Importer | Import upstream version 4.2.2.p4+dfsg | 2.2 KB |
|
|