externpro 26.01.5-7-g64a1663 sync

.github/release-tag.json

@@ -0,0 +1,4 @@
+{
+  "message": "xpro version 1.1.1l.5 tag",
+  "tag": "xpv1.1.1l.5"
+}

.github/workflows/xpbuild.yml

@@ -14,11 +14,15 @@ jobs:
       contents: read
       pull-requests: write
       packages: write
-    uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.6
-    secrets: inherit
+    uses: externpro/externpro/.github/workflows/build-linux.yml@26.01.5
+    secrets:
+      automation_token: ${{ secrets.GHCR_TOKEN }}
+    with: {}
   macos:
-    uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.6
+    uses: externpro/externpro/.github/workflows/build-macos.yml@26.01.5
     secrets: inherit
+    with: {}
   windows:
-    uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.6
+    uses: externpro/externpro/.github/workflows/build-windows.yml@26.01.5
     secrets: inherit
+    with: {}

.github/workflows/xprelease.yml

@@ -34,7 +34,7 @@ jobs:
   # Upload build artifacts as release assets
   release-from-build:
     if: github.event_name == 'workflow_dispatch'
-    uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.6
+    uses: externpro/externpro/.github/workflows/release-from-build.yml@26.01.5
     with:
       workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
     permissions:

.github/workflows/xptag.yml

@@ -8,9 +8,9 @@ on:
 jobs:
   tag:
     if: ${{ github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'xpro' && contains(github.event.pull_request.labels.*.name, 'release:tag') }}
-    uses: externpro/externpro/.github/workflows/tag-release.yml@25.07.6
+    uses: externpro/externpro/.github/workflows/tag-release.yml@26.01.5
     with:
       merge_sha: ${{ github.event.pull_request.merge_commit_sha }}
       pr_number: ${{ github.event.pull_request.number }}
     secrets:
-      workflow_write_token: ${{ secrets.XPUPDATE_TOKEN }}
+      automation_token: ${{ secrets.XPRO_TOKEN }}

CMakeLists.txt

@@ -1,5 +1,4 @@
-cmake_minimum_required(VERSION 3.31)
-set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake)
+cmake_minimum_required(VERSION 4.3)
 project(openssl LANGUAGES C ASM)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON) # enables MSVC Solution Folders
 ########################################
@@ -8,8 +7,8 @@ set(OPENSSL_DEFS
   -D_REENTRANT
   -DL_ENDIAN # NOTE: SHA1_ASM must define L_ENDIAN for x86
   -DOPENSSL_PIC
-  -DOPENSSLDIR=\"/etc/ssl\"
-  -DENGINESDIR=\"/dev/null\"
+  [[-DOPENSSLDIR="/etc/ssl"]]
+  [[-DENGINESDIR="/dev/null"]]
   )
 if(WIN32)
   list(APPEND OPENSSL_DEFS
@@ -102,31 +101,27 @@ function(compareCmakeFilesys files)
 endfunction()
 ########################################
 set(targetsFile ${PROJECT_NAME}-targets)
-if(DEFINED XP_NAMESPACE)
+add_subdirectory(include)
+add_subdirectory(crypto)
+add_subdirectory(ssl)
+add_subdirectory(apps)
+add_subdirectory(test)
+if(COMMAND xpExternPackage)
   string(JOIN "\n" ALIASES
     "if(NOT TARGET OpenSSL::Crypto)"
-    "  add_library(OpenSSL::Crypto ALIAS ${XP_NAMESPACE}::crypto)"
+    "  add_library(OpenSSL::Crypto ALIAS ${CMAKE_PROJECT_NAME}::crypto)"
     "endif()"
-    ""
     "if(NOT TARGET OpenSSL::SSL)"
-    "  add_library(OpenSSL::SSL ALIAS ${XP_NAMESPACE}::ssl)"
+    "  add_library(OpenSSL::SSL ALIAS ${CMAKE_PROJECT_NAME}::ssl)"
     "endif()"
     ""
     )
-  xpExternPackage(NAMESPACE ${XP_NAMESPACE}
-    TARGETS_FILE ${targetsFile} LIBRARIES crypto ssl
-    BASE OpenSSL_1_1_1l XPDIFF "intro"
-    FIND_THREADS PVT_DEPS nasm yasm
+  xpExternPackage(TARGETS_FILE ${targetsFile}
+    LIBRARIES crypto ssl DEFAULT_TARGETS crypto ssl
+    BASE OpenSSL_1_1_1l XPDIFF "intro" PVT_DEPS nasm yasm
     WEB "http://www.openssl.org/" UPSTREAM "github.com/openssl/openssl"
     DESC "Cryptography and SSL/TLS Toolkit"
     LICENSE "[OpenSSL AND SSLeay](http://www.openssl.org/source/license.html 'dual OpenSSL and SSLeay License: both apply')"
     )
-  set(nameSpace NAMESPACE ${XP_NAMESPACE}::)
 endif()
-########################################
-add_subdirectory(include)
-add_subdirectory(crypto)
-add_subdirectory(ssl)
-add_subdirectory(apps)
-add_subdirectory(test)
-install(EXPORT ${targetsFile} DESTINATION ${CMAKE_INSTALL_CMAKEDIR} ${nameSpace})
+install(EXPORT ${targetsFile} DESTINATION ${CMAKE_INSTALL_CMAKEDIR} NAMESPACE ${CMAKE_PROJECT_NAME}::)

CMakePresets.json

@@ -3,6 +3,7 @@
   "include": [
     ".devcontainer/cmake/presets/xpLinuxNinja.json",
     ".devcontainer/cmake/presets/xpDarwinNinja.json",
-    ".devcontainer/cmake/presets/xpWindowsVs2022.json"
+    ".devcontainer/cmake/presets/xpMswVs2022.json",
+    ".devcontainer/cmake/presets/xpMswVs2026.json"
   ]
 }

CMakePresetsBase.json

@@ -6,7 +6,7 @@
       "hidden": true,
       "binaryDir": "${sourceDir}/_bld-${presetName}",
       "cacheVariables": {
-        "XP_NAMESPACE": "xpro"
+        "CMAKE_EXPERIMENTAL_GENERATE_SBOM": "ca494ed3-b261-4205-a01f-603c95e4cae0"
       }
     }
   ],

crypto/CMakeLists.txt

@@ -1920,7 +1920,27 @@ target_link_libraries(${lib_name} PUBLIC $<BUILD_INTERFACE:include> PRIVATE Thre
 include(CheckLibraryExists)
 check_library_exists(ws2_32 getch "" CRYPTO_HAS_WS2_32)
 if(CRYPTO_HAS_WS2_32)
-  target_link_libraries(${lib_name} PRIVATE ws2_32)
+  set(_ws2_arch ${CMAKE_GENERATOR_PLATFORM})
+  if(NOT _ws2_arch)
+    set(_ws2_arch x64)
+  endif()
+  set(_ws2_sdk ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION})
+  if(_ws2_sdk)
+    find_library(WS2_32_LIBRARY ws2_32
+      PATHS "C:/Program Files (x86)/Windows Kits/10/Lib/${_ws2_sdk}/um/${_ws2_arch}"
+            "C:/Program Files/Windows Kits/10/Lib/${_ws2_sdk}/um/${_ws2_arch}"
+      NO_DEFAULT_PATH
+    )
+  endif()
+  if(WS2_32_LIBRARY)
+    target_link_libraries(${lib_name} INTERFACE "$<BUILD_INTERFACE:${WS2_32_LIBRARY}>$<INSTALL_INTERFACE:ws2_32>")
+  else()
+    message(WARNING "ws2_32.lib not found; falling back to short name")
+    target_link_libraries(${lib_name} INTERFACE "ws2_32.lib")
+  endif()
+  unset(_ws2_arch)
+  unset(_ws2_sdk)
+  unset(WS2_32_LIBRARY)
 endif()
 ########################################
 install(TARGETS ${lib_name} EXPORT ${targetsFile}

xprodeps.md

@@ -2,13 +2,14 @@
 
 |project|license [^_l]|description [dependencies]|version|source|diff [^_d]|
 |-------|-------------|--------------------------|-------|------|----------|
-|<a id='openssl' />[openssl](http://www.openssl.org/)|[BSD-style](http://www.openssl.org/source/license.html 'dual OpenSSL and SSLeay License: both are BSD-style licenses')|Cryptography and SSL/TLS Toolkit [pvt deps: _nasm, yasm_]| |[upstream](https://github.com/openssl/openssl 'github.com/openssl/openssl')|  [intro]|
-|<a id='nasm' />[nasm](https://www.nasm.us/)|[BSD-2-Clause](https://www.nasm.us/ 'BSD 2-Clause Simplified License')|The Netwide Assembler - an 80x86 and x86-64 assembler (MSW-only)|[xpv2.14.02.4](https://github.com/externpro/nasm/releases/tag/xpv2.14.02.4 'release')|[repo](https://github.com/externpro/nasm 'github.com/externpro/nasm')|[diff](https://github.com/externpro/nasm/compare/v0...xpv2.14.02.4 'github.com/externpro/nasm/compare/v0...xpv2.14.02.4') [bin]|
-|<a id='yasm' />[yasm](http://yasm.tortall.net/)|[BSD-2-Clause](https://github.com/yasm/yasm/blob/v1.3.0/COPYING 'BSD 2-Clause Simplified License')|assembler and disassembler for the Intel x86 architecture|[xpv1.3.0.3](https://github.com/externpro/yasm/releases/tag/xpv1.3.0.3 'release')|[repo](https://github.com/externpro/yasm 'github.com/externpro/yasm') [upstream](https://github.com/yasm/yasm 'github.com/yasm/yasm')|[diff](https://github.com/externpro/yasm/compare/v1.3.0...xpv1.3.0.3 'github.com/externpro/yasm/compare/v1.3.0...xpv1.3.0.3') [patch]|
+|<a id='openssl' />[openssl](http://www.openssl.org/)|[OpenSSL AND SSLeay](http://www.openssl.org/source/license.html 'dual OpenSSL and SSLeay License: both apply')|Cryptography and SSL/TLS Toolkit [deps: _Threads_] [pvt deps: _nasm, yasm_]| |[upstream](https://github.com/openssl/openssl 'github.com/openssl/openssl')|  [intro]|
+|<a id='Threads' />[Threads](https://cmake.org/cmake/help/latest/module/FindThreads.html)|[LGPL-2.1-or-later](https://spdx.org/licenses/LGPL-2.1-or-later.html 'GNU Lesser General Public License v2.1 or later')|Finds and determines the thread library of the system for multithreading support|[xpv1.0.4](https://github.com/externpro/Threads/releases/tag/xpv1.0.4 'release')|[repo](https://github.com/externpro/Threads 'github.com/externpro/Threads')|[diff](https://github.com/externpro/Threads/compare/v0...xpv1.0.4 'github.com/externpro/Threads/compare/v0...xpv1.0.4') [bin]|
+|<a id='nasm' />[nasm](https://www.nasm.us/)|[BSD-2-Clause](https://www.nasm.us/ 'BSD 2-Clause Simplified License')|The Netwide Assembler - an 80x86 and x86-64 assembler (MSW-only)|[xpv2.14.02.5](https://github.com/externpro/nasm/releases/tag/xpv2.14.02.5 'release')|[repo](https://github.com/externpro/nasm 'github.com/externpro/nasm')|[diff](https://github.com/externpro/nasm/compare/v0...xpv2.14.02.5 'github.com/externpro/nasm/compare/v0...xpv2.14.02.5') [bin]|
+|<a id='yasm' />[yasm](http://yasm.tortall.net/)|[BSD-2-Clause](https://github.com/yasm/yasm/blob/v1.3.0/COPYING 'BSD 2-Clause Simplified License')|assembler and disassembler for the Intel x86 architecture|[xpv1.3.0.4](https://github.com/externpro/yasm/releases/tag/xpv1.3.0.4 'release')|[repo](https://github.com/externpro/yasm 'github.com/externpro/yasm') [upstream](https://github.com/yasm/yasm 'github.com/yasm/yasm')|[diff](https://github.com/externpro/yasm/compare/v1.3.0...xpv1.3.0.4 'github.com/externpro/yasm/compare/v1.3.0...xpv1.3.0.4') [patch]|
 
 ![deps](xprodeps.svg 'dependencies')
 
-Dependency version check: all 2 parent-manifest versions match pinned versions.
+Dependency version check: all 3 parent-manifest versions match pinned versions.
 
 |diff  |description|
 |------|-----------|