From cfd79b4701996fd0f65d58c9ab4aa4e21cc5d5f3 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Sat, 15 Dec 2018 18:45:53 +0100 Subject: Windows: Upgrade GnuTLS to 1.6.3 Upgrade to GnuTLS 3.6.3-1, using MinGW binaries from Fedora 29 packages: mingw64-gnutls-3.6.3-1.fc29.noarch.rpm mingw64-gcc-8.2.0-3.fc29.x86_64.rpm mingw64-gmp-6.1.2-4.fc29.noarch.rpm mingw64-nettle-3.4-2.fc29.noarch.rpm mingw64-p11-kit-0.23.7-5.fc29.noarch.rpm mingw64-libffi-3.1-4.fc29.noarch.rpm mingw64-libtasn1-4.13-3.fc29.noarch.rpm mingw64-winpthreads-5.0.4-2.fc29.noarch.rpm This includes libgcc_s_seh-1.dll (64-bit, new) and libgcc_s_sjlj-1.dll (32-bit, previously included with glib2). Built with https://git.lekensteyn.nl/peter/wireshark-notes/tree/windows-libs/make-gnutls-libs-zip.sh?id=b86878e458d5d7deb21218ce6598b98af4ed7ec2 The main motivation is improved PKCS #11 support: - 3.6.0: fix potential compatibility issue with SafeNet HSMs https://gitlab.com/gnutls/gnutls/merge_requests/398/ - 3.6.2: gnutls_pkcs11_token_get_flags now forwards token info. - 3.6.3: new APIs for low-level PKCS #11 token or object operations. Change-Id: I235774e3b27f3426cb74d3d9c0ab593d06870e89 Reviewed-on: https://code.wireshark.org/review/31128 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin Reviewed-by: Anders Broman --- cmake/modules/FindGLIB2.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'cmake/modules/FindGLIB2.cmake') diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake index 77ba381540..db2de9297a 100644 --- a/cmake/modules/FindGLIB2.cmake +++ b/cmake/modules/FindGLIB2.cmake @@ -103,13 +103,16 @@ if( GLIB2_FOUND ) CACHE PATH "Path to GLib 2 DLLs" ) # XXX Are GIO and GObject really necessary? + # libglib and libgio in glib2-2.52.2-1.34-win32ws depend on + # libgcc_s_sjlj-1.dll, now included with gnutls-3.6.3-1-win32ws. + # (64-bit GLib does not depend on libgcc_s). file( GLOB _glib2_dlls RELATIVE "${GLIB2_DLL_DIR}" "${GLIB2_DLL_DIR}/libglib-*.dll" "${GLIB2_DLL_DIR}/libgio-*.dll" "${GLIB2_DLL_DIR}/libgmodule-*.dll" "${GLIB2_DLL_DIR}/libgobject-*.dll" "${GLIB2_DLL_DIR}/libintl-*.dll" - "${GLIB2_DLL_DIR}/libgcc_s_*.dll" + #"${GLIB2_DLL_DIR}/libgcc_s_*.dll" ) set ( GLIB2_DLLS ${_glib2_dlls} # We're storing filenames only. Should we use STRING instead? -- cgit v1.2.3