Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Hi, I'd like to ask for a pre-approval to upload the following fix targeted for stretch to unstable. Since version 1:4.2.8p3+dfsg-1 (after Jessie) the default configuration of ntp uses the "pool" statement instead of "server" to access pool.ntp.org. ntpdate-debian parses ntp.conf to find a NTP server to talk to. The regexp to also match "pool" directives was supposed to be fixed in 1:4.2.8p7+dfsg-1 somewhere (according to the BTS), but I could not find any version in Debian carrying this. The change has been included in Ubuntu for quite a while. ntp (1:4.2.8p4+dfsg-3ubuntu5.2) xenial; urgency=medium * Fix ntpdate-debian to be able to parse new config of ntp (LP: #1576698) -- Christian Ehrhardt <christian.ehrha...@canonical.com> Tue, 20 Sep 2016 14:24:29 +0200 With the bug present ntpdate will not work with the default configuration. Since we're at it I'd also like to adjust some metadata, Vcs pointing to git instead of svn and adding myself as Uploader (see RFH Bug#855342). unblock ntp/1:4.2.8p10+dfsg-2 Bernhard
diff -Nru ntp-4.2.8p10+dfsg/debian/changelog ntp-4.2.8p10+dfsg/debian/changelog --- ntp-4.2.8p10+dfsg/debian/changelog 2017-03-22 21:53:40.000000000 +0100 +++ ntp-4.2.8p10+dfsg/debian/changelog 2017-05-07 14:49:22.000000000 +0200 @@ -1,3 +1,11 @@ +ntp (1:4.2.8p10+dfsg-2) unstable; urgency=medium + + * Support pool statement in ntpdate-debian (Closes: #854432, #823120) + * Point Vcs-* to pkg-ntp git repository + * Add Bernhard Schmidt to Uploaders + + -- Bernhard Schmidt <be...@debian.org> Sun, 07 May 2017 14:49:22 +0200 + ntp (1:4.2.8p10+dfsg-1) unstable; urgency=high * New upstream version diff -Nru ntp-4.2.8p10+dfsg/debian/control ntp-4.2.8p10+dfsg/debian/control --- ntp-4.2.8p10+dfsg/debian/control 2016-05-19 20:44:00.000000000 +0200 +++ ntp-4.2.8p10+dfsg/debian/control 2017-05-07 14:49:22.000000000 +0200 @@ -2,13 +2,13 @@ Section: net Priority: optional Maintainer: Debian NTP Team <pkg-ntp-maintain...@lists.alioth.debian.org> -Uploaders: Peter Eisentraut <pet...@debian.org>, Kurt Roeckx <k...@roeckx.be> +Uploaders: Peter Eisentraut <pet...@debian.org>, Kurt Roeckx <k...@roeckx.be>, Bernhard Schmidt <be...@debian.org> Build-Depends: dh-autoreconf, debhelper (>= 6), libedit-dev, libcap2-dev [linux-any], libssl-dev (>= 1.0.0e-1), autogen (>= 1:5.11), libopts25-dev (>= 1:5.11), pps-tools [linux-any], dh-apparmor Build-Conflicts: libavahi-compat-libdnssd-dev, libwww-dev, libwww-ssl-dev Standards-Version: 3.9.5 Homepage: http://support.ntp.org/ -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-ntp/ntp/trunk/ -Vcs-Svn: svn://anonscm.debian.org/pkg-ntp/ntp/trunk/ +Vcs-Browser: https://anonscm.debian.org/git/pkg-ntp/pkg-ntp.git/ +Vcs-Git: https://anonscm.debian.org/git/pkg-ntp/pkg-ntp.git/ Package: ntp Architecture: any diff -Nru ntp-4.2.8p10+dfsg/debian/ntpdate-debian ntp-4.2.8p10+dfsg/debian/ntpdate-debian --- ntp-4.2.8p10+dfsg/debian/ntpdate-debian 2016-11-21 19:12:04.000000000 +0100 +++ ntp-4.2.8p10+dfsg/debian/ntpdate-debian 2017-05-07 14:49:22.000000000 +0200 @@ -14,7 +14,7 @@ fi done if [ -n "$file" ]; then - NTPSERVERS=$(sed -rne 's/^(servers?|peer)[[:space:]]+(-[46][[:space:]]+)?([-_.:[:alnum:]]+).*$/\3/p' "$file" | grep -v '^127\.127\.') || [ $? -le 1 ] + NTPSERVERS=$(sed -rne 's/^(servers?|peer|pool)[[:space:]]+(-[46][[:space:]]+)?([-_.:[:alnum:]]+).*$/\3/p' "$file" | grep -v '^127\.127\.') || [ $? -le 1 ] fi fi
