Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[xmlsec] Update to 1.2.31 #14587

Merged
merged 2 commits into from
Nov 18, 2020
Merged

[xmlsec] Update to 1.2.31 #14587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d11996
[xmlsec] Update to 1.2.31
SvenPStarFinanz Nov 16, 2020
3da3447
Merge remote-tracking branch 'upstream/master' into xmlsec-1.2.31
strega-nil Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions ports/xmlsec/0001-uwp-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
diff --git a/src/dl.c b/src/dl.c
index b13f9d4..4a1b0c1 100644
index e934fe4e..a511df43 100644
--- a/src/dl.c
+++ b/src/dl.c
@@ -148,7 +148,14 @@ xmlSecCryptoDLLibraryCreate(const xmlChar* name) {
@@ -148,7 +148,7 @@ xmlSecCryptoDLLibraryCreate(const xmlChar* name) {
#endif /* XMLSEC_DL_LIBLTDL */

#ifdef XMLSEC_DL_WIN32
- lib->handle = LoadLibraryA((char*)lib->filename);
+#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP
+ lib->handle = LoadLibraryA((char*)lib->filename);
+#else
+ LPTSTR wcLib = NULL;
+ wcLib = xmlSecWin32ConvertUtf8ToTstr((char*)lib->filename);
+ if (wcLib)
+ lib->handle = LoadPackagedLibrary(wcLib, 0);
+#endif
if(lib->handle == NULL) {
xmlSecIOError("LoadLibraryA", lib->filename, NULL);
xmlSecCryptoDLLibraryDestroy(lib);
-#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
+#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
lib->handle = LoadLibraryA((char*)lib->filename);
#else
LPWSTR wcLibFilename = xmlSecWin32ConvertUtf8ToUnicode(lib->filename);
--
2.25.1.windows.1

3 changes: 1 addition & 2 deletions ports/xmlsec/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Source: xmlsec
Version: 1.2.30
Port-Version: 1
Version: 1.2.31
Homepage: https://www.aleksey.com/xmlsec/
Description: XML Security Library is a C library based on LibXML2. The library supports major XML security standards.
Build-Depends: libxml2, openssl
4 changes: 2 additions & 2 deletions ports/xmlsec/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO lsh123/xmlsec
REF xmlsec-1_2_30
SHA512 e631e7b132b39bb53f2713fe34880f8b4e81fd759fd206e8872c066236a8a64713842ba5e0ba9ad2f345f9f6d1da304acbeb61411b52cfa79d2934fc9e260ce9
REF xmlsec-1_2_31
SHA512 00c67bdfed208c23cbdbcdecd0648c19b66e6036a8dd27145d3c3f2150cba92cbdf5bf976f8561273e752ed3b5c188fa56ab84677e894194c6f1269a07caf04d
HEAD_REF master
PATCHES
0001-uwp-fix.patch
Expand Down