[pkg-ntp-maintainers] Bug#823120: ntpdate-debian no more working with defaults in /etc/ntp.conf

[Christian Ehrhardt]

Package: ntp
Version: 1:4.2.8p4+dfsg-3+b1

Hi,
I was hitting that two days ago and now also got another report for the
same on Ubuntu.

Quoting from our bug report:
The problem is that ntpdate-debian parse /etc/ntp.conf, searchin for the
word "server",

but the format of the file as changed a bit

< server 0.ubuntu.pool.ntp.org
< server 1.ubuntu.pool.ntp.org
< server 2.ubuntu.pool.ntp.org
< server 3.ubuntu.pool.ntp.org
---
> pool 0.ubuntu.pool.ntp.org iburst
> pool 1.ubuntu.pool.ntp.org iburst
> pool 2.ubuntu.pool.ntp.org iburst
> pool 3.ubuntu.pool.ntp.org iburst
25c24
< server ntp.ubuntu.com
---
> pool ntp.ubuntu.com

the word server as been replaced by "pool"

I wanted to fix in Debian first and then later do a merge in the Yakkety
cycle.
That said, this initial mail is to create a Debian bug number for me to
track.

Essentially it should just be
sed -rne
's/^(servers?|peer)[[:space:]]+(-[46][[:space:]]+)?([-_.:[:alnum:]]+).*$/\3/p'
"$file"
=>
sed -rne
's/^(servers?|peer|pool)[[:space:]]+(-[46][[:space:]]+)?([-_.:[:alnum:]]+).*$/\3/p'
"$file"

I'll come up with a debdiff the next few days after I had some time to test
it.
But feel free to integrate right away if you consider it trivial.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-ntp-maintainers/attachments/20160501/ba8ea3cc/attachment.html>