diff --git a/ports/xmlsec/CMakeLists.txt b/ports/xmlsec/CMakeLists.txt index bbd9ea9d2ca356..29ad983d6079fc 100644 --- a/ports/xmlsec/CMakeLists.txt +++ b/ports/xmlsec/CMakeLists.txt @@ -68,34 +68,36 @@ target_include_directories(xmlsec1 PUBLIC target_link_libraries(xmlsec1 PUBLIC LibXml2::LibXml2) target_link_libraries(xmlsec1-openssl PUBLIC xmlsec1 OpenSSL::Crypto) -add_compile_definitions(inline=__inline) -add_compile_definitions(PACKAGE="xmlsec1") -add_compile_definitions(HAVE_STDIO_H) -add_compile_definitions(HAVE_STDLIB_H) -add_compile_definitions(HAVE_STRING_H) -add_compile_definitions(HAVE_CTYPE_H) -add_compile_definitions(HAVE_MALLOC_H) -add_compile_definitions(HAVE_MEMORY_H) -add_compile_definitions(XMLSEC_DEFAULT_CRYPTO="openssl") -add_compile_definitions(UNICODE) -add_compile_definitions(_UNICODE) -add_compile_definitions(_MBCS) -add_compile_definitions(_REENTRANT) +add_compile_definitions( + inline=__inline + PACKAGE="xmlsec1" + HAVE_STDIO_H + HAVE_STDLIB_H + HAVE_STRING_H + HAVE_CTYPE_H + HAVE_MALLOC_H + HAVE_MEMORY_H + XMLSEC_DEFAULT_CRYPTO="openssl" + UNICODE + _UNICODE + _MBCS + _REENTRANT + WIN32_LEAN_AND_MEAN +) set_target_properties(xmlsec1 xmlsec1-openssl PROPERTIES VERSION ${XMLSEC_VERSION_MAJOR}.${XMLSEC_VERSION_MINOR}) -set(XMLSEC_CORE_CFLAGS "") +set(XMLSEC_CORE_CFLAGS XMLSEC_NO_XSLT XMLSEC_CRYPTO_OPENSSL XMLSEC_NO_FTP XMLSEC_NO_HTTP) if(NOT BUILD_SHARED_LIBS) - set(XMLSEC_CORE_CFLAGS "-DLIBXML_STATIC -DXMLSEC_STATIC -DXMLSEC_NO_CRYPTO_DYNAMIC_LOADING") - target_compile_definitions(xmlsec1 PUBLIC XMLSEC_STATIC XMLSEC_NO_CRYPTO_DYNAMIC_LOADING) + list(APPEND XMLSEC_CORE_CFLAGS XMLSEC_STATIC XMLSEC_NO_CRYPTO_DYNAMIC_LOADING) endif() -set(XMLSEC_OPENSSL_CFLAGS ${XMLSEC_CORE_CFLAGS}) +set(XMLSEC_OPENSSL_CFLAGS XMLSEC_NO_MD5 XMLSEC_NO_RIPEMD160 XMLSEC_NO_GOST XMLSEC_NO_GOST2012) target_compile_definitions(xmlsec1 PRIVATE $<$:XMLSEC_DL_WIN32> - PUBLIC XMLSEC_NO_XSLT XMLSEC_CRYPTO_OPENSSL + PUBLIC ${XMLSEC_CORE_CFLAGS} ) -target_compile_definitions(xmlsec1-openssl PUBLIC XMLSEC_NO_GOST XMLSEC_NO_GOST2012) +target_compile_definitions(xmlsec1-openssl PUBLIC ${XMLSEC_OPENSSL_CFLAGS}) install(TARGETS xmlsec1 xmlsec1-openssl EXPORT unofficial-xmlsec-targets @@ -153,11 +155,12 @@ set(libdir ${prefix}/${CMAKE_INSTALL_LIBDIR}) set(includedir ${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) set(VERSION ${XMLSEC_VERSION}) set(LIBXML_MIN_VERSION ${LIBXML2_VERSION_STRING}) -set(OPENSSL_LIBS "-lcrypto") -set(XMLSEC_CORE_CFLAGS "${XMLSEC_CORE_CFLAGS} -DXMLSEC_DL_LIBLTDL=1 -I\${includedir}/xmlsec1 -DXMLSEC_CRYPTO_OPENSSL=1") +list(JOIN XMLSEC_CORE_CFLAGS " -D" XMLSEC_CORE_CFLAGS) +set(XMLSEC_CORE_CFLAGS "-D${XMLSEC_CORE_CFLAGS} -I\${includedir}/xmlsec1") set(XMLSEC_CORE_LIBS "-lxmlsec1 -lltdl") -set(XMLSEC_OPENSSL_CFLAGS "${XMLSEC_OPENSSL_CFLAGS} -I\${includedir}/xmlsec1") -set(XMLSEC_OPENSSL_LIBS "-L\${libdir} -lxmlsec1-openssl ${XMLSEC_CORE_LIBS} ${OPENSSL_LIBS}") +list(JOIN XMLSEC_OPENSSL_CFLAGS " -D" XMLSEC_OPENSSL_CFLAGS) +set(XMLSEC_OPENSSL_CFLAGS "${XMLSEC_CORE_CFLAGS} -D${XMLSEC_OPENSSL_CFLAGS}") +set(XMLSEC_OPENSSL_LIBS "-L\${libdir} -lxmlsec1-openssl ${XMLSEC_CORE_LIBS} -lcrypto") configure_file(${PROJECT_SOURCE_DIR}/xmlsec.pc.in ${PROJECT_BINARY_DIR}/xmlsec1.pc @ONLY) configure_file(${PROJECT_SOURCE_DIR}/xmlsec-openssl.pc.in ${PROJECT_BINARY_DIR}/xmlsec1-openssl.pc @ONLY) diff --git a/ports/xmlsec/portfile.cmake b/ports/xmlsec/portfile.cmake index 5410e3da631ae0..79aa40d7f4dd1e 100644 --- a/ports/xmlsec/portfile.cmake +++ b/ports/xmlsec/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lsh123/xmlsec REF "${release_tag}" - SHA512 6e41c35042e5a74e135cfb7468aa5c09b3c9ba684ab2431ecedce950f7c99c92fc8765c1c8c2ddfd87718bd00f4a287028227da1e987f2ef17ce2594356e81af + SHA512 28130c10d79f652e3533e6ede5fdaab0f6db5a4bbaaca4713b62df9af2ae2d5314acf82d01f344f87faf95c12099fd77e0858cbe5232a96de1d531e6284ede1b HEAD_REF master PATCHES pkgconfig_fixes.patch diff --git a/ports/xmlsec/vcpkg.json b/ports/xmlsec/vcpkg.json index c504e7733c8a7a..719aea949bead3 100644 --- a/ports/xmlsec/vcpkg.json +++ b/ports/xmlsec/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xmlsec", - "version": "1.3.6", + "version": "1.3.7", "description": "XML Security Library is a C library based on LibXML2. The library supports major XML security standards.", "homepage": "https://www.aleksey.com/xmlsec/", "license": "X11 AND MPL-1.1", diff --git a/versions/baseline.json b/versions/baseline.json index 30a0b6a2ea471b..836a00057b211c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9993,7 +9993,7 @@ "port-version": 0 }, "xmlsec": { - "baseline": "1.3.6", + "baseline": "1.3.7", "port-version": 0 }, "xnnpack": { diff --git a/versions/x-/xmlsec.json b/versions/x-/xmlsec.json index 0ad0e95569c66f..1549c2cf8d7ca4 100644 --- a/versions/x-/xmlsec.json +++ b/versions/x-/xmlsec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "981d2bea8296b17959768d20e8842643870b4cb6", + "version": "1.3.7", + "port-version": 0 + }, { "git-tree": "53a0926b6c125320e29773130a9992c43cfd9815", "version": "1.3.6",