CHANGES: Add/move change(s) backported to 4.99

[skip ci]

diff --git a/CHANGES b/CHANGES
index 96831088f4e8ad005cfeb837deba2ded88efdc69..6afd6e3d31f85d9e80143c6e2f33ae9a7cf59ffa 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -43,7 +43,6 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
       RT6: Add a bounds check for the PadN TLV in Segment Routing Header.
       TCP: Add support for the AE (AccECN) flag.
     User interface:
-      Add optional unit suffix on -C file size.
       Add --print-sampling to print every Nth packet instead of all.
       Add --lengths option to print the captured and original packet lengths.
       Add --skip option to skip some packets before writing or printing.
@@ -64,8 +63,6 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
         and use them rather than custom code
       Disregard setlinebuf(3), always use setvbuf(3).
       Change Sun RPC code licence to BSD-3-Clause.
-      Use C99 macros to define 64-bit constants and maximum 64-bit
-        values.
       Fix "ip broadcast" netmask byte order with the -f flag.
     Building and testing:
       Autoconf: Remove detection of early IPv6 stacks.
@@ -104,7 +101,11 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
            checksum calculation.
       NFS: Delete dead code.
       BOOTP: Use an uint16_t variable to get the result of a GET_BE_U_2().
+      ZEP: use the exissting NTP time formatting code.
+      NTP: Fix p_ntp_time_fmt() using epoch 1/epoch 2 convention (RFC 4330).
     User interface:
+      Add optional unit suffix on -C file size.
+      Improve the handling of size suffixes for -C.
       Warn that options -A, -x[x] and -X[X] are mutually exclusive.
       For PCAP_ERROR_CAPTURE_NOTSUP, show the error message provided
         by libpcap for that error if it's non-empty.
@@ -113,6 +114,7 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
       Add sub-second packet timestamp checks for invalid micro/nano.
       Remove unused missing/snprintf.c.
       Fix incompatible pointer types with time functions calls on Windows.
+      Use C99 macros to define 64-bit constants and maximum 64-bit values.
     Windows:
       Fixed to find wpcap.dll if WinPcap isn't installed and Npcap was
         installed without the WinPcap API compatibility option. (GitHub