Merge branch 'aseitz/update-deps-no-souffle' into 'main'

Update libehp, LIEF

See merge request rewriting/ddisasm!1186

.ci/Dockerfile.conan-ubuntu20

@@ -65,7 +65,7 @@ RUN python3 -m pip install --no-cache-dir --upgrade pip && \
     python3 -m pip install --no-cache-dir \
     pyyaml \
     psycopg2-binary \
-    lief==0.13.0
+    lief==0.13.2
 
 COPY --from=UASM /usr/local/bin/uasm /usr/local/bin/uasm
 COPY etc/sstrip /usr/bin/sstrip

.ci/Dockerfile.static

@@ -42,7 +42,7 @@ RUN apt-get -y update && \
       git \
       python3
 
-RUN git clone -b 0.13.0 --depth 1 https://github.com/lief-project/LIEF.git /usr/local/src/LIEF && \
+RUN git clone -b 0.13.2 --depth 1 https://github.com/lief-project/LIEF.git /usr/local/src/LIEF && \
     cmake -DLIEF_PYTHON_API=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF /usr/local/src/LIEF -B/usr/local/src/LIEF/build && \
     cmake --build /usr/local/src/LIEF/build -j --target install
 
@@ -139,7 +139,7 @@ RUN python3 -m pip install --no-cache-dir --upgrade pip && \
     python3 -m pip install --no-cache-dir \
     pyyaml \
     psycopg2-binary \
-    lief==0.13.0
+    lief==0.13.2
 
 COPY --from=souffle /usr/local/bin/souffle* /usr/local/bin/
 COPY --from=souffle /usr/local/include/souffle/ /usr/include/souffle

.ci/Dockerfile.ubuntu20

@@ -43,7 +43,7 @@ RUN apt-get -y update && \
       git \
       python3
 
-RUN git clone -b 0.13.0 --depth 1 https://github.com/lief-project/LIEF.git /usr/local/src/LIEF && \
+RUN git clone -b 0.13.2 --depth 1 https://github.com/lief-project/LIEF.git /usr/local/src/LIEF && \
     cmake -DLIEF_PYTHON_API=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF /usr/local/src/LIEF -B/usr/local/src/LIEF/build && \
     cmake --build /usr/local/src/LIEF/build -j4 --target install
 
@@ -181,7 +181,7 @@ RUN python3 -m pip install --no-cache-dir --upgrade pip && \
     pre-commit \
     pydot \
     sphinx \
-    lief==0.13.0
+    lief==0.13.2
 
 # Setup pre-commit hooks.
 WORKDIR /ddisasm

CHANGELOG.md

@@ -1,5 +1,7 @@
 # 1.8.1 (Unreleased)
 
+* Update LIEF to 0.13.2
+
 # 1.8.0
 
 * Prefer LOCAL symbols over GLOBAL ones when selecting symbols for symbolic

CMakeLists.txt

@@ -353,7 +353,7 @@ endif()
 if(ENABLE_CONAN)
   set(LIEF_LIBRARIES CONAN_PKG::lief)
 else()
-  find_package(LIEF 0.13.0 REQUIRED COMPONENTS STATIC)
+  find_package(LIEF 0.13.2 REQUIRED COMPONENTS STATIC)
 endif()
 
 # ---------------------------------------------------------------------------

Dockerfile

@@ -40,7 +40,7 @@ RUN apt-get -y update \
       git \
       python3
 
-RUN git clone -b 0.13.0 --depth 1 https://github.com/lief-project/LIEF.git /usr/local/src/LIEF
+RUN git clone -b 0.13.2 --depth 1 https://github.com/lief-project/LIEF.git /usr/local/src/LIEF
 RUN cmake -DLIEF_PYTHON_API=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF /usr/local/src/LIEF -B/usr/local/src/LIEF/build
 RUN cmake --build /usr/local/src/LIEF/build -j4 --target all install
 

conanfile.py

@@ -75,8 +75,8 @@ class DdisasmConan(Properties, ConanFile):
     settings = ("os", "compiler", "build_type", "arch")
     options = {"run_tests": [True, False, None]}
 
-    lief_version = "0.13.0"
-    libehp_version = "0.1.1-gt4"
+    lief_version = "0.13.2"
+    libehp_version = "0.1.1-gt5"
     souffle_version = "2.4"
     build_requires = (
         "libehp/%s@rewriting+extra-packages/stable" % (libehp_version),

doc/source/GENERAL/2-Building-Ddisasm.md

@@ -24,7 +24,7 @@ make install -j4
 ```
 
 - [libehp](https://git.zephyr-software.com/opensrc/libehp) or GrammaTech's [mirror](https://github.com/GrammaTech/libehp), version 1.0.0 or higher
-- [LIEF](https://lief.quarkslab.com/), version 0.13.0 or higher
+- [LIEF](https://lief.quarkslab.com/), version 0.13.2 or higher
 
 Our [Dockerfile](https://github.com/GrammaTech/ddisasm/blob/main/Dockerfile)
 is a good reference of how all the dependencies can be installed.

requirements-dev.txt

@@ -1,4 +1,4 @@
 capstone-gt
 gtirb
 gtirb-capstone
-lief==0.13.0
+lief==0.13.2