From 86f7bd974516f89d83a3b1a553c16cb3f85ee6dc Mon Sep 17 00:00:00 2001 From: Elaine Gibson Date: Sun, 24 Apr 2022 19:33:01 +0100 Subject: [PATCH] radare2: update to 5.6.8. --- common/shlibs | 45 ++++++++++++----------- srcpkgs/radare2-devel | 1 + srcpkgs/radare2/patches/sys_openssl.patch | 21 +++++++++++ srcpkgs/radare2/patches/try.patch | 20 ---------- srcpkgs/radare2/template | 25 ++++++++++--- 5 files changed, 64 insertions(+), 48 deletions(-) create mode 120000 srcpkgs/radare2-devel create mode 100644 srcpkgs/radare2/patches/sys_openssl.patch delete mode 100644 srcpkgs/radare2/patches/try.patch diff --git a/common/shlibs b/common/shlibs index a143f5928c41..a95bc3054f14 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3184,28 +3184,29 @@ libkdeconnectinterfaces.so.21 kdeconnect-21.03.80_1 libkdeconnectcore.so.21 kdeconnect-21.03.80_1 libkpmcore.so.11 kpmcore-21.03.80_1 libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6 -libr_core.so.5.0.0 radare2-5.0.0_1 -libr_config.so.5.0.0 radare2-5.0.0_1 -libr_cons.so.5.0.0 radare2-5.0.0_1 -libr_util.so.5.0.0 radare2-5.0.0_1 -libr_flag.so.5.0.0 radare2-5.0.0_1 -libr_asm.so.5.0.0 radare2-5.0.0_1 -libr_bin.so.5.0.0 radare2-5.0.0_1 -libr_anal.so.5.0.0 radare2-5.0.0_1 -libr_lang.so.5.0.0 radare2-5.0.0_1 -libr_debug.so.5.0.0 radare2-5.0.0_1 -libr_egg.so.5.0.0 radare2-5.0.0_1 -libr_bp.so.5.0.0 radare2-5.0.0_1 -libr_search.so.5.0.0 radare2-5.0.0_1 -libr_io.so.5.0.0 radare2-5.0.0_1 -libr_hash.so.5.0.0 radare2-5.0.0_1 -libr_socket.so.5.0.0 radare2-5.0.0_1 -libr_parse.so.5.0.0 radare2-5.0.0_1 -libr_syscall.so.5.0.0 radare2-5.0.0_1 -libr_crypto.so.5.0.0 radare2-5.0.0_1 -libr_fs.so.5.0.0 radare2-5.0.0_1 -libr_magic.so.5.0.0 radare2-5.0.0_1 -libr_reg.so.5.0.0 radare2-5.0.0_1 +libr_core.so.5.6.8 radare2-5.6.8_1 +libr_config.so.5.6.8 radare2-5.6.8_1 +libr_cons.so.5.6.8 radare2-5.6.8_1 +libr_util.so.5.6.8 radare2-5.6.8_1 +libr_flag.so.5.6.8 radare2-5.6.8_1 +libr_asm.so.5.6.8 radare2-5.6.8_1 +libr_bin.so.5.6.8 radare2-5.6.8_1 +libr_anal.so.5.6.8 radare2-5.6.8_1 +libr_lang.so.5.6.8 radare2-5.6.8_1 +libr_debug.so.5.6.8 radare2-5.6.8_1 +libr_egg.so.5.6.8 radare2-5.6.8_1 +libr_bp.so.5.6.8 radare2-5.6.8_1 +libr_search.so.5.6.8 radare2-5.6.8_1 +libr_io.so.5.6.8 radare2-5.6.8_1 +libr_hash.so.5.6.8 radare2-5.6.8_1 +libr_socket.so.5.6.8 radare2-5.6.8_1 +libr_parse.so.5.6.8 radare2-5.6.8_1 +libr_syscall.so.5.6.8 radare2-5.6.8_1 +libr_crypto.so.5.6.8 radare2-5.6.8_1 +libr_fs.so.5.6.8 radare2-5.6.8_1 +libr_magic.so.5.6.8 radare2-5.6.8_1 +libr_reg.so.5.6.8 radare2-5.6.8_1 +libr_main.so.5.6.8 radare2-5.6.8_1 libykpiv.so.1 libykpiv-2.1.1_2 libykcs11.so.1 libykcs11-2.1.1_2 libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1 diff --git a/srcpkgs/radare2-devel b/srcpkgs/radare2-devel new file mode 120000 index 000000000000..fef4c7d8311a --- /dev/null +++ b/srcpkgs/radare2-devel @@ -0,0 +1 @@ +radare2 \ No newline at end of file diff --git a/srcpkgs/radare2/patches/sys_openssl.patch b/srcpkgs/radare2/patches/sys_openssl.patch new file mode 100644 index 000000000000..1711c75aaa85 --- /dev/null +++ b/srcpkgs/radare2/patches/sys_openssl.patch @@ -0,0 +1,21 @@ +From bdaff5a9fdd628482cd03a384a8804f228eecf9a Mon Sep 17 00:00:00 2001 +From: ypsvlq <86775241+ypsvlq@users.noreply.github.com> +Date: Tue, 10 May 2022 08:24:14 +0100 +Subject: [PATCH] Fix meson build with use_sys_openssl ##build + +--- + libr/socket/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/libr/socket/meson.build b/libr/socket/meson.build +index 4e8614e9e57b..135c7b50efb9 100644 +--- a/libr/socket/meson.build ++++ b/libr/socket/meson.build +@@ -20,7 +20,6 @@ endif + + if use_sys_openssl + r_util_deps += [sys_openssl] +- r_util_static_deps += [sys_openssl] + endif + + r_socket = library('r_socket', r_socket_sources, diff --git a/srcpkgs/radare2/patches/try.patch b/srcpkgs/radare2/patches/try.patch deleted file mode 100644 index 332d9e083192..000000000000 --- a/srcpkgs/radare2/patches/try.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/shlr/Makefile 2020-12-21 09:39:46.000000000 +0100 -+++ b/shlr/Makefile 2021-01-04 22:13:43.513442861 +0100 -@@ -122,7 +122,7 @@ - SDB_LIBA=sdb/src/libsdb.a - - $(SDB_HOST): -- $(MAKE) sdb-host HOST_CC=$(HOST_CC) CC=$(HOST_CC) -+ $(MAKE) sdb-host HOST_CC=$(HOST_CC) CC=$(HOST_CC) LD=ld - - $(SDB_LIBA): - $(MAKE) sdb-target -@@ -136,7 +136,7 @@ - @echo ">>>>>>>>" - @echo - $(MAKE) -C sdb clean ; rm -f sdb/src/*.o sdb/src/sdb_version.h -- $(MAKE) -C sdb/src "CC=${HOST_CC}" LDFLAGS='${HOST_LDFLAGS}' CPPFLAGS='' CFLAGS='${HOST_CFLAGS} ${PIC}' bin -+ $(MAKE) -C sdb/src "CC=${HOST_CC}" "LD=ld" LDFLAGS='${HOST_LDFLAGS}' CPPFLAGS='' CFLAGS='${HOST_CFLAGS} ${PIC}' bin - cp -f sdb/src/sdb${BUILD_EXT_EXE} sdb/src/.sdb${BUILD_EXT_EXE} - cp -f sdb/src/sdb${BUILD_EXT_EXE} sdb/sdb$(BUILD_EXT_EXE) - -file sdb/sdb$(BUILD_EXT_EXE) diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template index 39818e99e7f2..9baabf500146 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,19 +1,32 @@ # Template file for 'radare2' -# cutter needs to be bumped when radare2 is updated pkgname=radare2 -version=5.0.0 +version=5.6.8 revision=1 build_style=meson -configure_args="-Duse_sys_capstone=true -Denable_tests=false" +configure_args="-Denable_tests=false -Duse_sys_capstone=true + -Duse_sys_magic=true -Duse_sys_xxhash=true + -Duse_ssl=true -Duse_sys_openssl=true -Duse_libuv=true + -Duse_sys_zlib=true -Duse_sys_zip=true -Duse_sys_lz4=true" hostmakedepends="pkg-config" -makedepends="capstone-devel" +makedepends="capstone-devel file-devel xxHash-devel openssl-devel libuv-devel + zlib-devel libzip-devel liblz4-devel" short_desc="Advanced command line debugger and hexadecimal editor" maintainer="Orphaned " license="LGPL-3.0-only" -homepage="http://www.radare.org" +homepage="https://www.radare.org" distfiles="https://github.com/radareorg/radare2/archive/${version}.tar.gz" -checksum=517dd80ebd0569f31498887338eacb92e8cf054bc4625eef8ffe9ea174c1adae +checksum=320d4f4733402cbc38303c7d37db04716e4376138da44d3664bb73adbdd77e0c case "$XBPS_TARGET_MACHINE" in mips*) CFLAGS="-Os";; esac + +radare2-devel_package() { + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +}