-
Committer:
Bazaar Package Importer
-
Author(s):
Steve Langasek
-
Date:
2009-04-29 06:08:19 UTC
-
mfrom:
(4.1.2 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090429060819-ejgcea6z6hy6xv1f
Tags: 1:4.2.4p6+dfsg-1ubuntu1
* 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 <jrh@joshh.co.uk>
* 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