Adding upstream version 4.99.5.upstream/4.99.5upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 77 insertions, 10 deletions

diff --git a/doc/README.haiku.md b/doc/README.haiku.md
new file mode 100644
index 0000000..f934152
--- /dev/null
+++ b/doc/README.haiku.md
@@ -0,0 +1,33 @@
+# Compiling tcpdump on Haiku
+
+## 64-bit x86 R1/beta4
+
+* Both system and local libpcap are suitable.
+* Autoconf 2.71 works.
+* CMake 3.24.2 works.
+* GCC 11.2.0 works.
+* Clang 12.0.1 works with the latest llvm12_clang-12.0.1-5 version.
+
+The following command will install respective non-default packages:
+```
+pkgman install libpcap_devel cmake llvm12_clang
+```
+
+For reference, the tests were done using a system installed from
+`haiku-r1beta4-x86_64-anyboot.iso`.
+
+## 32-bit x86 R1/beta4
+
+* Both system and local libpcap are suitable.
+* Autoconf 2.71 works.
+* CMake 3.24.2 works.
+* GCC 11.2.0 works.
+* Clang does not work.
+
+The following command will install respective non-default packages:
+```
+pkgman install libpcap_x86_devel cmake_x86
+```
+
+For reference, the tests were done using a system installed from
+`haiku-r1beta4-x86_gcc2h-anyboot.iso`.
diff --git a/doc/README.solaris.md b/doc/README.solaris.md
index afdd8f7..86571e2 100644
--- a/doc/README.solaris.md
+++ b/doc/README.solaris.md
@@ -39,3 +39,8 @@ developer/gcc
 developer/llvm/clang
 ENDOFTEXT
 ```
+
+## Solaris 9
+
+This version of this OS is not supported because the snprintf(3) implementation
+in its libc is not suitable.
diff --git a/doc/README.Win32.md b/doc/README.windows.md
index b7e81d1..ea95eac 100644
--- a/doc/README.Win32.md
+++ b/doc/README.windows.md
@@ -122,7 +122,7 @@ Debug build.
 In the CMakeSettings.json tab, change cmakeCommandArgs to include
 
 ```
--DPacket_ROOT={path-to-sdk}
+-DPCAP_ROOT={path-to-sdk}
 ```
 
 where `{path-to-sdk}` is the path of the directory containing the Npcap or
@@ -147,7 +147,7 @@ Choose which configuration type to build, if you don't want the default
 Debug build.
 
 Scroll down to "Cmake variables and cache", scroll through the list
-looking for the entry for Packet_ROOT, and either type in the path of
+looking for the entry for PCAP_ROOT, and either type in the path of
 the directory containing the Npcap or WinPcap SDK or use the "Browse..."
 button to browse for that directory.
 
@@ -160,6 +160,40 @@ you can build with Build > "Build All".
 Building from the command line
 ------------------------------
 
+### Visual Studio 2017 ###
+
+Start the appropriate Native Tools command line prompt.
+
+Change to the directory into which you want to build tcpdump, possibly
+after creating it first.  One choice is to create it as a subdirectory
+of the tcpdump source directory.
+
+Run the command
+
+```
+cmake "-DPCAP_ROOT={path-to-sdk}" -G {generator} {path-to-tcpdump-source}
+```
+
+`{path-to-sdk}` is the path of the directory containing the Npcap or
+WinPcap SDK.
+
+`{generator}` is the string "Visual Studio 15 2017" to build a 32-bit
+version of tcpdump or the string "Visual Studio 15 2017 Win64" to build
+a 64-bit version of tcpdump.
+
+`{path-to-tcpdump-source}` is the pathname of the top-level source
+directory for tcpdump.
+
+Run the command
+
+```
+msbuild /m /nologo /p:Configuration={configuration} tcpdump.sln
+```
+
+where `{configuration}` can be "Release", "Debug", or "RelWithDebInfo".
+
+### Visual Studio 2019 ###
+
 Start the appropriate Native Tools command line prompt.
 
 Change to the directory into which you want to build tcpdump, possibly
@@ -169,19 +203,14 @@ of the tcpdump source directory.
 Run the command
 
 ```
-cmake "-DPacket_ROOT={path-to-sdk}" -G {generator} {path-to-tcpdump-source}
+cmake "-DPCAP_ROOT={path-to-sdk}" -G "Visual Studio 16 2019" {platform} {path-to-tcpdump-source}
 ```
 
 `{path-to-sdk}` is the path of the directory containing the Npcap or
 WinPcap SDK.
 
-`{generator}` is the string "Visual Studio N YYYY", where `N` is the
-version of Visual Studio and `YYYY` is the year number for that version;
-if you are building a 64-bit version of tcpdump, `YYYY` must be followed
-by a space and "Win64".  For example, to build a 32-bit version of
-tcpdump with Visual Studio 2017, `{generator}` would be "Visual Studio
-15 2017" and to build a 64-bit version of tcpdump with Visual Studio
-2017, `{generator}` would be "Visual Studio 15 2017 Win64".
+`{platform}` is `-A Win32` to build a 32-bit version of tcpdump or `-A
+x64` to build a 64-bit version of tcpdump.
 
 `{path-to-tcpdump-source}` is the pathname of the top-level source
 directory for tcpdump.