From 025eaadb1e3c4d50e3b7e809b834787d2ca9a632 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Thu, 10 Dec 2020 14:37:05 -0500 Subject: [PATCH 1/6] Testing of latest vcpkg PRs --- .gitmodules | 4 ++-- anvill | 2 +- mcsema | 2 +- remill | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index d2206047..8de04801 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "mcsema"] path = mcsema - url = https://github.com/ekilmer/mcsema.git + url = https://github.com/lifting-bits/mcsema.git branch = vcpkg [submodule "remill"] path = remill @@ -8,7 +8,7 @@ branch = vcpkg [submodule "anvill"] path = anvill - url = https://github.com/ekilmer/anvill.git + url = https://github.com/lifting-bits/anvill.git branch = vcpkg [submodule "rellic"] path = rellic diff --git a/anvill b/anvill index 8b1aaa13..b516a2a0 160000 --- a/anvill +++ b/anvill @@ -1 +1 @@ -Subproject commit 8b1aaa131b075ab81c76d4cf91a275834016d5c4 +Subproject commit b516a2a0ee4d64d399e84351a7d11fab644f3bed diff --git a/mcsema b/mcsema index f09a493a..82613d19 160000 --- a/mcsema +++ b/mcsema @@ -1 +1 @@ -Subproject commit f09a493a7e377ffadd481bde08a9b98bc8b810e2 +Subproject commit 82613d19bdc4e60b7e4e6b5a8505390d15f56dd5 diff --git a/remill b/remill index 084c08d1..7de10bc0 160000 --- a/remill +++ b/remill @@ -1 +1 @@ -Subproject commit 084c08d1fa14af9ad1cd4c9f04b5465fd7b7bb71 +Subproject commit 7de10bc07f9ba97bf31306fce544eee522056396 From d104a48aa837916f4e3a994641fcf8468578bdec Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Thu, 10 Dec 2020 14:47:17 -0500 Subject: [PATCH 2/6] Test remill vcpkg packaging with latest commit --- ports/remill/portfile.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/remill/portfile.cmake b/ports/remill/portfile.cmake index d7c79eda..5d82f384 100644 --- a/ports/remill/portfile.cmake +++ b/ports/remill/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO ekilmer/remill - REF abebf20a29456ed2f5229277b575ca4d6859b0b6 - SHA512 d23a653bbbb2a9d0a36eb8425651154df0bd3339f8286d9e7449b128b6ae045c0aaefc864613910c2cda548d395b1f3c926bbb9b7b58e46657aa6572fa8179f3 + REPO lifting-bits/remill + REF 7de10bc07f9ba97bf31306fce544eee522056396 + SHA512 bc298531915cb72416715d5c5538e567e480ab50d3377b26957ea006bf1dd95e44166cd4200c945c5969c8779dcf3462fa9baef1c95f6302153090ea9f9b4924 HEAD_REF vcpkg ) From 852bf87ad845bd66b3b31a93c321474ae1af2460 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Fri, 11 Dec 2020 08:59:54 -0500 Subject: [PATCH 3/6] Use master branch - remill, anvill, mcsema --- .gitmodules | 6 +++--- anvill | 2 +- mcsema | 2 +- remill | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8de04801..0404ae8c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,15 @@ [submodule "mcsema"] path = mcsema url = https://github.com/lifting-bits/mcsema.git - branch = vcpkg + branch = master [submodule "remill"] path = remill url = https://github.com/lifting-bits/remill.git - branch = vcpkg + branch = master [submodule "anvill"] path = anvill url = https://github.com/lifting-bits/anvill.git - branch = vcpkg + branch = master [submodule "rellic"] path = rellic url = https://github.com/ekilmer/rellic.git diff --git a/anvill b/anvill index b516a2a0..e609d806 160000 --- a/anvill +++ b/anvill @@ -1 +1 @@ -Subproject commit b516a2a0ee4d64d399e84351a7d11fab644f3bed +Subproject commit e609d8065824084fa5f79feabf4c644a6ad543ae diff --git a/mcsema b/mcsema index 82613d19..24db01c1 160000 --- a/mcsema +++ b/mcsema @@ -1 +1 @@ -Subproject commit 82613d19bdc4e60b7e4e6b5a8505390d15f56dd5 +Subproject commit 24db01c1bab932b8c1a7c1a71d672299b6cbdc99 diff --git a/remill b/remill index 7de10bc0..37741957 160000 --- a/remill +++ b/remill @@ -1 +1 @@ -Subproject commit 7de10bc07f9ba97bf31306fce544eee522056396 +Subproject commit 37741957d6d43bcaafac8e316a875a1b7ce4838f From 6d2f27ec4078f6fd5575fa47f2eeb84fb4691b34 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Fri, 11 Dec 2020 12:32:37 -0500 Subject: [PATCH 4/6] Use updated rellic vcpkg branch in lifting-bits repo --- .gitmodules | 2 +- rellic | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0404ae8c..c14fbccf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,5 +12,5 @@ branch = master [submodule "rellic"] path = rellic - url = https://github.com/ekilmer/rellic.git + url = https://github.com/lifting-bits/rellic.git branch = vcpkg diff --git a/rellic b/rellic index d2a2fa02..c89b16ed 160000 --- a/rellic +++ b/rellic @@ -1 +1 @@ -Subproject commit d2a2fa02102a0d38b0999da14f57c1b1151e49d9 +Subproject commit c89b16ed28ac0958d4beae31cd357ad29645153e From d8e332ef7390dbd4b92058de7a030f69d424deaa Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Wed, 16 Dec 2020 11:58:49 -0500 Subject: [PATCH 5/6] Update rellic to master --- .gitmodules | 2 +- mcsema | 2 +- rellic | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index c14fbccf..95e72e9a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,4 +13,4 @@ [submodule "rellic"] path = rellic url = https://github.com/lifting-bits/rellic.git - branch = vcpkg + branch = master diff --git a/mcsema b/mcsema index 24db01c1..40d5cc7b 160000 --- a/mcsema +++ b/mcsema @@ -1 +1 @@ -Subproject commit 24db01c1bab932b8c1a7c1a71d672299b6cbdc99 +Subproject commit 40d5cc7b27238b92e59080f15fd4348775f549e8 diff --git a/rellic b/rellic index c89b16ed..df795e20 160000 --- a/rellic +++ b/rellic @@ -1 +1 @@ -Subproject commit c89b16ed28ac0958d4beae31cd357ad29645153e +Subproject commit df795e205b80e2ed3d30d2f2a3050de3fae3fa24 From 3abc5aba294d3c53e39838f3141959ea2536385d Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Wed, 16 Dec 2020 15:56:29 -0500 Subject: [PATCH 6/6] Update remill portfile definition to 4.0.11 commit --- ports/remill/portfile.cmake | 4 ++-- ports/remill/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/remill/portfile.cmake b/ports/remill/portfile.cmake index 5d82f384..4d206f83 100644 --- a/ports/remill/portfile.cmake +++ b/ports/remill/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lifting-bits/remill - REF 7de10bc07f9ba97bf31306fce544eee522056396 - SHA512 bc298531915cb72416715d5c5538e567e480ab50d3377b26957ea006bf1dd95e44166cd4200c945c5969c8779dcf3462fa9baef1c95f6302153090ea9f9b4924 + REF 37741957d6d43bcaafac8e316a875a1b7ce4838f + SHA512 325aa81c0b9ace4e2b908f8afffcec6f9f998b98363a5ff09d7f5ea4b57dc9b6d2e2d0c860baac3072bb4c01b147e2dee6d2375b6b251f02362c02f327b328d9 HEAD_REF vcpkg ) diff --git a/ports/remill/vcpkg.json b/ports/remill/vcpkg.json index 52851b88..feece83e 100644 --- a/ports/remill/vcpkg.json +++ b/ports/remill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "remill", - "version-string": "2020-12-05", + "version-string": "4.0.11", "description": "Library for lifting of x86, amd64, and aarch64 machine code to LLVM bitcode", "homepage": "https://github.com/lifting-bits/remill", "default-features": [