From 9f30fc974d93a5768a71901416b2888ed0736ac4 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 8 Jan 2020 13:24:55 -0800 Subject: WSDG: Update the libraries chapter. C-ares is required, so don't mark it as optional. Add Win64 download URLs and list them first. Zlib is part of our vcpkg bundle. Change-Id: I232f4df988aa12afde0b66fff203187136504e94 Reviewed-on: https://code.wireshark.org/review/35700 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- docbook/wsdg_src/WSDG_chapter_libraries.adoc | 75 +++++++++++++++++----------- 1 file changed, 45 insertions(+), 30 deletions(-) diff --git a/docbook/wsdg_src/WSDG_chapter_libraries.adoc b/docbook/wsdg_src/WSDG_chapter_libraries.adoc index 50e9cb7d4a..5f75b441dd 100644 --- a/docbook/wsdg_src/WSDG_chapter_libraries.adoc +++ b/docbook/wsdg_src/WSDG_chapter_libraries.adoc @@ -24,8 +24,8 @@ Wireshark. .Our libraries are freely available ==== All libraries required to build Wireshark on Windows are available for download at -https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] and -https://anonsvn.wireshark.org/wireshark-win64-libs/trunk/packages/[]. +https://anonsvn.wireshark.org/wireshark-win64-libs/trunk/packages/[] and +https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. See <> for an easier way to install them. ==== @@ -134,55 +134,61 @@ for your platform, you can get it at https://wiki.gnome.org/Projects/GLib[]. [discrete] ==== Windows -Part of our vcpkg-export bundle at +GLib is part of our vcpkg-export bundles and is available at +https://anonsvn.wireshark.org/wireshark-win64-libs/trunk/packages/[] +and https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. -[[ChLibsSMI]] +[[ChLibsCares]] -=== SMI (Optional) +=== c-ares -LibSMI is used for MIB and PIB parsing and for OID resolution. +C-Ares is used for asynchronous DNS resolution and lets us resolve names with a minimal performance impact. -[[ChLibsUnixSMI]] +[[ChLibsUnixCares]] [discrete] ==== Unix -If this library isn't already installed or available as a -package for your platform, you can get it at -https://www.ibr.cs.tu-bs.de/projects/libsmi/[]. +If this library isn't already installed or available as a package for your +platform, you can get it at https://c-ares.haxx.se/[]. -[[ChLibsWin32SMI]] +[[ChLibsWin32Cares]] [discrete] ==== Windows -Wireshark uses the source libSMI distribution at -https://www.ibr.cs.tu-bs.de/projects/libsmi/[]. -LibSMI is cross-compiled using MinGW32. It’s stored in the libsmi zip archive at +C-Ares is built using vcpkg and is available at +https://anonsvn.wireshark.org/wireshark-win64-libs/trunk/packages/[] +and https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. -[[ChLibsCares]] +[[ChLibsSMI]] -=== c-ares (Optional) +=== SMI (Optional) -C-Ares is used for asynchronous DNS resolution. This is the primary name -resolution library in Wireshark. +LibSMI is used for MIB and PIB parsing and for OID resolution. -[[ChLibsUnixCares]] +[[ChLibsUnixSMI]] [discrete] ==== Unix -If this library isn't already installed or available as a package for your -platform, you can get it at https://c-ares.haxx.se/[]. +If this library isn't already installed or available as a +package for your platform, you can get it at +https://www.ibr.cs.tu-bs.de/projects/libsmi/[]. -[[ChLibsWin32Cares]] +[[ChLibsWin32SMI]] [discrete] ==== Windows -C-Ares is cross-compiled using MinGW32 and is available at +Wireshark uses the source libSMI distribution at +https://www.ibr.cs.tu-bs.de/projects/libsmi/[]. +LibSMI is cross-compiled using MinGW32. +It’s stored in the libsmi zip archives at +https://anonsvn.wireshark.org/wireshark-win64-libs/trunk/packages/[] +and https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. [[ChLibsZlib]] @@ -212,9 +218,10 @@ https://www.zlib.net/[]. [discrete] ==== Windows -The zlib sources are downloaded from -https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] and compiled -locally. +zlib is part of our vcpkg-export bundles and is available at +https://anonsvn.wireshark.org/wireshark-win64-libs/trunk/packages/[] +and +https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. [[ChLibsPcap]] @@ -277,7 +284,9 @@ https://gnutls.org/[]. [discrete] ==== Windows -We provide a package cross-compiled using MinGW32 at +We provide packages cross-compiled using MinGW32 at +https://anonsvn.wireshark.org/wireshark-win64-libs/trunk/packages/[] +and https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. [[ChLibsGcrypt]] @@ -325,7 +334,9 @@ https://web.mit.edu/Kerberos/dist/[]. [discrete] ==== Windows -We provide a package at +We provide packages for Windows at +https://anonsvn.wireshark.org/wireshark-win64-libs/trunk/packages/[] +and https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. [[ChLibsLua]] @@ -348,7 +359,9 @@ https://www.lua.org/download.html[]. [discrete] ==== Windows -We provide a copy of the official package at +We provide copies of the official packages at +https://anonsvn.wireshark.org/wireshark-win64-libs/trunk/packages/[] +and https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. [[ChLibsMaxMindDB]] @@ -379,7 +392,9 @@ WinSparkle is an easy-to-use software update library for Windows developers. [discrete] ==== Windows -We provide a copy of the WinSparkle package at +We provide copies of the WinSparkle package at +https://anonsvn.wireshark.org/wireshark-win64-libs/trunk/packages/[] +and https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. // End of WSDG Chapter Libraries -- cgit v1.2.3