From ac4359eedbbffddb412a24e18fa51f6902b34feb Mon Sep 17 00:00:00 2001 From: toge Date: Sat, 1 Nov 2025 23:29:39 +0900 Subject: [PATCH 1/2] [licensepp] update to 1.2.0 --- ports/licensepp/0001-use-old-pem-pack.patch | 29 ------------------- .../0002-fix-compilation-macos.patch | 26 ----------------- ports/licensepp/add-stdint.diff | 15 +++++----- ports/licensepp/devendoring.patch | 22 ++++++++++++++ ports/licensepp/portfile.cmake | 7 ++--- ports/licensepp/remove-werror.diff | 8 ++--- ports/licensepp/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/l-/licensepp.json | 5 ++++ 9 files changed, 45 insertions(+), 74 deletions(-) delete mode 100644 ports/licensepp/0001-use-old-pem-pack.patch delete mode 100644 ports/licensepp/0002-fix-compilation-macos.patch create mode 100644 ports/licensepp/devendoring.patch diff --git a/ports/licensepp/0001-use-old-pem-pack.patch b/ports/licensepp/0001-use-old-pem-pack.patch deleted file mode 100644 index 37656f61323433..00000000000000 --- a/ports/licensepp/0001-use-old-pem-pack.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d1b446c7a69344cb53be6692cd76186960a1428d Mon Sep 17 00:00:00 2001 -From: Nicole Mazzuca -Date: Wed, 23 Sep 2020 09:40:32 -0700 -Subject: [PATCH 1/2] use old pem pack - -In this commit: https://github.com/noloader/cryptopp-pem/commit/0cfa60820ec1d5e8ac4d77a0a8786ee43e9a2400 -the parameter orders have been changed. -But we cannot update pem-pack to this version or newer because it -wont compile with the current version of cryptopp in vcpkg. ---- - src/external/Ripe.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/external/Ripe.cc b/src/external/Ripe.cc -index 6ff9561..a1d1eec 100644 ---- a/src/external/Ripe.cc -+++ b/src/external/Ripe.cc -@@ -227,7 +227,7 @@ Ripe::KeyPair Ripe::generateRSAKeyPair(unsigned int length, const std::string& s - if (secret.empty()) { - PEM_Save(snk, privateKey); - } else { -- PEM_Save(snk, privateKey, rng, PRIVATE_RSA_ALGORITHM, secret.data(), secret.size()); -+ PEM_Save(snk, rng, privateKey, PRIVATE_RSA_ALGORITHM, secret.data(), secret.size()); - } - snk.MessageEnd(); - } --- -2.24.3 (Apple Git-128) - diff --git a/ports/licensepp/0002-fix-compilation-macos.patch b/ports/licensepp/0002-fix-compilation-macos.patch deleted file mode 100644 index 3bad0b9f38e46a..00000000000000 --- a/ports/licensepp/0002-fix-compilation-macos.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b0e09221f5f782e6dc2dedf197eba8064095edcd Mon Sep 17 00:00:00 2001 -From: Michael Migliore -Date: Thu, 6 Apr 2023 09:36:17 +0200 -Subject: [PATCH] Fix compilation on macOS - ---- - src/json-object.h | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/src/json-object.h b/src/json-object.h -index 712e9a0..9764514 100644 ---- a/src/json-object.h -+++ b/src/json-object.h -@@ -80,12 +80,6 @@ class JsonObject - return get(key, defaultValue); - } - -- inline const char* getCString(const std::string& key, -- const char* defaultValue = "") const -- { -- return getString(key, defaultValue).c_str(); -- } -- - inline bool hasKey(const std::string& key) const - { - return m_root.count(key) > 0; diff --git a/ports/licensepp/add-stdint.diff b/ports/licensepp/add-stdint.diff index cadc3e2e43ae63..6db3e7f78e2f3b 100644 --- a/ports/licensepp/add-stdint.diff +++ b/ports/licensepp/add-stdint.diff @@ -1,11 +1,12 @@ -diff --git a/license++/license.h b/license++/license.h -index 677529e..0c50876 100644 ---- a/license++/license.h -+++ b/license++/license.h -@@ -11,6 +11,7 @@ - #ifndef License_h - #define License_h +diff --git a/include/license++/license.h b/include/license++/license.h +index eab392d..67b405e 100644 +--- a/include/license++/license.h ++++ b/include/license++/license.h +@@ -9,7 +9,7 @@ + #ifndef LICENSEPP_License_h + #define LICENSEPP_License_h +- +#include #include diff --git a/ports/licensepp/devendoring.patch b/ports/licensepp/devendoring.patch new file mode 100644 index 00000000000000..095186b7fa7e2c --- /dev/null +++ b/ports/licensepp/devendoring.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8581813..46e1565 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,7 +48,7 @@ include_directories (${CRYPTOPP_INCLUDE_DIRS}) + + # Ripe (static) + set(RIPE_USE_STATIC_LIBS OFF) +-find_package(Ripe REQUIRED) ++find_package(unofficial-ripe REQUIRED) + + include_directories (${EXTERNAL_INCLUDE_DIR}) + +@@ -87,7 +87,7 @@ target_include_directories (licensepp-lib PUBLIC + + target_link_libraries (licensepp-lib + ${CRYPTOPP_LIBRARIES} +- ${RIPE_LIBRARY} ++ unofficial::ripe::ripe + ) + + set_target_properties (licensepp-lib PROPERTIES OUTPUT_NAME "licensepp") diff --git a/ports/licensepp/portfile.cmake b/ports/licensepp/portfile.cmake index 9da5ce06275c93..30608f91363a9a 100644 --- a/ports/licensepp/portfile.cmake +++ b/ports/licensepp/portfile.cmake @@ -3,14 +3,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO amrayn/licensepp - REF e9501da1470a3bd29254975577d806612a3d3e3c - SHA512 6f70904d1214036af3891dc54f71ea2052acd8f60c277dbd2a5f3190ce4610771f36108d4d5a123c0e7312aded410d652460018d74586fc4f41b05fabb6100bd + REF v${VERSION} + SHA512 a27b8e669cff2ce06dfb0b2b6f961406e4c488f4a55fc086754274c719632d53942d88192010b6af8cc46784aee6a7b5c40780792e9d6f0d51ec3da76576f259 HEAD_REF master PATCHES - 0001-use-old-pem-pack.patch - 0002-fix-compilation-macos.patch add-stdint.diff remove-werror.diff + devendoring.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindCryptoPP.cmake" DESTINATION "${SOURCE_PATH}/cmake") diff --git a/ports/licensepp/remove-werror.diff b/ports/licensepp/remove-werror.diff index e5fde57184f88c..ddbf3bd20f174f 100644 --- a/ports/licensepp/remove-werror.diff +++ b/ports/licensepp/remove-werror.diff @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b6cce99..eae797a 100644 +index 8581813..52b147f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -36,7 +36,7 @@ if (APPLE) +@@ -37,7 +37,7 @@ if (APPLE) endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall -Werror") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O3 -Wall -Werror -Wno-return-stack-address") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O3 -Wall -Wno-return-stack-address") endif() # Check for cryptopp (static) diff --git a/ports/licensepp/vcpkg.json b/ports/licensepp/vcpkg.json index bcc2f49a6a5894..da49c934ea4225 100644 --- a/ports/licensepp/vcpkg.json +++ b/ports/licensepp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "licensepp", - "version-date": "2020-11-24", - "port-version": 1, + "version": "1.2.0", "description": "Cross platform software licensing library", "homepage": "https://github.com/amrayn/licensepp", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 032fe40e1e6b38..ad8536963fee3e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5873,8 +5873,8 @@ "port-version": 0 }, "licensepp": { - "baseline": "2020-11-24", - "port-version": 1 + "baseline": "1.2.0", + "port-version": 0 }, "lief": { "baseline": "0.17.1", diff --git a/versions/l-/licensepp.json b/versions/l-/licensepp.json index 56c814ca68bb05..089bb81517ed24 100644 --- a/versions/l-/licensepp.json +++ b/versions/l-/licensepp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46d4a0425e13230391e8af964b8a37f4f459320a", + "version": "1.2.0", + "port-version": 0 + }, { "git-tree": "7e3b09b2c84eae8d6c99e8b92b39be6022210f0a", "version-date": "2020-11-24", From 48fec602c6665f37d34b5e37904139e97c8a5c80 Mon Sep 17 00:00:00 2001 From: toge Date: Sat, 1 Nov 2025 23:41:00 +0900 Subject: [PATCH 2/2] add abumq-ripe --- ports/licensepp/vcpkg.json | 1 + versions/l-/licensepp.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/licensepp/vcpkg.json b/ports/licensepp/vcpkg.json index da49c934ea4225..b9e212f51fb4f1 100644 --- a/ports/licensepp/vcpkg.json +++ b/ports/licensepp/vcpkg.json @@ -5,6 +5,7 @@ "homepage": "https://github.com/amrayn/licensepp", "supports": "!uwp", "dependencies": [ + "abumq-ripe", { "name": "cryptopp", "features": [ diff --git a/versions/l-/licensepp.json b/versions/l-/licensepp.json index 089bb81517ed24..05f28cd46dfef3 100644 --- a/versions/l-/licensepp.json +++ b/versions/l-/licensepp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "46d4a0425e13230391e8af964b8a37f4f459320a", + "git-tree": "9c3329fd4912f6aa0dbc29ef6b45a041d03f3384", "version": "1.2.0", "port-version": 0 },