From 4c20816b0d9489a37bb0c6d0a3720689cc1059f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:20:58 +0000 Subject: [PATCH 1/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5047a5d5d4cedac968fa4da38fdd4cc329de8d36 Mon Sep 17 00:00:00 2001 From: Felix Wang Date: Sat, 17 Feb 2024 08:17:12 +0800 Subject: [PATCH 2/8] update to 4.1.0 --- .gitignore | 1 + ...39f15efe64a41013ec142c028e6f72476232.patch | 62 ------------------- ...b1273104b19300a830889e7d827e727c43e9.patch | 22 ------- packit.yaml | 6 +- sources | 2 +- zydis.spec | 11 ++-- 6 files changed, 9 insertions(+), 95 deletions(-) delete mode 100644 a56a39f15efe64a41013ec142c028e6f72476232.patch delete mode 100644 c683b1273104b19300a830889e7d827e727c43e9.patch diff --git a/.gitignore b/.gitignore index 751f477..0e82a8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zydis-4.0.0.tar.gz +/zydis-4.1.0.tar.gz diff --git a/a56a39f15efe64a41013ec142c028e6f72476232.patch b/a56a39f15efe64a41013ec142c028e6f72476232.patch deleted file mode 100644 index cbb3c07..0000000 --- a/a56a39f15efe64a41013ec142c028e6f72476232.patch +++ /dev/null @@ -1,62 +0,0 @@ -From a56a39f15efe64a41013ec142c028e6f72476232 Mon Sep 17 00:00:00 2001 -From: Felix Wang <77263945+topazus@users.noreply.github.com> -Date: Sun, 30 Apr 2023 14:51:50 +0800 -Subject: [PATCH] Add ZYDIS_BUILD_TESTS option and include tests in - CMakeLists.txt - ---- - CMakeLists.txt | 37 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 37 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9786010..fa0488ba 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -53,6 +53,9 @@ option(ZYDIS_BUILD_MAN - option(ZYDIS_BUILD_DOXYGEN - "Build doxygen documentation (requires Doxygen)" - ON) -+option(ZYDIS_BUILD_TESTS -+ "Build tests" -+ OFF) - option(ZYDIS_FUZZ_AFL_FAST - "Enables AFL persistent mode and reduces prints in ZydisFuzzIn" - OFF) -@@ -491,3 +494,37 @@ if (ZYDIS_BUILD_MAN) - endforeach() - add_custom_target(man ALL DEPENDS ${MAN_NAMES}) - endif () -+ -+# =============================================================================================== # -+# Tests # -+# =============================================================================================== # -+ -+if (ZYDIS_BUILD_TESTS) -+ enable_testing() -+ find_package(Python 3 REQUIRED) -+ -+ if (TARGET ZydisInfo) -+ add_test( -+ NAME "ZydisRegression" -+ COMMAND -+ "${Python_EXECUTABLE}" -+ regression.py -+ test -+ $ -+ WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/tests" -+ ) -+ endif () -+ -+ if (TARGET ZydisFuzzReEncoding AND TARGET ZydisFuzzEncoder AND TARGET ZydisTestEncoderAbsolute) -+ add_test( -+ NAME "ZydisRegressionEncoder" -+ COMMAND -+ "${Python_EXECUTABLE}" -+ regression_encoder.py -+ $ -+ $ -+ $ -+ WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/tests" -+ ) -+ endif () -+endif () diff --git a/c683b1273104b19300a830889e7d827e727c43e9.patch b/c683b1273104b19300a830889e7d827e727c43e9.patch deleted file mode 100644 index b28c509..0000000 --- a/c683b1273104b19300a830889e7d827e727c43e9.patch +++ /dev/null @@ -1,22 +0,0 @@ -From c683b1273104b19300a830889e7d827e727c43e9 Mon Sep 17 00:00:00 2001 -From: topazus -Date: Sat, 20 May 2023 21:13:50 -0400 -Subject: [PATCH] Fix the installation location of manpages - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fa0488ba..104be96f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -490,7 +490,7 @@ if (ZYDIS_BUILD_MAN) - "--output-dir=${CMAKE_CURRENT_BINARY_DIR}" - "${CMAKE_CURRENT_SOURCE_DIR}/man/${MAN_NAME}.ronn" - ) -- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${MAN_NAME}" TYPE MAN) -+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${MAN_NAME}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") - endforeach() - add_custom_target(man ALL DEPENDS ${MAN_NAMES}) - endif () diff --git a/packit.yaml b/packit.yaml index fe27113..0687387 100644 --- a/packit.yaml +++ b/packit.yaml @@ -10,16 +10,16 @@ jobs: - job: pull_from_upstream trigger: release dist_git_branches: - - fedora-all + - fedora-rawhide - job: koji_build trigger: commit allowed_pr_authors: ["packit", "topazus"] allowed_committers: ["packit", "topazus"] dist_git_branches: - - fedora-all + - fedora-rawhide - job: bodhi_update trigger: commit dist_git_branches: - - fedora-all \ No newline at end of file + - fedora-rawhide diff --git a/sources b/sources index 6544ef9..c7df2cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zydis-4.0.0.tar.gz) = 334284bccfb6ce61cc530fd479d6278db3e4df1fb52b311acd7d21558843c9bf14e74a199cd937041d434260b65c506c07ae1a37243d2240eb9443ae5e56e000 +SHA512 (zydis-4.1.0.tar.gz) = e07add4d43768ded02a238911fde6e74d2391abf8df282f774fca1a8c3fca3e97b03e90e0f3c7c0f3c75485fb29c0be4071d5e5b2e23dd5b8b1a864e3b713fbc diff --git a/zydis.spec b/zydis.spec index 58bbd3c..6dd401e 100644 --- a/zydis.spec +++ b/zydis.spec @@ -1,5 +1,7 @@ +Version: 4.1.0 +%global sover %{echo %{version} | cut -d '.' -f 1,2} + Name: zydis -Version: 4.0.0 Release: %autorelease Summary: Fast and lightweight x86/x86-64 disassembler and code generation library @@ -7,11 +9,6 @@ License: MIT URL: https://github.com/zyantific/zydis Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -# fix the installation location of man pages -Patch0: https://github.com/zyantific/zydis/commit/c683b1273104b19300a830889e7d827e727c43e9.patch -# Add ZYDIS_BUILD_TESTS option and include tests in CMakeLists.txt -Patch1: https://github.com/zyantific/zydis/commit/a56a39f15efe64a41013ec142c028e6f72476232.patch - ExcludeArch: s390x BuildRequires: gcc-c++ @@ -80,7 +77,7 @@ The %{name}-tools package contains tools about %{name}. %files %license LICENSE -%{_libdir}/libZydis.so.4.0* +%{_libdir}/libZydis.so.%{sover}* %files devel %doc README.md From a0b700e9769db0145fd4178201e47eaffbce6bfb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:59:19 +0000 Subject: [PATCH 3/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f503b240520243e7544b6321045a705a56ad4447 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:55:05 +0000 Subject: [PATCH 4/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From f315b2356d6ac8f85245830fc8c6abe0e36c629c Mon Sep 17 00:00:00 2001 From: Packit Date: Sun, 16 Feb 2025 00:40:34 +0000 Subject: [PATCH 5/8] Update to 4.1.1 upstream release - Resolves: rhbz#2264564 Upstream tag: v4.1.1 Upstream commit: a2278f1d Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 3 +++ sources | 2 +- zydis.spec | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 0e82a8d..ac2b4fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /zydis-4.0.0.tar.gz /zydis-4.1.0.tar.gz +/zydis-4.1.1.tar.gz diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..7017e6c --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 1.1.0.post1.dev2+gf7b527d0. diff --git a/sources b/sources index c7df2cc..417b98b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zydis-4.1.0.tar.gz) = e07add4d43768ded02a238911fde6e74d2391abf8df282f774fca1a8c3fca3e97b03e90e0f3c7c0f3c75485fb29c0be4071d5e5b2e23dd5b8b1a864e3b713fbc +SHA512 (zydis-4.1.1.tar.gz) = 177e84fedb3449e29ffb6c0b02a92066ba1aa8fb624facad5593902b8e08cb8ae0b20ff38c16987989c8e414d7484d09dab7917c00a8fe54aa9bab4bc90e275d diff --git a/zydis.spec b/zydis.spec index 6dd401e..c57387d 100644 --- a/zydis.spec +++ b/zydis.spec @@ -1,4 +1,4 @@ -Version: 4.1.0 +Version: 4.1.1 %global sover %{echo %{version} | cut -d '.' -f 1,2} Name: zydis From a27c49a3ed844336cd5c08aa6458680b1fcf0e0f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:22:10 +0000 Subject: [PATCH 6/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a6b7bd6988cedb73559646709a4f4660509999f8 Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Sun, 28 Sep 2025 10:24:03 +0800 Subject: [PATCH 7/8] Update to snapshot 5091440c2a1f963e00c6e6aceec7c4346e656fa4 --- .gitignore | 4 +--- sources | 2 +- zydis.spec | 47 ++++++++++++++++++++++++----------------------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index ac2b4fc..2454555 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/zydis-4.0.0.tar.gz -/zydis-4.1.0.tar.gz -/zydis-4.1.1.tar.gz +/zydis-*.tar* diff --git a/sources b/sources index 417b98b..ec75936 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zydis-4.1.1.tar.gz) = 177e84fedb3449e29ffb6c0b02a92066ba1aa8fb624facad5593902b8e08cb8ae0b20ff38c16987989c8e414d7484d09dab7917c00a8fe54aa9bab4bc90e275d +SHA512 (zydis-5091440c2a1f963e00c6e6aceec7c4346e656fa4.tar.gz) = 8ee8a5c53828d3652be4a2b7ce7a25e557248828b053a371844faab5cf74ae7a34f5f432c768d593defcfc051333d5d24e742c3083051f711873d2ba39af4e21 diff --git a/zydis.spec b/zydis.spec index c57387d..79396e0 100644 --- a/zydis.spec +++ b/zydis.spec @@ -1,23 +1,27 @@ -Version: 4.1.1 -%global sover %{echo %{version} | cut -d '.' -f 1,2} - Name: zydis +Version: 5.0.0 + +%global forgeurl https://github.com/zyantific/zydis +%global commit 5091440c2a1f963e00c6e6aceec7c4346e656fa4 +%forgemeta + Release: %autorelease Summary: Fast and lightweight x86/x86-64 disassembler and code generation library License: MIT -URL: https://github.com/zyantific/zydis -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +URL: %forgeurl +Source0: %forgesource ExcludeArch: s390x -BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: ninja-build -BuildRequires: zycore-c-devel +BuildRequires: gcc +BuildRequires: meson >= 1.3 +BuildRequires: pkgconfig(zycore) BuildRequires: doxygen # build man pages BuildRequires: rubygem-ronn-ng +# tests +BuildRequires: python3 %description Zydis is fast and lightweight x86/x86-64 disassembler and code generation @@ -56,34 +60,31 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-tools package contains tools about %{name}. %prep -%autosetup -p1 +%forgesetup %build -%cmake \ - -GNinja \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DZYAN_SYSTEM_ZYCORE=ON \ - -DZYDIS_BUILD_SHARED_LIB=ON \ - -DZYDIS_BUILD_MAN=ON \ - -DZYDIS_BUILD_TESTS=ON \ +%meson \ + -Dtools=enabled \ + -Dman=enabled \ + -Ddoc=enabled \ + -Dtests=enabled \ -%cmake_build +%meson_build %install -%cmake_install +%meson_install %check -%ctest +%meson_test %files %license LICENSE -%{_libdir}/libZydis.so.%{sover}* +%{_libdir}/libZydis.so.5* %files devel %doc README.md %{_includedir}/Zydis/ -%dir %{_libdir}/cmake/zydis -%{_libdir}/cmake/zydis/*.cmake +%{_libdir}/pkgconfig/zydis.pc %{_libdir}/libZydis.so %files doc From 4d596b21f77236587766aa6bdc9964dd0b6565f8 Mon Sep 17 00:00:00 2001 From: topazus Date: Thu, 2 Oct 2025 01:35:50 +0800 Subject: [PATCH 8/8] disable test on i686 --- zydis.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zydis.spec b/zydis.spec index 79396e0..03ec8e1 100644 --- a/zydis.spec +++ b/zydis.spec @@ -75,7 +75,9 @@ The %{name}-tools package contains tools about %{name}. %meson_install %check +%ifnarch %{ix86} %meson_test +%endif %files %license LICENSE