Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p15

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p15-sec

bk: 5ec774eflEtwGGSBTkeOxbIRaFN17w

diff --cc ChangeLog
index 6c3bbfd42cb7ef7eb86b1f7839bdc40b32f54151,5cd7735314741c48ef798c8438c7c497a8bb8613..f50667bd2cc0001f960b0b08ad02eeb57227c13f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,8 +1,9 @@@
  ---
  (4.2.8p15) 2020/04/xx Released by Harlan Stenn <stenn@ntp.or>
  
 +* [Sec 3661] memory leak with AES128CMAC keys <perlinger@ntp.org>
+ * [Bug 3667] decodenetnum fails with numeric port <perlinger@ntp.org>
+   - rewrite 'decodenetnum()' in terms of inet_pton
  * [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>
    - limit number of receive buffers, with an iron reserve for refclocks
  * [Bug 3664] Enable openSSL CMAC support on Windows <burnicki@ntp.org>

diff --cc NEWS
index 6a2b65088c0d893a0cfe17b4ebba9edb827b8ae3,d2527a203c99d421b5a991352806a799b5c56e66..e280a66e7d7f5981186ac1befc8ae427f885aba6
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -10,9 -10,10 +10,11 @@@ authentication between ntpd from versio
  4.2.8p14/4.3.100 will leak a small amount of memory for each packet.
  Eventually, ntpd will run out of memory and abort.
  
- It also fixes 10 other bugs.
+ It also fixes 11 other bugs.
  
 +* [Sec 3661] memory leak with AES128CMAC keys <perlinger@ntp.org>
+ * [Bug 3667] decodenetnum fails with numeric port <perlinger@ntp.org>
+   - rewrite 'decodenetnum()' in terms of inet_pton
  * [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>
    - limit number of receive buffers, with an iron reserve for refclocks
  * [Bug 3664] Enable openSSL CMAC support on Windows <burnicki@ntp.org>