Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update yara MbedTLS dependency #2102

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ To develop plugins for ImHex, use the following template project to get started.
- Thanks to aquynh for [capstone](https://github.com/aquynh/capstone) which is the base of the disassembly window
- Thanks to rxi for [microtar](https://github.com/rxi/microtar) used for extracting downloaded store assets
- Thanks to VirusTotal for [Yara](https://github.com/VirusTotal/yara) used by the Yara plugin
- Thanks to paul-elliot-arm for [Mbed-TLS](https://github.com/Mbed-TLS/mbedtls) used for crypto by the Yara plugin
- Thanks to Martinsos for [edlib](https://github.com/Martinsos/edlib) used for sequence searching in the diffing view
- Thanks to ron4fun for [HashLibPlus](https://github.com/ron4fun/HashLibPlus) which implements every hashing algorithm under the sun
- Thanks to mackron for [miniaudio](https://github.com/mackron/miniaudio) used to play audio files
Expand Down
1 change: 0 additions & 1 deletion cmake/build_helpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,6 @@ macro(addBundledLibraries)
endif()
enableUnityBuild(libpl)

find_package(mbedTLS 3.4.0 REQUIRED)
find_package(Magic 5.39 REQUIRED)

if (NOT IMHEX_DISABLE_STACKTRACE)
Expand Down
75 changes: 0 additions & 75 deletions cmake/modules/FindmbedTLS.cmake

This file was deleted.

6 changes: 3 additions & 3 deletions dist/ImHex-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

EAPI=7

RESTRICT="network-sandbox"
DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight"
HOMEPAGE="https://github.com/WerWolv/ImHex"
SRC_URI=""
EGIT_REPO_URI="https://github.com/WerWolv/ImHex.git"

EGIT_REPO_URI="https://github.com/jopadan/ImHex.git"
inherit git-r3 cmake

LICENSE="GPL-2"
Expand All @@ -20,7 +20,7 @@ DEPEND=""
RDEPEND="${DEPEND}
media-libs/glfw
sys-apps/file
net-libs/mbedtls
net-libs/mbedtls:3
dev-cpp/nlohmann_json
sys-apps/dbus
sys-apps/xdg-desktop-portal
Expand Down
4 changes: 4 additions & 0 deletions dist/get_deps_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,7 @@ apt install -y \
liblzma-dev \
libzstd-dev \
liblz4-dev

echo "deb https://deb.debian.org/debian unstable main" &>> /etc/apt/sources.list
apt-update
apt install -y -t unstable --no-install-recommends libmbedtls-dev
10 changes: 5 additions & 5 deletions lib/third_party/yara/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ set(LIBYARA_MODULES
${LIBYARA_SOURCE_PATH}/modules/time/time.c
)

find_package(mbedTLS 2.26.0 REQUIRED)
find_package(MbedTLS 3.6.2 REQUIRED)

add_library(libyara STATIC ${LIBYARA_SOURCE} ${LIBYARA_INCLUDES} ${LIBYARA_MODULES})

Expand All @@ -124,15 +124,15 @@ endif ()
target_include_directories(
libyara
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/yara> $<BUILD_INTERFACE:${LIBYARA_SOURCE_PATH}/include>
PRIVATE ${LIBYARA_SOURCE_PATH} ${MBEDTLS_INCLUDE_DIR}
PRIVATE ${LIBYARA_SOURCE_PATH} MbedTLS::mbedtls}
)

target_link_directories(libyara PRIVATE ${MBEDTLS_LIBRARY_DIR})
target_link_directories(libyara PRIVATE MbedTLS::mbedtls)

if (UNIX)
target_link_libraries(libyara PRIVATE magic ${MBEDTLS_LIBRARIES} pthread)
target_link_libraries(libyara PRIVATE magic MbedTLS::mbedtls pthread)
else ()
target_link_libraries(libyara PRIVATE magic ${MBEDTLS_LIBRARIES})
target_link_libraries(libyara PRIVATE magic MbedTLS::mbedtls)
endif ()

include(GNUInstallDirs)
Expand Down
Loading