aboutsummaryrefslogtreecommitdiff
path: root/ports/mmloader
diff options
context:
space:
mode:
authorBilly O'Neal <bion@microsoft.com>2020-12-22 14:52:58 -0800
committerGitHub <noreply@github.com>2020-12-22 14:52:58 -0800
commit229f537c9414da5a577484b467a1f7ab0f4d8f34 (patch)
treea4a61de332ac64af281acbc7fb6ba94a30cb6f35 /ports/mmloader
parentb23b7ea09f9c9aa95cb6e5042e3b1ab1bb8d710d (diff)
downloadvcpkg-229f537c9414da5a577484b467a1f7ab0f4d8f34.tar.gz
vcpkg-229f537c9414da5a577484b467a1f7ab0f4d8f34.zip
[opentracing] Update VMs 2020-12 (#15151)
* Add meson from https://github.com/microsoft/vcpkg/pull/12860/ * Add autoconf-archive from https://github.com/microsoft/vcpkg/pull/13081/ * Add kf5windowsystem libs from https://github.com/microsoft/vcpkg/pull/13467/ * Open the FTP and SFTP ports from https://github.com/microsoft/vcpkg/pull/14412/ * Add libxcb-util0-dev from https://github.com/microsoft/vcpkg/pull/14678/ * Add libasound2-dev from https://github.com/microsoft/vcpkg/pull/14774 * Remove no longer necessary apt-mark calls. * Update nasm on Linux. * Fix longstanding bug where Storage was publicly accessible and change to generate SAS token rather than File Share * Delete no longer necessary azure storage firewall rules. * Install the newer Windows SDK with the VS installer instead of manually. * Install the VS2015 and VS2017 compilers. * Update Powershell-Core to 7.1.0. * Update source of WDK. * Update pools. * [opentracing] Repair arm64-windows failures caused by mojibake in `expected.hpp` and errors in opentracing-cpp's lint for arm64 where it thinks exceptions are disabled when they are enabled. Fixes: C:\Dev\vcpkg\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\3rd_party\include\opentracing/expected/expected.hpp(1): warning C4828: The file contains a character starting at offset 0x4a77 that is illegal in the current source character set (codepage 65001). Fixes: D:\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\include\opentracing/tracer.h:223:5: error: cannot use 'try' with exceptions disabled [clang-diagnostic-error] try { ^ * [mmloader] Patch out overrides of CMAKE_C_FLAGS and CMAKE_CXX_FLAGS that inserted /WX. Note that this port sets /GS-, possibly because it may be for authoring shellcode. * Bump storage API version to 2020-04-08.
Diffstat (limited to 'ports/mmloader')
-rw-r--r--ports/mmloader/CONTROL8
-rw-r--r--ports/mmloader/fix_c_and_cxx_flags.patch32
-rw-r--r--ports/mmloader/portfile.cmake9
-rw-r--r--ports/mmloader/vcpkg.json13
4 files changed, 50 insertions, 12 deletions
diff --git a/ports/mmloader/CONTROL b/ports/mmloader/CONTROL
deleted file mode 100644
index e57556062..000000000
--- a/ports/mmloader/CONTROL
+++ /dev/null
@@ -1,8 +0,0 @@
-Source: mmloader
-Version: 2020-05-15
-Description: A library for loading dll module bypassing windows PE loader from memory (x86/x64)
-Homepage: http://tishion.github.io/mmLoader/
-Supports: (x86|x64)&windows&static
-
-Feature: shellcode
-Description: Generate mmLoader shell code headers
diff --git a/ports/mmloader/fix_c_and_cxx_flags.patch b/ports/mmloader/fix_c_and_cxx_flags.patch
new file mode 100644
index 000000000..501ce40cd
--- /dev/null
+++ b/ports/mmloader/fix_c_and_cxx_flags.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7a22b56..2ce1bd8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,24 +47,11 @@ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CONFIGURATION_TYPES Debug Release)
+
+ # Default compile flags
+-set(CMAKE_CXX_FLAGS
+- "/DWIN32 /D_WINDOWS /W3 /WX /GR /GS- /Gy /FAcs /Z7 /DEBUG"
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GS-"
+ CACHE STRING "default C++ compile flags" FORCE)
+-set(CMAKE_CXX_FLAGS_DEBUG
+- "/MTd /Ob0 /Od"
+- CACHE STRING "default C++ compile flags for debug build" FORCE)
+-set(CMAKE_CXX_FLAGS_RELEASE
+- "/MT /O2 /Ob2 /DNDEBUG"
+- CACHE STRING "default C++ compile flags for release build" FORCE)
+-set(CMAKE_C_FLAGS
+- "/DWIN32 /D_WINDOWS /W3 /WX /GR /GS- /Gy /FAcs /Z7 /DEBUG"
++set(CMAKE_C_FLAGS
++ "${CMAKE_C_FLAGS} /GS-"
+ CACHE STRING "default C++ compile flags" FORCE)
+-set(CMAKE_C_FLAGS_DEBUG
+- "/MTd /Ob0 /Od"
+- CACHE STRING "default C++ compile flags for debug build" FORCE)
+-set(CMAKE_C_FLAGS_RELEASE
+- "/MT /O2 /Ob2 /DNDEBUG"
+- CACHE STRING "default C++ compile flags for release build" FORCE)
+
+ message(STATUS "CMAKE_CXX_FLAGS=" ${CMAKE_CXX_FLAGS})
+ message(STATUS "CMAKE_CXX_FLAGS_DEBUG=" ${CMAKE_CXX_FLAGS_DEBUG})
diff --git a/ports/mmloader/portfile.cmake b/ports/mmloader/portfile.cmake
index 2a3411ce3..c1f168446 100644
--- a/ports/mmloader/portfile.cmake
+++ b/ports/mmloader/portfile.cmake
@@ -1,4 +1,3 @@
-
# fail early for unsupported triplets
vcpkg_fail_port_install(
MESSAGE "mmLoader supports only x86/x64-windows-static triplets"
@@ -15,6 +14,8 @@ vcpkg_from_github(
REF 1.0.0
SHA512 ceb2ab4b60d74209fa46d198cde6fd87a97d911abb875ac35383288a67828d0420bb38ff8d2f17dd4a3f46ba3abf554152d1246eeb05215258e8af64ac4a39de
HEAD_REF master
+ PATCHES
+ fix_c_and_cxx_flags.patch
)
# feature
@@ -30,13 +31,13 @@ vcpkg_configure_cmake(
)
# pre-clean
-file(REMOVE_RECURSE ${SOURCE_PATH}/output)
+file(REMOVE_RECURSE "${SOURCE_PATH}/output")
# build and install
vcpkg_install_cmake(DISABLE_PARALLEL)
# remove the debug/include directory
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
# collect license files
-file(INSTALL ${SOURCE_PATH}/License DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/License" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/mmloader/vcpkg.json b/ports/mmloader/vcpkg.json
new file mode 100644
index 000000000..a48ecb38b
--- /dev/null
+++ b/ports/mmloader/vcpkg.json
@@ -0,0 +1,13 @@
+{
+ "name": "mmloader",
+ "version-string": "2020-05-15",
+ "port-version": 1,
+ "description": "A library for loading dll module bypassing windows PE loader from memory (x86/x64)",
+ "homepage": "http://tishion.github.io/mmLoader/",
+ "supports": "(x86 | x64) & windows & static",
+ "features": {
+ "shellcode": {
+ "description": "Generate mmLoader shell code headers"
+ }
+ }
+}