[28663] in Source-Commits
ntp-config commit: Fix ntp.conf transformation on xenial
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Wed Jun 29 21:06:45 2016
Date: Wed, 29 Jun 2016 21:06:41 -0400
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201606300106.u5U16fXh010178@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/ntp-config/commit/2596205848bc82a12643ee12bb107ebe621a7a43
commit 2596205848bc82a12643ee12bb107ebe621a7a43
Author: Anders Kaseorg <andersk@mit.edu>
Date: Wed Jun 29 20:48:28 2016 -0400
Fix ntp.conf transformation on xenial
debian/changelog | 7 +++++++
debian/transform_ntp.conf.debathena | 3 ++-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 901e554..f95a6d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debathena-ntp-config (1.6) unstable; urgency=medium
+
+ * Fix ntp.conf transformation on xenial, which defaults to using pool
+ instead of server.
+
+ -- Anders Kaseorg <andersk@mit.edu> Wed, 29 Jun 2016 20:47:34 -0400
+
debathena-ntp-config (1.5) unstable; urgency=low
[ Jonathan Reed ]
diff --git a/debian/transform_ntp.conf.debathena b/debian/transform_ntp.conf.debathena
index 0cce260..134c232 100755
--- a/debian/transform_ntp.conf.debathena
+++ b/debian/transform_ntp.conf.debathena
@@ -1,4 +1,5 @@
#!/usr/bin/perl -0p
-s/^server .*$/###SERVER/m or die;
+s/^server .*$/###SERVER/m or s/^pool .*$/###SERVER/m or die;
s/^server .*$//mg;
+s/^pool .*$//mg;
s/###SERVER/server TIME.MIT.EDU/ or die;
