@openziti/ziti-sdk-nodejs 0.16.0 → 0.17.0

package/.github/workflows/build.yml

@@ -88,13 +88,12 @@ jobs:
       run: echo "date=$(date)" >> $GITHUB_OUTPUT
 
     - name: Install CMake/Ninja
-      uses: lukka/get-cmake@latest
+      uses: lukka/get-cmake@v3.27.6
 
     - name: Run VCPKG
-      uses: lukka/run-vcpkg@v11
+      uses: lukka/run-vcpkg@v10
       with:
-        # tag: 2023.10.19
-        vcpkgGitCommitId: '8eb57355a4ffb410a2e94c07b4dca2dffbee8e50'
+        vcpkgGitCommitId: 'c8696863d371ab7f46e213d8f5ca923c4aef2a00'
 
     - name: gcc version
       run: |

package/lib/enroll.js

@@ -0,0 +1,49 @@
+/*
+Copyright NetFoundry Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
+
+/**
+ * on_enroll()   
+ * 
+ */
+ const on_enroll = ( status ) => {
+
+};
+
+
+/**
+ * enroll()   
+ * 
+ * @param {*} jwt_path 
+ * @param {*} on_enroll_cb callback 
+ */
+const enroll = ( jwt_path, on_enroll_cb ) => {
+
+  let enroll_cb;
+
+  if (typeof on_enroll_cb === 'undefined') {
+    enroll_cb = on_enroll;
+  } else {
+    enroll_cb = on_enroll_cb;
+  }
+
+  ziti.ziti_enroll(jwt_path, enroll_cb);
+
+};
+
+
+exports.enroll = enroll;

package/lib/ziti.js

@@ -82,6 +82,21 @@ exports.close             = require('./close').close;
  */
 exports.dial              = require('./dial').dial;
 
+/**
+ * Enroll a Ziti Identity.
+ * @async
+ * @function enroll
+ * @param {string} jwt_path - The path to the JWT
+ * @param {onEnrollCallback} onEnroll - The callback that receives the enrollment status.
+ * @returns {void} No return value.
+ */
+/**
+ * This callback is part of the `enroll` API.
+ * @callback onEnrollCallback - The callback that receives the enrollment status.
+ * @param {object} obj - enrollment status.
+ */
+ exports.enroll           = require('./enroll').enroll;
+
 /**
  * Wrap ExpressJS to facilitate hosting (listening) on a Ziti Service instead of a TCP port.
  * @function express

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openziti/ziti-sdk-nodejs",
   "description": "A NodeJS-based SDK for delivering secure applications over a Ziti Network",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "main": "./lib/ziti",
   "scripts": {
     "build": "npm run build:init && npm run build:configure && npm run build:make",

package/src/ziti-add-on.c

@@ -18,6 +18,7 @@ limitations under the License.
 
 extern void set_signal_handler();
 
+uv_loop_t *thread_loop;
 
 napi_value Init(napi_env env, napi_value exports) {
 

package/src/ziti-nodejs.h

@@ -81,6 +81,14 @@ UV_EXTERN int uv_gettimeofday(uv_timeval64_t* tv);
 #  endif
 
 
+/**
+ * 
+ */
+typedef struct {
+  napi_async_work work;
+  napi_threadsafe_function tsfn_on_enroll;
+} EnrollAddonData;
+
 
 /**
  * 

package/src/ziti_enroll.c

@@ -16,18 +16,6 @@ limitations under the License.
 
 #include "ziti-nodejs.h"
 
-ziti_context nf;
-uv_loop_t *enroll_loop = NULL;
-
-uv_loop_t *thread_loop;
-uv_thread_t thread;
-uv_async_t async;
-
-
-typedef struct {
-  napi_async_work work;
-  napi_threadsafe_function tsfn;
-} AddonData;
 
 // An item that will be generated here and passed into the JavaScript enroll callback
 typedef struct EnrollItem {
@@ -45,6 +33,8 @@ typedef struct EnrollItem {
  */
 static void CallJs_on_enroll(napi_env env, napi_value js_cb, void* context, void* data) {
 
+  napi_status status;
+
   ZITI_NODEJS_LOG(DEBUG, "entered");
 
   // This parameter is not used.
@@ -70,38 +60,44 @@ static void CallJs_on_enroll(napi_env env, napi_value js_cb, void* context, void
 
     // const obj = {}
     napi_value js_enroll_item, js_json_salvo, js_status, js_err;
-    assert(napi_create_object(env, &js_enroll_item) == napi_ok);
+    status = napi_create_object(env, &js_enroll_item);
+    if (status != napi_ok) {
+      napi_throw_error(env, NULL, "Unable to napi_create_object");
+    }
 
     // obj.identity = identity
     if (NULL != item->json_salvo) {
-      assert(napi_create_string_utf8(env, (const char*)item->json_salvo, NAPI_AUTO_LENGTH, &js_json_salvo) == napi_ok);
-      assert(napi_set_named_property(env, js_enroll_item, "identity", js_json_salvo) == napi_ok);
-    } else {
-      assert(napi_set_named_property(env, js_enroll_item, "identity", undefined) == napi_ok);
+      napi_create_string_utf8(env, (const char*)item->json_salvo, NAPI_AUTO_LENGTH, &js_json_salvo);
+      napi_set_named_property(env, js_enroll_item, "identity", js_json_salvo);
     }
 
     // obj.status = status
-    assert(napi_create_int64(env, (int64_t)item->status, &js_status) == napi_ok);
-    assert(napi_set_named_property(env, js_enroll_item, "status", js_status) == napi_ok);
+    napi_create_int64(env, (int64_t)item->status, &js_status);
+    napi_set_named_property(env, js_enroll_item, "status", js_status);
 
     // obj.err = err
     if (NULL != item->err) {
-      assert(napi_create_string_utf8(env, (const char*)item->err, NAPI_AUTO_LENGTH, &js_err) == napi_ok);
-      assert(napi_set_named_property(env, js_enroll_item, "err", js_err) == napi_ok);
-    } else {
-      assert(napi_set_named_property(env, js_enroll_item, "err", undefined) == napi_ok);
+      napi_create_string_utf8(env, (const char*)item->err, NAPI_AUTO_LENGTH, &js_err);
+      napi_set_named_property(env, js_enroll_item, "err", js_err);
     }
 
 
-    // Call the JavaScript function and pass it the WriteItem
-    assert(
-      napi_call_function(
-        env,
-        undefined,
-        js_cb,
-        1,
-        &js_enroll_item,
-        NULL) == napi_ok);
+    // Call the JavaScript function and pass it the EnrollItem
+    napi_value global;
+    status = napi_get_global(env, &global);
+
+    status = napi_call_function(
+      env,
+      global,
+      js_cb,
+      1,
+      &js_enroll_item,
+      NULL
+    );
+
+    if (status != napi_ok) {
+      napi_throw_error(env, "EINVAL", "failure to invoke JS callback");
+    }
 
   }
 }
@@ -110,11 +106,12 @@ static void CallJs_on_enroll(napi_env env, napi_value js_cb, void* context, void
 /**
  * 
  */
-void on_ziti_enroll(const ziti_config *cfg, int status, const char *err, void *ctx) {
+void on_ziti_enroll(ziti_config *cfg, int status, char *err, void *ctx) {
+  napi_status nstatus;
 
   ZITI_NODEJS_LOG(DEBUG, "\nstatus: %d, \nerr: %s,\nctx: %p", status, err, ctx);
 
-  AddonData* addon_data = (AddonData*)ctx;
+  EnrollAddonData* addon_data = (EnrollAddonData*)ctx;
 
   EnrollItem* item = memset(malloc(sizeof(*item)), 0, sizeof(*item));
 
@@ -137,23 +134,18 @@ void on_ziti_enroll(const ziti_config *cfg, int status, const char *err, void *c
   // Initiate the call into the JavaScript callback. 
   // The call into JavaScript will not have happened 
   // when this function returns, but it will be queued.
-  assert(
-    napi_call_threadsafe_function(
-      addon_data->tsfn,
+  nstatus = napi_call_threadsafe_function(
+      addon_data->tsfn_on_enroll,
       item,
-      napi_tsfn_blocking) == napi_ok);
-}
-
+      napi_tsfn_blocking);
+  if (nstatus != napi_ok) {
+    ZITI_NODEJS_LOG(ERROR, "Unable to napi_call_threadsafe_function");
+  }
 
+}
 
-void child_thread(void *data){
-    uv_loop_t *thread_loop = (uv_loop_t *) data;
 
-    //Start this loop
-    uv_run(thread_loop, UV_RUN_DEFAULT);
-}
 
-static void consumer_notify(uv_async_t *handle, int status) { }
 
 /**
  * 
@@ -161,6 +153,9 @@ static void consumer_notify(uv_async_t *handle, int status) { }
 napi_value _ziti_enroll(napi_env env, const napi_callback_info info) {
   napi_status status;
   napi_value jsRetval;
+  napi_valuetype js_cb_type;
+
+  ziti_log_init(thread_loop, ZITI_LOG_DEFAULT_LEVEL, NULL);
 
   ZITI_NODEJS_LOG(DEBUG, "entered");
 
@@ -172,6 +167,7 @@ napi_value _ziti_enroll(napi_env env, const napi_callback_info info) {
   }
 
   if (argc < 2) {
+    ZITI_NODEJS_LOG(DEBUG, "Too few arguments");
     napi_throw_error(env, "EINVAL", "Too few arguments");
     return NULL;
   }
@@ -182,9 +178,16 @@ napi_value _ziti_enroll(napi_env env, const napi_callback_info info) {
   status = napi_get_value_string_utf8(env, args[0], JWTFileName, 256, &result);
 
   // Obtain ptr to JS callback function
-  napi_value js_cb = args[1];
+  // napi_value js_cb = args[1];
+  napi_typeof(env, args[1], &js_cb_type);
+  if (js_cb_type != napi_function) {
+    ZITI_NODEJS_LOG(DEBUG, "args[1] is NOT a napi_function");
+  } else {
+    ZITI_NODEJS_LOG(DEBUG, "args[1] IS a napi_function");
+  }
   napi_value work_name;
-  AddonData* addon_data = malloc(sizeof(AddonData));
+
+  EnrollAddonData* addon_data = memset(malloc(sizeof(*addon_data)), 0, sizeof(*addon_data));
 
   // Create a string to describe this asynchronous operation.
   assert(napi_create_string_utf8(
@@ -195,10 +198,9 @@ napi_value _ziti_enroll(napi_env env, const napi_callback_info info) {
 
   // Convert the callback retrieved from JavaScript into a thread-safe function (tsfn) 
   // which we can call from a worker thread.
-  assert(
-    napi_create_threadsafe_function(
+  status = napi_create_threadsafe_function(
       env,
-      js_cb,
+      args[1],
       NULL,
       work_name,
       0,
@@ -207,12 +209,11 @@ napi_value _ziti_enroll(napi_env env, const napi_callback_info info) {
       NULL,
       NULL,
       CallJs_on_enroll,
-      &(addon_data->tsfn)) == napi_ok);
+      &(addon_data->tsfn_on_enroll));
+  if (status != napi_ok) {
+    napi_throw_error(env, NULL, "Unable to napi_create_threadsafe_function");
+  }
 
-  // Create and set up the consumer thread
-  thread_loop = uv_loop_new();
-  uv_async_init(thread_loop, &async, (uv_async_cb)consumer_notify);
-  uv_thread_create(&thread, (uv_thread_cb)child_thread, thread_loop);
 
   // Initiate the enrollment
   ziti_enroll_opts opts = {0};

package/tests/enroll-test.js

@@ -1,24 +1,25 @@
+const bindings = require('bindings')('ziti_sdk_nodejs')
 
-var binary = require('@mapbox/node-pre-gyp');
-var path = require('path')
-var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json')), {debug: true});
-// var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json')));
-var ziti = require(binding_path);
+const result = bindings.ziti_sdk_version();
+const binary = require('@mapbox/node-pre-gyp');
+const path = require('path')
+const binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json')));
+const ziti = require(binding_path);
+require('assert').notEqual(result,"");
 
 console.log("using ziti version: " + ziti.ziti_sdk_version())
-// require('assert').equal(ziti.ziti_sdk_version(),"ziti");
 
 
 
-const ziti_enroll = async (jwt_path) => {
+const ziti_Enroll = async (jwt_path) => {
+    console.log("JS ziti_Enroll() entered ")
     return new Promise((resolve, reject) => {
-        let rc = ziti.ziti_enroll(jwt_path, (data) => {
-            if (data.identity) {
-                resolve(data);
-            } else {
-                reject(data);
+        let rc = ziti.ziti_enroll(
+            jwt_path,
+            (data) => {
+              return resolve(data);
             }
-        });
+          );
     });
 };
 
@@ -27,8 +28,8 @@ const ziti_enroll = async (jwt_path) => {
 
     let jwt_path = process.argv[2];
 
-    let data = await ziti_enroll(jwt_path).catch((data) => {
-        console.log('ziti_enroll failed with error code (%o/%s)', data.status, data.err);
+    let data = await ziti_Enroll(jwt_path).catch((data) => {
+        console.log('JS ziti_enroll failed with error code (%o/%s)', data.status, data.err);
     });
 
     if (data && data.identity) {

package/vcpkg/.github/workflows/stale.yml

@@ -7,14 +7,14 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v8
         with:
           stale-issue-message: 'This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 28 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment.'
           any-of-labels: 'category:question,requires:repro,requires:more-information'
           days-before-issue-stale: 28
           days-before-pr-stale: -1
           days-before-close: 14
-      - uses: actions/stale@v6
+      - uses: actions/stale@v8
         with:
           stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 60 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment."
           any-of-labels: 'category:new-port'
@@ -22,10 +22,11 @@ jobs:
           days-before-issue-stale: 60
           days-before-pr-stale: -1
           days-before-close: 14
-      - uses: actions/stale@v6
+      - uses: actions/stale@v8
         with:
           stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 180 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment."
           exempt-issue-labels: 'no-stale,category:new-port,category:question,requires:repro,requires:more-information'
           days-before-issue-stale: 180
           days-before-pr-stale: -1
           days-before-close: 14
+          operations-per-run: 50

package/vcpkg/ports/7zip/CMakeLists.txt

@@ -401,6 +401,7 @@ target_compile_definitions(7zip
 target_include_directories(7zip
     INTERFACE
         $<INSTALL_INTERFACE:include>/7zip/CPP
+        $<INSTALL_INTERFACE:include>/7zip/C
 )
 
 install(

package/vcpkg/ports/7zip/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "7zip",
   "version-string": "23.01",
+  "port-version": 1,
   "description": "Library for archiving file with a high compression ratio.",
   "homepage": "https://www.7-zip.org",
   "license": "LGPL-2.1-or-later",

package/vcpkg/ports/ace/portfile.cmake

@@ -8,14 +8,14 @@ if("tao" IN_LIST FEATURES)
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE%2BTAO-src-${VERSION}.tar.gz"
         FILENAME "ACE-TAO-${VERSION}.tar.gz"
-        SHA512 ab1317e626f1b312cd72e6c10f7b51088e5de4db8fa3bca013a98b07aad4edfb5e1f42a4f58c970f968417852b305f298a34e0fde053a1f52754ebe3761f314c
+        SHA512 afa26e0579ebbac5db82df80a4ce6c2350d4665043bb549688dce4db08b3b1a7c6b072544d651b90bd521ae477de069f280ab8d52fe957143d1f8a7cbd23eb29
     )
 else()
     # Don't change to vcpkg_from_github! This points to a release and not an archive
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE-src-${VERSION}.tar.gz"
         FILENAME "ACE-src-${VERSION}.tar.gz"
-        SHA512 1605fdf7a78bfce090bc8b14137f9aafd23019712672f6cd041284656ce2bae0baff954124166aeb16a0565887e1d87b2d10dc2ec5981c4e38fc8d0b39a97934
+        SHA512 b08c8cf98b622248cfbf167ca91c8314284c84c4dcb1c48fedb9180be2bc354c1d647372eb046e75d426ac4f2ad0318a8dd9e3f233d36bc30f744d5f9e37c5ec
     )
 endif()
 
@@ -294,6 +294,7 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
   get_filename_component(WORKING_DIR "${WORKSPACE}" DIRECTORY)
   set(ENV{PWD} "${WORKING_DIR}")
 
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
   message(STATUS "Building ${TARGET_TRIPLET}-dbg")
   vcpkg_execute_build_process(
     COMMAND make ${_ace_makefile_macros} "debug=1" "optimize=0" "-j${VCPKG_CONCURRENCY}"
@@ -344,7 +345,9 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
       LOGNAME realclean-xml-${TARGET_TRIPLET}-dbg
     )
   endif()
-
+endif()
+  
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
   message(STATUS "Building ${TARGET_TRIPLET}-rel")
   vcpkg_execute_build_process(
     COMMAND make ${_ace_makefile_macros} "-j${VCPKG_CONCURRENCY}"
@@ -377,6 +380,8 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
     file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
   endif()
   message(STATUS "Packaging ${TARGET_TRIPLET}-rel done")
+endif()
+  
   # Restore `PWD` environment variable
   set($ENV{PWD} _prev_env)
 

package/vcpkg/ports/ace/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "ace",
-  "version": "7.1.1",
-  "port-version": 2,
+  "version": "7.1.2",
+  "port-version": 1,
   "maintainers": "Johnny Willemsen <jwillemsen@remedy.nl>",
   "description": "The ADAPTIVE Communication Environment",
   "homepage": "https://github.com/DOCGroup/ACE_TAO",

package/vcpkg/ports/ada-url/no-cpm.patch

@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b206edb6..1db4099d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,7 +30,6 @@ option(ADA_TESTING "Build tests" ${BUILD_TESTING})
+ # errors due to CPM, so this is here to support disabling all the testing
+ # and tooling for ada if one only wishes to use the ada library.
+ if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS)
+-  include(cmake/CPM.cmake)
+   # CPM requires git as an implicit dependency
+   find_package(Git QUIET)
+   # We use googletest in the tests
+diff --git a/tools/cli/CMakeLists.txt b/tools/cli/CMakeLists.txt
+index ff57220b..a6d90f29 100644
+--- a/tools/cli/CMakeLists.txt
++++ b/tools/cli/CMakeLists.txt
+@@ -8,12 +8,8 @@ if(MSVC AND BUILD_SHARED_LIBS)
+         "$<TARGET_FILE:ada>"      # <--this is in-file
+         "$<TARGET_FILE_DIR:adaparse>")                 # <--this is out-file path
+ endif()
+-CPMAddPackage("gh:fmtlib/fmt#7.1.3")
+-CPMAddPackage(
+-  GITHUB_REPOSITORY jarro2783/cxxopts
+-  VERSION 3.1.1
+-  OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES"
+-)
++find_package(fmt CONFIG REQUIRED)
++find_package(cxxopts CONFIG REQUIRED)
+ target_link_libraries(adaparse PRIVATE cxxopts::cxxopts fmt::fmt)
+ 
+ if(MSVC OR MINGW)

package/vcpkg/ports/ada-url/portfile.cmake

@@ -2,8 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ada-url/ada
     REF "v${VERSION}"
-    SHA512 bd9af16dee99a2b3f43e823b9ae6f8893741172d63ffe38337a4b3eab632167241b95df56d4220bc3240a3593e751df6a562e52e31b73e0ba99d41f5bf9922d5
+    SHA512 1814365f98cc85e97fe135a840241c66ddd8a9d6d10f0be548f72bc22b840673ea30291633e4d90e2023b99b59533fa7c77eab65ed41bf9c2bf79fd261cfeba0
     HEAD_REF main
+    PATCHES
+        no-cpm.patch
 )
 
 vcpkg_check_features(
@@ -14,11 +16,13 @@ vcpkg_check_features(
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DADA_BENCHMARKS=OFF
         -DBUILD_TESTING=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
         ${FEATURE_OPTIONS}
+    OPTIONS_DEBUG
+        -DADA_TOOLS=OFF
 )
 
 vcpkg_cmake_install()

package/vcpkg/ports/ada-url/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "ada-url",
-  "version": "2.6.8",
+  "version": "2.7.4",
   "description": "WHATWG-compliant and fast URL parser written in modern C++",
   "homepage": "https://ada-url.com/",
   "license": "MIT",
@@ -17,7 +17,11 @@
   "features": {
     "tools": {
       "description": "Build CLI tools (adaparse)",
-      "supports": "!uwp"
+      "supports": "!uwp",
+      "dependencies": [
+        "cxxopts",
+        "fmt"
+      ]
     }
   }
 }

package/vcpkg/ports/ade/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO opencv/ade
     REF "v${VERSION}"
-    SHA512 5ee9a13b8bff062fc742d117dc0315bb5d6ff2c747ce5c7df0c233870506ec5f2afbd2852fc3d6bb28b86426013fd7fdf0a1e49164f7cd644e78443904dc8711
+    SHA512 46f2feee28d732a6940a5a95944f3283bde1b8c8e05466a8ca1c576623c54d1bed875ce2b24a941111d8976cb0c6ba5a4ac8408f042f5765debf1badf7d43348
     HEAD_REF master
 )
 

package/vcpkg/ports/ade/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "ade",
-  "version-string": "0.1.2c",
+  "version-string": "0.1.2d",
   "description": "ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution.",
   "dependencies": [
     {

package/vcpkg/ports/allegro5/portfile.cmake

@@ -1,12 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO liballeg/allegro5
-    REF 5.2.6.0
-    SHA512 d590c1a00d1b314c6946e0f6ad3e3a8b6e6309bada2ec38857186f817147ac99dae8a1c4412abe701af88da5dca3dd8f989a1da66630192643d3c08c0146b603
+    REF ${VERSION}
+    SHA512 2e7833b725718fdf11f1cd5999dc9fafca4b34adda15d3d8cb551c0eb00368d2e1c08b15f8beb766e2f208ffdc3b5e33175e969c7333ad6dc92f269522ac3d32
     HEAD_REF master
     PATCHES
         do-not-copy-pdbs-to-lib.patch
-        export-targets.patch
         msvc-arm64-atomic.patch
 )
 
@@ -64,9 +63,9 @@ vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-allegro5 CONFIG_PATH share/unofficial-allegro5)
+vcpkg_cmake_config_fixup(PACKAGE_NAME allegro CONFIG_PATH lib/cmake/allegro)
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")

package/vcpkg/ports/allegro5/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "allegro5",
-  "version": "5.2.6.0",
-  "port-version": 4,
+  "version": "5.2.9.0",
   "description": "Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like.",
   "homepage": "https://github.com/liballeg/allegro5",
   "license": "BSD-3-Clause AND Zlib",

package/vcpkg/ports/alpaka/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO alpaka-group/alpaka
-    REF 0.9.0
-    SHA512 c079c0101a1e1c0d244c074e19fcefa6c15751fbb6be072c6f245e515dece8700a40fd101b2b0ba5f9760f4545bf23e1917ea9804accbe16a45039f8b0ed8a01
+    REF 1.0.0
+    SHA512 42e326fa07a741761c334e43ed03e9b950a580ffa86c005f20f9e0887bc648c189b5937ce1a9c08de6a8f295375d771077a709d5adfa14bea46af622985a196d
     HEAD_REF develop
 )
 set(VCPKG_BUILD_TYPE release)

package/vcpkg/ports/alpaka/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "alpaka",
-  "version": "0.9.0",
-  "port-version": 1,
+  "version": "1.0.0",
   "description": "The alpaka library is a header-only abstraction library for accelerator development",
   "homepage": "https://github.com/alpaka-group/alpaka",
   "license": "MPL-2.0",