From e7c3f0f9d9ac2083e70157d70d9d17c6fefcffb4 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 14 Jun 2022 15:41:05 +0200 Subject: [PATCH 1/8] [mmloader] Fix supports --- ports/mmloader/portfile.cmake | 17 +++++------------ ports/mmloader/vcpkg.json | 11 +++++++++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ports/mmloader/portfile.cmake b/ports/mmloader/portfile.cmake index 72d6534846e1df..1250881fac7b32 100644 --- a/ports/mmloader/portfile.cmake +++ b/ports/mmloader/portfile.cmake @@ -1,4 +1,5 @@ -# source +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tishion/mmLoader @@ -7,27 +8,19 @@ vcpkg_from_github( HEAD_REF master ) -# feature vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES shellcode BUILD_SHELLCODE_GEN ) -# config -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -# pre-clean -file(REMOVE_RECURSE "${SOURCE_PATH}/output") - -# build and install -vcpkg_install_cmake(DISABLE_PARALLEL) +vcpkg_cmake_install(DISABLE_PARALLEL) -# remove the debug/include directory file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# collect license files 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 index 30d49748ff60f7..83595a3894fd98 100644 --- a/ports/mmloader/vcpkg.json +++ b/ports/mmloader/vcpkg.json @@ -1,10 +1,17 @@ { "name": "mmloader", "version-date": "2021-12-13", - "port-version": 1, + "port-version": 2, "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", + "license": "MIT", + "supports": "(x86 | x64) & windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "features": { "shellcode": { "description": "Generate mmLoader shell code headers" From a5e855c6127a4fa8f0dda431f7410a33e4b86625 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 14 Jun 2022 15:42:24 +0200 Subject: [PATCH 2/8] Fix version db --- versions/baseline.json | 2 +- versions/m-/mmloader.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index c315072c5e6ed3..e054955b260188 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4601,7 +4601,7 @@ "port-version": 5 }, "mmloader": { - "baseline": "2021-12-13", + "baseline": "1.0.1", "port-version": 1 }, "mmx": { diff --git a/versions/m-/mmloader.json b/versions/m-/mmloader.json index a381834b387837..266b43714c29fa 100644 --- a/versions/m-/mmloader.json +++ b/versions/m-/mmloader.json @@ -2,12 +2,12 @@ "versions": [ { "git-tree": "104d16ae01f6ae753fde8406f75a01b9353aa1f2", - "version-date": "2021-12-13", + "version": "1.0.1", "port-version": 1 }, { "git-tree": "030c251ff729f1063950f5473cf393125f888ca2", - "version-date": "2021-12-13", + "version": "1.0.1", "port-version": 0 }, { From 4fd9e0913550c3635f8b9fa5185c7dfdbe8e2b29 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 14 Jun 2022 15:43:10 +0200 Subject: [PATCH 3/8] Fix version --- ports/mmloader/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mmloader/vcpkg.json b/ports/mmloader/vcpkg.json index 83595a3894fd98..a6e3a05404b235 100644 --- a/ports/mmloader/vcpkg.json +++ b/ports/mmloader/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mmloader", - "version-date": "2021-12-13", + "version": "1.0.1", "port-version": 2, "description": "A library for loading dll module bypassing windows PE loader from memory (x86/x64)", "homepage": "http://tishion.github.io/mmLoader/", From c1968cc311078925a51ff28ebc2a356d8bfb0b7a Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 14 Jun 2022 15:44:01 +0200 Subject: [PATCH 4/8] version --- versions/baseline.json | 2 +- versions/m-/mmloader.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index e054955b260188..db9f9e3d14d02a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4602,7 +4602,7 @@ }, "mmloader": { "baseline": "1.0.1", - "port-version": 1 + "port-version": 2 }, "mmx": { "baseline": "2019-09-29", diff --git a/versions/m-/mmloader.json b/versions/m-/mmloader.json index 266b43714c29fa..0155bc4310c1af 100644 --- a/versions/m-/mmloader.json +++ b/versions/m-/mmloader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbd5f87641f3e5cdd3cb46c512ba8c6d9188395f", + "version": "1.0.1", + "port-version": 2 + }, { "git-tree": "104d16ae01f6ae753fde8406f75a01b9353aa1f2", "version": "1.0.1", From 934d2c8027e715ac05202c866c6821ce6d51b2a5 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 14 Jun 2022 15:44:55 +0200 Subject: [PATCH 5/8] [mmloader] Remove from CI baseline --- scripts/ci.baseline.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 11fe1ca062fced..273c7b5870ffcd 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -654,13 +654,6 @@ microsoft-signalr:x64-windows-static-md=skip microsoft-signalr:x86-windows=skip # https://github.com/mlpack/mlpack/pull/2945 mlpack:x64-uwp=fail -mmloader:arm64-windows=fail -mmloader:arm-uwp=fail -mmloader:x64-linux=fail -mmloader:x64-osx=fail -mmloader:x64-uwp=fail -mmloader:x64-windows=fail -mmloader:x86-windows=fail # mmx installs many problematic headers, such as `json.h` and `sched.h` mmx:x64-windows=skip mmx:x64-windows-static=skip From f86a674ed34deb20124230e49abf15f99b474207 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 14 Jun 2022 16:44:04 +0200 Subject: [PATCH 6/8] unsupported on UWP --- ports/mmloader/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mmloader/vcpkg.json b/ports/mmloader/vcpkg.json index a6e3a05404b235..e436ab1118b013 100644 --- a/ports/mmloader/vcpkg.json +++ b/ports/mmloader/vcpkg.json @@ -5,7 +5,7 @@ "description": "A library for loading dll module bypassing windows PE loader from memory (x86/x64)", "homepage": "http://tishion.github.io/mmLoader/", "license": "MIT", - "supports": "(x86 | x64) & windows", + "supports": "(x86 | x64) & windows & !uwp", "dependencies": [ { "name": "vcpkg-cmake", From 580471c2330e7b8494dc70dacdd1b2b93dfc9fe4 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 14 Jun 2022 16:44:44 +0200 Subject: [PATCH 7/8] version --- versions/m-/mmloader.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mmloader.json b/versions/m-/mmloader.json index 0155bc4310c1af..440928b36b910f 100644 --- a/versions/m-/mmloader.json +++ b/versions/m-/mmloader.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cbd5f87641f3e5cdd3cb46c512ba8c6d9188395f", + "git-tree": "4b102ccdbd92919d2f3f62fff55b2a51839199ad", "version": "1.0.1", "port-version": 2 }, From acace3d86ab9b6d7f67abe3b1c6a73bb254550be Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 14 Jun 2022 18:14:25 +0200 Subject: [PATCH 8/8] Revert version db --- versions/m-/mmloader.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/m-/mmloader.json b/versions/m-/mmloader.json index 440928b36b910f..3257087c7896ca 100644 --- a/versions/m-/mmloader.json +++ b/versions/m-/mmloader.json @@ -7,12 +7,12 @@ }, { "git-tree": "104d16ae01f6ae753fde8406f75a01b9353aa1f2", - "version": "1.0.1", + "version-date": "2021-12-13", "port-version": 1 }, { "git-tree": "030c251ff729f1063950f5473cf393125f888ca2", - "version": "1.0.1", + "version-date": "2021-12-13", "port-version": 0 }, {