From 3abc79303f3cb7092de4c37f89e7ba3884c818c2 Mon Sep 17 00:00:00 2001 From: toge Date: Sat, 8 Aug 2026 01:47:31 +0900 Subject: [PATCH 1/3] [log4cplus] update to 2.2.0.1 --- ports/log4cplus/portfile.cmake | 6 ++++-- ports/log4cplus/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/log4cplus.json | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake index be37e7da895db2..7a8dc61e1fdbf5 100644 --- a/ports/log4cplus/portfile.cmake +++ b/ports/log4cplus/portfile.cmake @@ -1,8 +1,10 @@ +string(REPLACE "." "_" VERSION_UNDERSCORE "${VERSION}") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO log4cplus/log4cplus - REF REL_2_1_2 - SHA512 37d37107f327cf343784d68ea4a18ee7eaa0a943e56075ebd14318b8905954649501f0228c6086058d89f97a332e73cabfc64ea7290ae79578fd583590661b94 + REF REL_${VERSION_UNDERSCORE} + SHA512 85b3721e77c54036e7b33537dd80599cd1f1a0bb2669c31084e1732baa73010eb42e61cd553a839c0455f9a7859289d6585279213f243fadf184a33569d97283 HEAD_REF master ) diff --git a/ports/log4cplus/vcpkg.json b/ports/log4cplus/vcpkg.json index a2029c7f262b02..9550c89699b617 100644 --- a/ports/log4cplus/vcpkg.json +++ b/ports/log4cplus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "log4cplus", - "version": "2.1.2", + "version": "2.2.0.1", "description": "A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration", "homepage": "https://github.com/log4cplus/log4cplus", "license": "Apache-2.0 AND BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index c15afb30b93c8f..e271c455c0665c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6233,7 +6233,7 @@ "port-version": 1 }, "log4cplus": { - "baseline": "2.1.2", + "baseline": "2.2.0.1", "port-version": 0 }, "log4cpp-log4cpp": { diff --git a/versions/l-/log4cplus.json b/versions/l-/log4cplus.json index ccd5d11b2c190f..d4ec4f6f20e050 100644 --- a/versions/l-/log4cplus.json +++ b/versions/l-/log4cplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eded394ba48fe771c1f92925b7fe933a72af8ab1", + "version": "2.2.0.1", + "port-version": 0 + }, { "git-tree": "4a25677e8f558eefc3ec3c0e95fed4140b009326", "version": "2.1.2", From ef7b8c94a91fc658e75980636904f5f946637ba0 Mon Sep 17 00:00:00 2001 From: toge Date: Sat, 8 Aug 2026 03:32:24 +0900 Subject: [PATCH 2/3] [apsi] fix log4cplus including order --- ports/apsi/fix-log4cplus-byte-ambiguity.patch | 28 +++++++++++++++++++ ports/apsi/portfile.cmake | 3 +- ports/apsi/vcpkg.json | 2 +- versions/a-/apsi.json | 5 ++++ versions/baseline.json | 2 +- 5 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 ports/apsi/fix-log4cplus-byte-ambiguity.patch diff --git a/ports/apsi/fix-log4cplus-byte-ambiguity.patch b/ports/apsi/fix-log4cplus-byte-ambiguity.patch new file mode 100644 index 00000000000000..ba95b221d6a3ff --- /dev/null +++ b/ports/apsi/fix-log4cplus-byte-ambiguity.patch @@ -0,0 +1,28 @@ +--- a/common/apsi/log.cpp 2026-08-08 03:05:11.906696658 +0900 ++++ b/common/apsi/log.cpp 2026-08-08 03:05:26.372972353 +0900 +@@ -13,6 +13,13 @@ + #include "apsi/config.h" + #include "apsi/log.h" + ++#ifdef APSI_USE_LOG4CPLUS ++#include "log4cplus/consoleappender.h" ++#include "log4cplus/fileappender.h" ++#include "log4cplus/logger.h" ++#include "log4cplus/nullappender.h" ++#endif ++ + using namespace std; + + namespace apsi { +@@ -86,11 +93,6 @@ + + #ifdef APSI_USE_LOG4CPLUS + +-#include "log4cplus/consoleappender.h" +-#include "log4cplus/fileappender.h" +-#include "log4cplus/logger.h" +-#include "log4cplus/nullappender.h" +- + using namespace log4cplus; + + namespace apsi { diff --git a/ports/apsi/portfile.cmake b/ports/apsi/portfile.cmake index e587ce6476dbe7..612c0b8119fd10 100644 --- a/ports/apsi/portfile.cmake +++ b/ports/apsi/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( fix-find-seal.patch fix-c2398.patch fix-find-kuku.patch + fix-log4cplus-byte-ambiguity.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -25,7 +26,7 @@ if (VCPKG_CROSSCOMPILING) endif() if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(CROSSCOMP_OPTIONS -DAPSI_FOURQ_AMD64_EXITCODE=0 -DHAVE_AVX_EXTENSIONS_EXITCODE=0 -DHAVE_AVX2_EXTENSIONS_EXITCODE=1) - endif() + endif() endif() vcpkg_cmake_configure( diff --git a/ports/apsi/vcpkg.json b/ports/apsi/vcpkg.json index 384745cb671226..babbc344cd663b 100644 --- a/ports/apsi/vcpkg.json +++ b/ports/apsi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "apsi", "version-semver": "0.11.0", - "port-version": 2, + "port-version": 3, "description": "APSI is a research library for asymmetric private set intersection.", "homepage": "https://github.com/microsoft/APSI", "license": "MIT", diff --git a/versions/a-/apsi.json b/versions/a-/apsi.json index d2cbe293899e25..1edabac7500e3b 100644 --- a/versions/a-/apsi.json +++ b/versions/a-/apsi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e3bb829db99d54da837d156570254a923802f45", + "version-semver": "0.11.0", + "port-version": 3 + }, { "git-tree": "2b55029ec6a1e04c5f69c534871c998f2c63d066", "version-semver": "0.11.0", diff --git a/versions/baseline.json b/versions/baseline.json index e271c455c0665c..5ddde4bfceba86 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -214,7 +214,7 @@ }, "apsi": { "baseline": "0.11.0", - "port-version": 2 + "port-version": 3 }, "aravis": { "baseline": "0.8.36", From e5fbb2fac8451ec7b9af210890be3f4c7c19e450 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 7 Aug 2026 22:16:42 -0700 Subject: [PATCH 3/3] [log4cplus,apsi] fix package metadata and CMake export Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- ports/apsi/fix-jsoncpp-target.patch | 13 +++++++++++++ ports/apsi/portfile.cmake | 2 ++ ports/log4cplus/vcpkg.json | 2 +- versions/a-/apsi.json | 2 +- versions/l-/log4cplus.json | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 ports/apsi/fix-jsoncpp-target.patch diff --git a/ports/apsi/fix-jsoncpp-target.patch b/ports/apsi/fix-jsoncpp-target.patch new file mode 100644 index 00000000000000..c88604a697389d --- /dev/null +++ b/ports/apsi/fix-jsoncpp-target.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 81bf76f..13a8d09 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -265,7 +265,7 @@ target_link_libraries(apsi + PUBLIC SEAL::seal + PUBLIC Kuku::kuku + PUBLIC flatbuffers::flatbuffers +- PUBLIC jsoncpp_static) ++ PUBLIC JsonCpp::JsonCpp) + if(APSI_USE_LOG4CPLUS) + target_link_libraries(apsi PUBLIC log4cplus::log4cplus) + endif() diff --git a/ports/apsi/portfile.cmake b/ports/apsi/portfile.cmake index 612c0b8119fd10..9b0e0253b6c905 100644 --- a/ports/apsi/portfile.cmake +++ b/ports/apsi/portfile.cmake @@ -11,6 +11,8 @@ vcpkg_from_github( fix-c2398.patch fix-find-kuku.patch fix-log4cplus-byte-ambiguity.patch + # https://github.com/microsoft/APSI/issues/84 + fix-jsoncpp-target.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/log4cplus/vcpkg.json b/ports/log4cplus/vcpkg.json index 9550c89699b617..0e02b4793e0899 100644 --- a/ports/log4cplus/vcpkg.json +++ b/ports/log4cplus/vcpkg.json @@ -3,7 +3,7 @@ "version": "2.2.0.1", "description": "A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration", "homepage": "https://github.com/log4cplus/log4cplus", - "license": "Apache-2.0 AND BSD-2-Clause", + "license": "Apache-2.0 AND BSD-2-Clause AND Zlib", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/a-/apsi.json b/versions/a-/apsi.json index 1edabac7500e3b..c91a70b77848ab 100644 --- a/versions/a-/apsi.json +++ b/versions/a-/apsi.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4e3bb829db99d54da837d156570254a923802f45", + "git-tree": "575057c1d1eb4bf8ba68bdd8eb774a857eac66b8", "version-semver": "0.11.0", "port-version": 3 }, diff --git a/versions/l-/log4cplus.json b/versions/l-/log4cplus.json index d4ec4f6f20e050..215a7a27d3458a 100644 --- a/versions/l-/log4cplus.json +++ b/versions/l-/log4cplus.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "eded394ba48fe771c1f92925b7fe933a72af8ab1", + "git-tree": "e43000ec0e535d92ca1a7e9759a434bd47633844", "version": "2.2.0.1", "port-version": 0 },