externpro · smanders · Jun 2, 2026 · Jun 2, 2026 · Jun 2, 2026 · Jun 2, 2026
diff --git a/.devcontainer b/.devcontainer
diff --git a/.github/release-tag.json b/.github/release-tag.json
@@ -0,0 +1,4 @@
+{
+  "message": "xpro version 1.0.18.234 tag",
+  "tag": "xpv1.0.18.234"
+}
diff --git a/.github/release-tag.yml b/.github/release-tag.yml
diff --git a/.github/workflows/xpbuild.yml b/.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.1
+    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.1
     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.1
     secrets: inherit
+    with: {}
diff --git a/.github/workflows/xpinit.yml b/.github/workflows/xpinit.yml
@@ -0,0 +1,12 @@
+name: xpInit externpro
+permissions:
+  contents: write
+  pull-requests: write
+  packages: write
+on:
+  workflow_dispatch:
+jobs:
+  init:
+    uses: externpro/externpro/.github/workflows/init-externpro.yml@main
+    secrets:
+      automation_token: ${{ secrets.XPRO_TOKEN }}
diff --git a/.github/workflows/xprelease.yml b/.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.1
     with:
       workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
     permissions:

diff --git a/.github/workflows/xptag.yml b/.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.1
     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 }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,6 @@
-cmake_minimum_required(VERSION 3.31)
+cmake_minimum_required(VERSION 4.3)
 file(STRINGS configure.ac configure_ac REGEX ^AC_INIT)
 string(REGEX MATCH "([0-9]+)[.][0-9]+[.][0-9]+" VER "${configure_ac}")
-set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake)
 project(libsodium VERSION ${VER} LANGUAGES C ASM)
 include(configure.cmake)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON) # enables Solution Folders

diff --git a/CMakePresets.json b/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"
   ]
 }
diff --git a/CMakePresetsBase.json b/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"
       }
     }
   ],

diff --git a/src/libsodium/CMakeLists.txt b/src/libsodium/CMakeLists.txt
@@ -677,15 +677,14 @@ target_include_directories(${lib_name} PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTAL
 target_link_libraries(${lib_name} PRIVATE Threads::Threads)
 ############################################################
 set(targetsFile ${lib_name}-targets)
-if(DEFINED XP_NAMESPACE)
-  xpExternPackage(NAMESPACE ${XP_NAMESPACE}
-    TARGETS_FILE ${targetsFile} FIND_THREADS LIBRARIES ${lib_name}
+if(COMMAND xpExternPackage)
+  xpExternPackage(TARGETS_FILE ${targetsFile}
+    LIBRARIES ${lib_name} DEFAULT_TARGETS ${lib_name}
     BASE aa099f5e82ae78175f9c1c48372a123cb634dd92 XPDIFF "auto"
     WEB "https://doc.libsodium.org/" UPSTREAM "github.com/jedisct1/libsodium"
     DESC "library for encryption, decryption, signatures, password hashing and more"
     LICENSE "[ISC](https://doc.libsodium.org/#license 'Internet Systems Consortium License, functionally equivalent to simplified BSD and MIT licenses')"
     )
-  set(nameSpace NAMESPACE ${XP_NAMESPACE}::)
 elseif(NOT DEFINED CMAKE_INSTALL_CMAKEDIR)
   set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
 endif()
@@ -699,5 +698,5 @@ install(TARGETS ${lib_name} EXPORT ${targetsFile}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   )
-install(EXPORT ${targetsFile} DESTINATION ${CMAKE_INSTALL_CMAKEDIR} ${nameSpace})
+install(EXPORT ${targetsFile} DESTINATION ${CMAKE_INSTALL_CMAKEDIR} NAMESPACE ${PROJECT_NAME}::)
 compareCmakeFilesys("${${lib_name}_libsrcs}")
diff --git a/xprodeps.md b/xprodeps.md
@@ -0,0 +1,22 @@
+# libsodium dependencies
+
+|project|license [^_l]|description [dependencies]|version|source|diff [^_d]|
+|-------|-------------|--------------------------|-------|------|----------|
+|<a id='libsodium' />[libsodium](https://doc.libsodium.org/)|[ISC](https://doc.libsodium.org/#license 'Internet Systems Consortium License, functionally equivalent to simplified BSD and MIT licenses')|library for encryption, decryption, signatures, password hashing and more [deps: _Threads_]| |[upstream](https://github.com/jedisct1/libsodium 'github.com/jedisct1/libsodium')|  [auto]|
+|<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]|
+
+![deps](xprodeps.svg 'dependencies')
+
+Dependency version check: all 1 parent-manifest versions match pinned versions.
+
+|diff  |description|
+|------|-----------|
+|patch |diff modifies/patches existing cmake|
+|intro |diff introduces cmake|
+|auto  |diff adds cmake to replace autotools/configure/make|
+|native|diff adds cmake but uses existing build system|
+|bin   |diff adds cmake to repackage binaries built elsewhere|
+|fetch |diff adds cmake and utilizes FetchContent|
+
+[^_l]: see [SPDX License List](https://spdx.org/licenses/ '') for a list of commonly found licenses
+[^_d]: see table above with description of diff
diff --git a/xprodeps.svg b/xprodeps.svg
+1 −0		.gitattributes
+65 −0		.github/actions/build-image-context-tag/action.yml
+74 −29		.github/actions/cmake-build/action.yml
+32 −0		.github/actions/compare-cmake-presets/action.yml
+201 −0		.github/actions/compare-cmake-presets/compare.py
+51 −0		.github/actions/docker-push-with-retry/action.yml
+358 −0		.github/actions/externpro-deps-configure/action.yml
+48 −0		.github/actions/externpro-validate/action.yml
+29 −0		.github/actions/gh-retry/gh-retry.sh
+79 −0		.github/actions/ghcr-access/action.yml
+44 −0		.github/actions/git-am-patches/action.yml
+19 −0		.github/actions/git-configure-bot/action.yml
+42 −0		.github/actions/labels-mgmt/action.yml
+91 −0		.github/actions/pr-close-superseded/action.yml
+116 −0		.github/actions/release-tag-intent/action.yml
+0 −8		.github/actions/sync-caller-workflows/action.yml
+241 −508		.github/actions/sync-caller-workflows/sync.sh
+19 −0		.github/aw/actions-lock.json
+60 −0		.github/docs/README.md
+34 −0		.github/docs/architecture-overview.md
+ −		.github/docs/assets/org_01_actions-secrets.png
+ −		.github/docs/assets/org_02_new-secret.png
+ −		.github/docs/assets/org_03_secrets-populated.png
+ −		.github/docs/assets/pat_01_new.png
+ −		.github/docs/assets/pat_02_permissions.png
+ −		.github/docs/assets/pat_03_generate-token.png
+ −		.github/docs/assets/pat_04_copy-token.png
+ −		.github/docs/assets/repo_01_actions-secrets.png
+ −		.github/docs/assets/repo_02_new-secret.png
+ −		.github/docs/assets/repo_03_secrets-populated.png
+91 −0		.github/docs/build-customizations.md
+117 −0		.github/docs/caller-workflows.md
+50 −0		.github/docs/release-flow.md
+99 −0		.github/docs/reusable-workflows.md
+113 −0		.github/docs/secrets-and-tokens.md
+42 −0		.github/docs/supply-chain.md
+0 −2		.github/release-tag.yml.example
+8 −4		.github/wf-templates/xpbuild.yml
+12 −0		.github/wf-templates/xpinit.yml
+1 −1		.github/wf-templates/xprelease.yml
+2 −2		.github/wf-templates/xptag.yml
+3 −2		.github/wf-templates/xpupdate.yml
+7 −288		.github/workflows/README.md
+146 −39		.github/workflows/build-linux.yml
+8 −9		.github/workflows/build-macos.yml
+24 −10		.github/workflows/build-windows.yml
+1,203 −0		.github/workflows/create-draft-release-on-tag.lock.yml
+281 −0		.github/workflows/create-draft-release-on-tag.md
+353 −0		.github/workflows/init-externpro.yml
+105 −28		.github/workflows/release-from-build.yml
+15 −25		.github/workflows/tag-release.yml
+151 −429		.github/workflows/update-externpro.yml
+0 −288		.windsurf/workflows/manifestUpdate.md
+148 −46		README.md
+69 −57		cmake/README.md
+351 −279		cmake/deps.svg
+32 −0		cmake/docs/README.md
+70 −0		cmake/docs/classified-sources.md
+27 −0		cmake/docs/cmakeup.md
+54 −0		cmake/docs/dependency-provider.md
+40 −0		cmake/docs/diff-types.md
+115 −0		cmake/docs/download-and-extract.md
+127 −0		cmake/docs/extern-package.md
+85 −0		cmake/docs/how-to-adopt-externpro.md
+64 −0		cmake/docs/packaging.md
+2 −1		cmake/presets/CMakePresets.json
+4 −1		cmake/presets/xpDarwinNinja.json
+4 −1		cmake/presets/xpLinuxNinja.json
+4 −1		cmake/presets/xpLinuxNinjaTargets.json
+183 −0		cmake/presets/xpMswVs2022.json
+183 −0		cmake/presets/xpMswVs2026.json
+0 −157		cmake/presets/xpWindowsVs2019.json
+0 −180		cmake/presets/xpWindowsVs2022.json
+126 −104		cmake/pros.cmake
+0 −106		cmake/pros.md
+1 −0		cmake/xpdeps.cmake.in
+895 −133		cmake/xpfunmac.cmake
+2 −4		cmake/xpuse.cmake.in
+1 −0		cmake/xpusext.cmake.in
+1 −1		funcs.sh
+89 −0		scripts/cleanup-whitespace.py
+0 −0		scripts/enable-systemctl.sh
+0 −0		scripts/git-lfs-check.sh
+0 −0		scripts/wslresolv.sh
+11 −0		xpro-dev.code-workspace