early-access version 2853
This commit is contained in:
29
externals/vcpkg/ports/licensepp/0001-use-old-pem-pack.patch
vendored
Executable file
29
externals/vcpkg/ports/licensepp/0001-use-old-pem-pack.patch
vendored
Executable file
@@ -0,0 +1,29 @@
|
||||
From d1b446c7a69344cb53be6692cd76186960a1428d Mon Sep 17 00:00:00 2001
|
||||
From: Nicole Mazzuca <mazzucan@outlook.com>
|
||||
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)
|
||||
|
||||
38
externals/vcpkg/ports/licensepp/0002-fix-cmake.patch
vendored
Executable file
38
externals/vcpkg/ports/licensepp/0002-fix-cmake.patch
vendored
Executable file
@@ -0,0 +1,38 @@
|
||||
From 5a7cbbe8423ee3daf533bcc1fefa7d1f1315634c Mon Sep 17 00:00:00 2001
|
||||
From: Nicole Mazzuca <mazzucan@outlook.com>
|
||||
Date: Wed, 23 Sep 2020 09:43:37 -0700
|
||||
Subject: [PATCH 2/2] fix cmake
|
||||
|
||||
Remove this patch if https://github.com/amrayn/licensepp/pull/33 is merged
|
||||
---
|
||||
CMakeLists.txt | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b2c39d1..0d49632 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -35,10 +35,8 @@ if (APPLE)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-if(MSVC)
|
||||
- list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 ")
|
||||
-else()
|
||||
- list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 -Wall -Werror ")
|
||||
+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")
|
||||
endif()
|
||||
|
||||
# Check for cryptopp (static)
|
||||
@@ -73,6 +71,7 @@ endif()
|
||||
set_target_properties (licensepp-lib PROPERTIES
|
||||
VERSION ${LICENSEPP_SOVERSION}
|
||||
)
|
||||
+target_include_directories(licensepp-lib PUBLIC $<INSTALL_INTERFACE:include>)
|
||||
target_link_libraries (licensepp-lib
|
||||
${CRYPTOPP_LIBRARIES}
|
||||
)
|
||||
--
|
||||
2.24.3 (Apple Git-128)
|
||||
|
||||
27
externals/vcpkg/ports/licensepp/FindCryptoPP.cmake
vendored
Executable file
27
externals/vcpkg/ports/licensepp/FindCryptoPP.cmake
vendored
Executable file
@@ -0,0 +1,27 @@
|
||||
find_path(CRYPTOPP_INCLUDE_DIRS NAMES cryptopp/cryptlib.h)
|
||||
|
||||
get_filename_component(_prefix_path ${CRYPTOPP_INCLUDE_DIRS} PATH)
|
||||
|
||||
find_library(
|
||||
CRYPTOPP_LIBRARY_DEBUG
|
||||
NAMES cryptopp-static cryptopp
|
||||
PATHS ${_prefix_path}/debug/lib
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
find_library(
|
||||
CRYPTOPP_LIBRARY_RELEASE
|
||||
NAMES cryptopp-static cryptopp
|
||||
PATHS ${_prefix_path}/lib
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
|
||||
unset(_prefix_path)
|
||||
|
||||
include(SelectLibraryConfigurations)
|
||||
select_library_configurations(CRYPTOPP)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(
|
||||
CryptoPP
|
||||
REQUIRED_VARS CRYPTOPP_LIBRARIES CRYPTOPP_INCLUDE_DIRS
|
||||
)
|
||||
30
externals/vcpkg/ports/licensepp/portfile.cmake
vendored
Executable file
30
externals/vcpkg/ports/licensepp/portfile.cmake
vendored
Executable file
@@ -0,0 +1,30 @@
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO amrayn/licensepp
|
||||
REF 0b6d669c0b323be004f73d8c811d38158ce8c0c7
|
||||
SHA512 2161575815d8ff49110d7c2823662ba30d9f1ca2eb6be6dad1ee0807fb3fa9f28483839a133c9d380035254df7c452f8d6fa7f17fd4f29acd8b9bfbbda059291
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
0001-use-old-pem-pack.patch
|
||||
0002-fix-cmake.patch
|
||||
)
|
||||
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindCryptoPP.cmake DESTINATION ${SOURCE_PATH}/cmake)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS
|
||||
-Dtest=OFF
|
||||
-Dtravis=OFF
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}/cmake)
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
16
externals/vcpkg/ports/licensepp/vcpkg.json
vendored
Executable file
16
externals/vcpkg/ports/licensepp/vcpkg.json
vendored
Executable file
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"name": "licensepp",
|
||||
"version-date": "2020-05-19",
|
||||
"port-version": 3,
|
||||
"description": "Cross platform software licensing library",
|
||||
"homepage": "https://github.com/zuhd-org/licensepp",
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "cryptopp",
|
||||
"features": [
|
||||
"pem-pack"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user