Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package radare2-iaito for openSUSE:Factory checked in at 2022-03-24 22:58:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/radare2-iaito (Old) and /work/SRC/openSUSE:Factory/.radare2-iaito.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "radare2-iaito" Thu Mar 24 22:58:14 2022 rev:2 rq:964494 version:5.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/radare2-iaito/radare2-iaito.changes 2021-06-07 22:43:47.780515106 +0200 +++ /work/SRC/openSUSE:Factory/.radare2-iaito.new.1900/radare2-iaito.changes 2022-03-24 23:00:21.728387327 +0100 @@ -1,0 +2,9 @@ +Wed Mar 16 08:28:58 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.3.1. No changelog. +- Add patch to fix build with old and new syntax-highlighting: + * 0001-Fix-KSyntaxHighlighting-includes.patch +- Add upstream change: + * 0001-Fix-build-for-r2-5.5.0.patch + +------------------------------------------------------------------- Old: ---- radare2-iaito-5.2.2.tar.gz New: ---- 0001-Fix-KSyntaxHighlighting-includes.patch 0001-Fix-build-for-r2-5.5.0.patch radare2-iaito-5.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ radare2-iaito.spec ++++++ --- /var/tmp/diff_new_pack.HJDKxB/_old 2022-03-24 23:00:22.240387821 +0100 +++ /var/tmp/diff_new_pack.HJDKxB/_new 2022-03-24 23:00:22.248387829 +0100 @@ -1,7 +1,7 @@ # # spec file for package radare2-iaito # -# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,6 +13,7 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ +# %bcond_without graphviz @@ -22,7 +23,7 @@ %define ts_version 5.2.1 Name: radare2-iaito -Version: 5.2.2 +Version: 5.3.1 Release: 0 Summary: A Qt GUI for radare2 reverse engineering framework License: GPL-3.0-only @@ -30,6 +31,10 @@ URL: https://github.com/radareorg/iaito Source0: https://github.com/radareorg/iaito/archive/refs/tags/%{version}.tar.gz#/radare2-iaito-%{version}.tar.gz Source1: https://github.com/radareorg/iaito-translations/archive/refs/tags/%{ts_version}.tar.gz#/radare2-iaito-translations-%{ts_version}.tar.gz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Fix-KSyntaxHighlighting-includes.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Fix-build-for-r2-5.5.0.patch BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: pkgconfig @@ -60,18 +65,15 @@ %package devel Summary: Development files for Iaito Group: Development/Tools/Debuggers -Requires: radare2-devel Requires: %{name} = %{version} +Requires: radare2-devel %description devel Development files for the Iatio GUI %prep -%setup -n iaito-%{version} -rm -rf radare2 - -%setup -D -T -b1 -n iaito-%{version} -mv ../iaito-translations-%{ts_version}/* ./src/translations/ +%autosetup -p1 -a1 -n iaito-%{version} +mv iaito-translations-%{ts_version}/* ./src/translations/ %build export CLANG_INSTALL_DIR=%{_prefix} ++++++ 0001-Fix-KSyntaxHighlighting-includes.patch ++++++ >From a732c9118ebeffec1bfd7da11d5fd26915cd639e Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Wed, 16 Mar 2022 09:18:23 +0100 Subject: [PATCH] Fix KSyntaxHighlighting includes. Mixing Camelcase and standard include wasn't the expected way. This was fixed in syntax-highlighting 5.91. --- src/common/Configuration.cpp | 6 +++--- src/common/SyntaxHighlighter.cpp | 2 +- src/common/SyntaxHighlighter.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/Configuration.cpp b/src/common/Configuration.cpp index a369f63..428f57f 100644 --- a/src/common/Configuration.cpp +++ b/src/common/Configuration.cpp @@ -7,9 +7,9 @@ #include <QApplication> #ifdef IAITO_ENABLE_KSYNTAXHIGHLIGHTING -#include <KSyntaxHighlighting/repository.h> -#include <KSyntaxHighlighting/theme.h> -#include <KSyntaxHighlighting/definition.h> +#include <KSyntaxHighlighting/Repository> +#include <KSyntaxHighlighting/Theme> +#include <KSyntaxHighlighting/Definition> #endif #include "common/ColorThemeWorker.h" diff --git a/src/common/SyntaxHighlighter.cpp b/src/common/SyntaxHighlighter.cpp index 70f6ab0..8de3abd 100644 --- a/src/common/SyntaxHighlighter.cpp +++ b/src/common/SyntaxHighlighter.cpp @@ -5,7 +5,7 @@ #include "Configuration.h" -#include <KSyntaxHighlighting/theme.h> +#include <KSyntaxHighlighting/Theme> SyntaxHighlighter::SyntaxHighlighter(QTextDocument *document) : KSyntaxHighlighting::SyntaxHighlighter(document) { diff --git a/src/common/SyntaxHighlighter.h b/src/common/SyntaxHighlighter.h index c5889e1..7f25d42 100644 --- a/src/common/SyntaxHighlighter.h +++ b/src/common/SyntaxHighlighter.h @@ -10,7 +10,7 @@ #ifdef IAITO_ENABLE_KSYNTAXHIGHLIGHTING -#include <KSyntaxHighlighting/syntaxhighlighter.h> +#include <KSyntaxHighlighting/SyntaxHighlighter> class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter { -- 2.35.1 ++++++ 0001-Fix-build-for-r2-5.5.0.patch ++++++ >From e8e796a36eccabfdb6959e59bb5bc429cce88741 Mon Sep 17 00:00:00 2001 From: pancake <[email protected]> Date: Tue, 16 Nov 2021 14:47:42 +0100 Subject: [PATCH] Fix build for r2 > 5.5.0 --- src/core/Iaito.cpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/core/Iaito.cpp b/src/core/Iaito.cpp index a912d47..49afd52 100644 --- a/src/core/Iaito.cpp +++ b/src/core/Iaito.cpp @@ -2730,9 +2730,29 @@ QList<RelocDescription> IaitoCore::getAllRelocs() QList<RelocDescription> ret; if (core && core->bin && core->bin->cur && core->bin->cur->o) { + RBinReloc *br; +#if R2_VERSION_NUMBER > 50500 + RListIter *iter; + RList *list = r_bin_get_relocs_list (core->bin); + void *_br; + r_list_foreach (list, iter, _br) { + br = (RBinReloc*)_br; + RelocDescription reloc; + + reloc.vaddr = br->vaddr; + reloc.paddr = br->paddr; + reloc.type = (br->additive ? "ADD_" : "SET_") + QString::number(br->type); + + if (br->import) + reloc.name = br->import->name; + else + reloc.name = QString("reloc_%1").arg(QString::number(br->vaddr, 16)); + + ret << reloc; + } +#else auto relocs = core->bin->cur->o->relocs; RBIter iter; - RBinReloc *br; r_rbtree_foreach (relocs, iter, br, RBinReloc, vrb) { RelocDescription reloc; @@ -2747,6 +2767,7 @@ QList<RelocDescription> IaitoCore::getAllRelocs() ret << reloc; } +#endif } return ret; -- 2.35.1 ++++++ radare2-iaito-5.2.2.tar.gz -> radare2-iaito-5.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iaito-5.2.2/.github/workflows/ci.yml new/iaito-5.3.1/.github/workflows/ci.yml --- old/iaito-5.2.2/.github/workflows/ci.yml 2021-04-27 10:19:36.000000000 +0200 +++ new/iaito-5.3.1/.github/workflows/ci.yml 2021-07-21 09:17:56.000000000 +0200 @@ -56,8 +56,8 @@ sudo apt-get install qt5-default libqt5svg5-dev qttools5-dev qttools5-dev-tools - name: install r2 run: | - wget -q https://github.com/radareorg/radare2/releases/download/5.2.1/radare2_5.2.1_amd64.deb - wget -q https://github.com/radareorg/radare2/releases/download/5.2.1/radare2-dev_5.2.1_amd64.deb + wget -q https://github.com/radareorg/radare2/releases/download/5.3.1/radare2_5.3.1_amd64.deb + wget -q https://github.com/radareorg/radare2/releases/download/5.3.1/radare2-dev_5.3.1_amd64.deb sudo dpkg -i *.deb - name: build iaito run: | @@ -88,7 +88,7 @@ pip3 install meson - name: install r2 run: | - wget -q https://github.com/radareorg/radare2/releases/download/5.2.1/radare2-5.2.1.pkg + wget -q https://github.com/radareorg/radare2/releases/download/5.3.1/radare2-5.3.1.pkg sudo installer -pkg *.pkg -target / - name: build iaito run: | @@ -198,7 +198,7 @@ scripts/fetch_deps.sh source cutter-deps/env.sh set -euo pipefail - wget -q https://github.com/radareorg/radare2/releases/download/5.2.1/radare2-5.2.1.pkg + wget -q https://github.com/radareorg/radare2/releases/download/5.3.1/radare2-5.3.1.pkg sudo installer -pkg *.pkg -target / export PATH=/usr/local/opt/llvm/bin:$PATH source scripts/prepare_breakpad_macos.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iaito-5.2.2/README.md new/iaito-5.3.1/README.md --- old/iaito-5.2.2/README.md 2021-04-27 10:19:36.000000000 +0200 +++ new/iaito-5.3.1/README.md 2021-07-21 09:17:56.000000000 +0200 @@ -2,15 +2,19 @@ # iaito -iaito is the official graphical interface for radare2 written in Qt/C++. +iaito is the official graphical interface for radare2, a libre reverse engineering framework. + It is the continuation of [Cutter](https://cutter.re) before the [fork](https://github.com/rizinorg/cutter) to keep [radare2](https://github.com/radareorg/radare2) as backend. * Iaito was the original name of this GUI before being forked as Cutter. +* It's written in Qt/C++ (qt5 for now). No Qt6 support yet * Support latest versions and features of radare2 * Use r2 plugins (f.ex: no need for r2ghidra-iaito plugin if r2ghidra is installed) * Focus on parity of commands and r2-style workflows. * Translations are in the early steps, please [contribute](https://crowdin.com/project/iaito)! +* Aims to support all the features from the core, not just disassembler-based ones + * forensics, networking, bindiffing, solvers, ... [](https://crowdin.com/project/iaito) [](https://github.com/radareorg/iaito/actions) @@ -36,7 +40,7 @@ Extra dependencies are needed for macOS, see the .github/workflows/ci.yml for more details ``` -brew install qt5 +brew install qt@5 ``` On Ubuntu/Debian diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iaito-5.2.2/configure new/iaito-5.3.1/configure --- old/iaito-5.2.2/configure 2021-04-27 10:19:36.000000000 +0200 +++ new/iaito-5.3.1/configure 2021-07-21 09:17:56.000000000 +0200 @@ -112,12 +112,12 @@ : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s} : ${INSTALL_MAN:=${INSTALL} -m 444} : ${INSTALL_LIB:=${INSTALL} -m 755 -c} - PKGNAME='iaito' ; VERSION='5.2.2' ; VERSION_MAJOR=5; VERSION_MINOR=2; VERSION_PATCH=2; VERSION_NUMBER=50202; CONTACT_MAIL="[email protected]" ; CONTACT_NAME="pancake" ; CONTACT="pancake <[email protected]>" ; + PKGNAME='iaito' ; VERSION='5.3.1' ; VERSION_MAJOR=5; VERSION_MINOR=3; VERSION_PATCH=1; VERSION_NUMBER=50301; CONTACT_MAIL="[email protected]" ; CONTACT_NAME="pancake" ; CONTACT="pancake <[email protected]>" ; } show_usage() { cat <<EOF2 -'configure' configures iaito-5.2.2 to adapt to many kinds of systems. +'configure' configures iaito-5.3.1 to adapt to many kinds of systems. Usage: ./configure [OPTION]... [VAR=VALUE]... @@ -196,10 +196,10 @@ show_version() { if [ "$QUIET" = 1 ]; then - echo "5.2.2" + echo "5.3.1" exit 0 fi -echo "iaito-5.2.2 configuration script done with acr v1.9.8. +echo "iaito-5.3.1 configuration script done with acr v1.9.8. The 'Free Software Foundation' message is only for autodetection. Originally written by pancake <nopcode.org>." exit 0 @@ -228,7 +228,7 @@ show_version ; ;; -r|--r|--report) echo "PKGNAME: iaito" -echo "VERSION: 5.2.2" +echo "VERSION: 5.3.1" echo "LANGS: c++" echo "PKG-CONFIG: r_core" echo "FLAGS: --with-python --with-python-bindings --with-crash-reports" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iaito-5.2.2/configure.acr new/iaito-5.3.1/configure.acr --- old/iaito-5.2.2/configure.acr 2021-04-27 10:19:36.000000000 +0200 +++ new/iaito-5.3.1/configure.acr 2021-07-21 09:17:56.000000000 +0200 @@ -1,5 +1,5 @@ PKGNAME iaito -VERSION 5.2.2 +VERSION 5.3.1 CONTACT pancake ; [email protected] LANG_CXX! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iaito-5.2.2/dist/macos/make-macos-pkg.sh new/iaito-5.3.1/dist/macos/make-macos-pkg.sh --- old/iaito-5.2.2/dist/macos/make-macos-pkg.sh 2021-04-27 10:19:36.000000000 +0200 +++ new/iaito-5.3.1/dist/macos/make-macos-pkg.sh 2021-07-21 09:17:56.000000000 +0200 @@ -13,7 +13,7 @@ VERSION="$1" else VERSION="`../../configure -qV`" - [ -z "${VERSION}" ] && VERSION=5.2.2 + [ -z "${VERSION}" ] && VERSION=5.3.l fi [ -z "${MAKE}" ] && MAKE=make diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iaito-5.2.2/prepare_r2.bat new/iaito-5.3.1/prepare_r2.bat --- old/iaito-5.2.2/prepare_r2.bat 2021-04-27 10:19:36.000000000 +0200 +++ new/iaito-5.3.1/prepare_r2.bat 2021-07-21 09:17:56.000000000 +0200 @@ -12,7 +12,7 @@ SET "PATH=%CD%;%PATH%" SET "R2DIST=r2_dist" -SET "R2V=5.2.1" +SET "R2V=5.3.1" ECHO Downloading radare2 (%PLATFORM%) rem powershell -command "Invoke-WebRequest 'https://github.com/radareorg/radare2/releases/download/5.1.0/radare2-5.1.0_windows.zip' -OutFile 'radare2-5.1.0_windows.zip'" pip install wget diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iaito-5.2.2/src/org.radare.iaito.appdata.xml new/iaito-5.3.1/src/org.radare.iaito.appdata.xml --- old/iaito-5.2.2/src/org.radare.iaito.appdata.xml 2021-04-27 10:19:36.000000000 +0200 +++ new/iaito-5.3.1/src/org.radare.iaito.appdata.xml 2021-07-21 09:17:56.000000000 +0200 @@ -25,6 +25,7 @@ <update_contact>pancake</update_contact> <releases> + <release version="5.3.1" date="2021-07-21" /> <release version="5.2.2" date="2021-04-27" /> <release version="5.2.1" date="2021-04-21" /> <release version="5.2.0" date="2021-04-16" />
