Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-2902

into  psp-deb1.ntp.org:/home/stenn/ntp-stable-sec

bk: 5612598eg_AqXLrQ05MHtwVJ48_qaw

diff --cc ChangeLog
index a98128add61a4d4823c00578e9d6f87f55ef9a16,bc636294b92b42f8d9a1b6d672f5ed165635c40b..49036a540c224e100a97ff9313a19d59713f8a52
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,6 +1,7 @@@
  ---
 +* [Sec 2899] CVE-2014-9297  perlinger@ntp.org
+ * [Sec 2902] configuration directives "pidfile" and "driftfile"
+   should be local-only. perlinger@ntp.org (patch by Miroslav Lichvar)
  * [Bug 2332] (reopened) Exercise thread cancellation once before dropping
    privileges and limiting resources in NTPD removes the need to link
    forcefully against 'libgcc_s' which does not always work. J.Perlinger