[-- Attachment #1: Type: text/plain, Size: 1208 bytes --] There is a new pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages radare2 https://github.com/void-linux/void-packages/pull/35976 radare2: update to 5.6.4. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35976.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-radare2-35976.patch --] [-- Type: text/x-diff, Size: 3983 bytes --] From e4eb935d8d7db6158287ecd792131325e5e9a74c Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> Date: Sat, 5 Mar 2022 02:47:33 +0000 Subject: [PATCH] radare2: update to 5.6.4. --- common/shlibs | 45 ++++++++++++++++++++-------------------- srcpkgs/radare2/template | 25 ++++++++++++++++------ 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/common/shlibs b/common/shlibs index 250e1e0b8cb5..c5ee515c902b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3179,28 +3179,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.4 radare2-5.6.4_1 +libr_config.so.5.6.4 radare2-5.6.4_1 +libr_cons.so.5.6.4 radare2-5.6.4_1 +libr_util.so.5.6.4 radare2-5.6.4_1 +libr_flag.so.5.6.4 radare2-5.6.4_1 +libr_asm.so.5.6.4 radare2-5.6.4_1 +libr_bin.so.5.6.4 radare2-5.6.4_1 +libr_anal.so.5.6.4 radare2-5.6.4_1 +libr_lang.so.5.6.4 radare2-5.6.4_1 +libr_debug.so.5.6.4 radare2-5.6.4_1 +libr_egg.so.5.6.4 radare2-5.6.4_1 +libr_bp.so.5.6.4 radare2-5.6.4_1 +libr_search.so.5.6.4 radare2-5.6.4_1 +libr_io.so.5.6.4 radare2-5.6.4_1 +libr_hash.so.5.6.4 radare2-5.6.4_1 +libr_socket.so.5.6.4 radare2-5.6.4_1 +libr_parse.so.5.6.4 radare2-5.6.4_1 +libr_syscall.so.5.6.4 radare2-5.6.4_1 +libr_crypto.so.5.6.4 radare2-5.6.4_1 +libr_fs.so.5.6.4 radare2-5.6.4_1 +libr_magic.so.5.6.4 radare2-5.6.4_1 +libr_reg.so.5.6.4 radare2-5.6.4_1 +libr_main.so.5.6.4 radare2-5.6.4_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/template b/srcpkgs/radare2/template index 39818e99e7f2..4851d4d9a0be 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 +# iaito needs to be bumped when radare2 is updated pkgname=radare2 -version=5.0.0 +version=5.6.4 revision=1 build_style=meson -configure_args="-Duse_sys_capstone=true -Denable_tests=false" +configure_args="-Duse_ssl=true -Duse_sys_openssl=true + -Duse_sys_capstone=true -Duse_sys_magic=true -Duse_sys_lz4=true + -Duse_sys_zip=true -Duse_sys_xxhash=true -Denable_tests=false" hostmakedepends="pkg-config" -makedepends="capstone-devel" +makedepends="openssl-devel capstone-devel liblz4-devel libzip-devel + xxHash-devel file-devel libuv-devel" short_desc="Advanced command line debugger and hexadecimal editor" maintainer="Orphaned <orphan@voidlinux.org>" 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=f001b98be56292845c90621fc60114ca629b6b652e2b900f2de646bbd419e008 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" + } +}
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --] There is an updated pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages radare2 https://github.com/void-linux/void-packages/pull/35976 radare2: update to 5.6.4. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35976.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-radare2-35976.patch --] [-- Type: text/x-diff, Size: 4264 bytes --] From ac6d86d04127d29d589b4768b517ae01c0febaaf Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> Date: Sat, 5 Mar 2022 03:08:27 +0000 Subject: [PATCH] radare2: update to 5.6.4. --- common/shlibs | 45 ++++++++++++++++++++-------------------- srcpkgs/radare2-devel | 1 + srcpkgs/radare2/template | 25 ++++++++++++++++------ 3 files changed, 43 insertions(+), 28 deletions(-) create mode 120000 srcpkgs/radare2-devel diff --git a/common/shlibs b/common/shlibs index 250e1e0b8cb5..c5ee515c902b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3179,28 +3179,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.4 radare2-5.6.4_1 +libr_config.so.5.6.4 radare2-5.6.4_1 +libr_cons.so.5.6.4 radare2-5.6.4_1 +libr_util.so.5.6.4 radare2-5.6.4_1 +libr_flag.so.5.6.4 radare2-5.6.4_1 +libr_asm.so.5.6.4 radare2-5.6.4_1 +libr_bin.so.5.6.4 radare2-5.6.4_1 +libr_anal.so.5.6.4 radare2-5.6.4_1 +libr_lang.so.5.6.4 radare2-5.6.4_1 +libr_debug.so.5.6.4 radare2-5.6.4_1 +libr_egg.so.5.6.4 radare2-5.6.4_1 +libr_bp.so.5.6.4 radare2-5.6.4_1 +libr_search.so.5.6.4 radare2-5.6.4_1 +libr_io.so.5.6.4 radare2-5.6.4_1 +libr_hash.so.5.6.4 radare2-5.6.4_1 +libr_socket.so.5.6.4 radare2-5.6.4_1 +libr_parse.so.5.6.4 radare2-5.6.4_1 +libr_syscall.so.5.6.4 radare2-5.6.4_1 +libr_crypto.so.5.6.4 radare2-5.6.4_1 +libr_fs.so.5.6.4 radare2-5.6.4_1 +libr_magic.so.5.6.4 radare2-5.6.4_1 +libr_reg.so.5.6.4 radare2-5.6.4_1 +libr_main.so.5.6.4 radare2-5.6.4_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/template b/srcpkgs/radare2/template index 39818e99e7f2..4851d4d9a0be 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 +# iaito needs to be bumped when radare2 is updated pkgname=radare2 -version=5.0.0 +version=5.6.4 revision=1 build_style=meson -configure_args="-Duse_sys_capstone=true -Denable_tests=false" +configure_args="-Duse_ssl=true -Duse_sys_openssl=true + -Duse_sys_capstone=true -Duse_sys_magic=true -Duse_sys_lz4=true + -Duse_sys_zip=true -Duse_sys_xxhash=true -Denable_tests=false" hostmakedepends="pkg-config" -makedepends="capstone-devel" +makedepends="openssl-devel capstone-devel liblz4-devel libzip-devel + xxHash-devel file-devel libuv-devel" short_desc="Advanced command line debugger and hexadecimal editor" maintainer="Orphaned <orphan@voidlinux.org>" 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=f001b98be56292845c90621fc60114ca629b6b652e2b900f2de646bbd419e008 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" + } +}
[-- Attachment #1: Type: text/plain, Size: 220 bytes --] New review comment by tibequadorian on void-packages repository https://github.com/void-linux/void-packages/pull/35976#discussion_r828428772 Comment: We don't have iaito in our repositories. Did you know about #33608?
[-- Attachment #1: Type: text/plain, Size: 186 bytes --] New review comment by tibequadorian on void-packages repository https://github.com/void-linux/void-packages/pull/35976#discussion_r828430306 Comment: And what should happen to cutter?
[-- Attachment #1: Type: text/plain, Size: 468 bytes --] New review comment by ypsvlq on void-packages repository https://github.com/void-linux/void-packages/pull/35976#discussion_r828467580 Comment: > We don't have iaito in our repositories. Did you know about #33608? Yes, iaito currently can't build against r2 so I didn't include it. I left the comment in for the future, can be removed if you'd rather. > And what should happen to cutter? Cutter has already been updated and no longer depends on r2 (#35901).
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --] There is an updated pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages radare2 https://github.com/void-linux/void-packages/pull/35976 radare2: update to 5.6.4. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35976.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-radare2-35976.patch --] [-- Type: text/x-diff, Size: 4356 bytes --] From 74b9554523238a66fe6c06aee342f8f79cd7eeb9 Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> Date: Fri, 25 Mar 2022 23:55:48 +0000 Subject: [PATCH] radare2: update to 5.6.6. --- common/shlibs | 45 ++++++++++++++++++++-------------------- srcpkgs/radare2-devel | 1 + srcpkgs/radare2/template | 29 ++++++++++++++++++++------ 3 files changed, 47 insertions(+), 28 deletions(-) create mode 120000 srcpkgs/radare2-devel diff --git a/common/shlibs b/common/shlibs index 7d323593a120..8bb019b9f0e9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3179,28 +3179,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.6 radare2-5.6.6_1 +libr_config.so.5.6.6 radare2-5.6.6_1 +libr_cons.so.5.6.6 radare2-5.6.6_1 +libr_util.so.5.6.6 radare2-5.6.6_1 +libr_flag.so.5.6.6 radare2-5.6.6_1 +libr_asm.so.5.6.6 radare2-5.6.6_1 +libr_bin.so.5.6.6 radare2-5.6.6_1 +libr_anal.so.5.6.6 radare2-5.6.6_1 +libr_lang.so.5.6.6 radare2-5.6.6_1 +libr_debug.so.5.6.6 radare2-5.6.6_1 +libr_egg.so.5.6.6 radare2-5.6.6_1 +libr_bp.so.5.6.6 radare2-5.6.6_1 +libr_search.so.5.6.6 radare2-5.6.6_1 +libr_io.so.5.6.6 radare2-5.6.6_1 +libr_hash.so.5.6.6 radare2-5.6.6_1 +libr_socket.so.5.6.6 radare2-5.6.6_1 +libr_parse.so.5.6.6 radare2-5.6.6_1 +libr_syscall.so.5.6.6 radare2-5.6.6_1 +libr_crypto.so.5.6.6 radare2-5.6.6_1 +libr_fs.so.5.6.6 radare2-5.6.6_1 +libr_magic.so.5.6.6 radare2-5.6.6_1 +libr_reg.so.5.6.6 radare2-5.6.6_1 +libr_main.so.5.6.6 radare2-5.6.6_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/template b/srcpkgs/radare2/template index 39818e99e7f2..5cd990b900ca 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,19 +1,36 @@ # Template file for 'radare2' -# cutter needs to be bumped when radare2 is updated +# iaito needs to be bumped when radare2 is updated pkgname=radare2 -version=5.0.0 +version=5.6.6 revision=1 build_style=meson -configure_args="-Duse_sys_capstone=true -Denable_tests=false" +configure_args="-Duse_ssl=true -Duse_sys_openssl=true + -Duse_sys_capstone=true -Duse_sys_magic=true -Duse_sys_lz4=true + -Duse_sys_zip=true -Duse_sys_xxhash=true -Denable_tests=false" hostmakedepends="pkg-config" -makedepends="capstone-devel" +makedepends="openssl-devel capstone-devel liblz4-devel libzip-devel + xxHash-devel file-devel libuv-devel" short_desc="Advanced command line debugger and hexadecimal editor" maintainer="Orphaned <orphan@voidlinux.org>" 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=ef934b786cce10bf16e9e0b0fd3b3d338af33a83ae83bbd50101facc39549961 case "$XBPS_TARGET_MACHINE" in mips*) CFLAGS="-Os";; esac + +pre_configure() { + sed -i -e '/^ r_util_static_deps/d' libr/socket/meson.build +} + +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" + } +}
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --] There is an updated pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages radare2 https://github.com/void-linux/void-packages/pull/35976 radare2: update to 5.6.4. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35976.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-radare2-35976.patch --] [-- Type: text/x-diff, Size: 4303 bytes --] From a500df433471f2c007ad309426f8640713978dcc Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> Date: Fri, 25 Mar 2022 23:55:48 +0000 Subject: [PATCH] radare2: update to 5.6.6. --- common/shlibs | 45 ++++++++++++++++++++-------------------- srcpkgs/radare2-devel | 1 + srcpkgs/radare2/template | 28 +++++++++++++++++++------ 3 files changed, 46 insertions(+), 28 deletions(-) create mode 120000 srcpkgs/radare2-devel diff --git a/common/shlibs b/common/shlibs index 7d323593a120..8bb019b9f0e9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3179,28 +3179,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.6 radare2-5.6.6_1 +libr_config.so.5.6.6 radare2-5.6.6_1 +libr_cons.so.5.6.6 radare2-5.6.6_1 +libr_util.so.5.6.6 radare2-5.6.6_1 +libr_flag.so.5.6.6 radare2-5.6.6_1 +libr_asm.so.5.6.6 radare2-5.6.6_1 +libr_bin.so.5.6.6 radare2-5.6.6_1 +libr_anal.so.5.6.6 radare2-5.6.6_1 +libr_lang.so.5.6.6 radare2-5.6.6_1 +libr_debug.so.5.6.6 radare2-5.6.6_1 +libr_egg.so.5.6.6 radare2-5.6.6_1 +libr_bp.so.5.6.6 radare2-5.6.6_1 +libr_search.so.5.6.6 radare2-5.6.6_1 +libr_io.so.5.6.6 radare2-5.6.6_1 +libr_hash.so.5.6.6 radare2-5.6.6_1 +libr_socket.so.5.6.6 radare2-5.6.6_1 +libr_parse.so.5.6.6 radare2-5.6.6_1 +libr_syscall.so.5.6.6 radare2-5.6.6_1 +libr_crypto.so.5.6.6 radare2-5.6.6_1 +libr_fs.so.5.6.6 radare2-5.6.6_1 +libr_magic.so.5.6.6 radare2-5.6.6_1 +libr_reg.so.5.6.6 radare2-5.6.6_1 +libr_main.so.5.6.6 radare2-5.6.6_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/template b/srcpkgs/radare2/template index 39818e99e7f2..2581c5acc523 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,19 +1,35 @@ # Template file for 'radare2' -# cutter needs to be bumped when radare2 is updated pkgname=radare2 -version=5.0.0 +version=5.6.6 revision=1 build_style=meson -configure_args="-Duse_sys_capstone=true -Denable_tests=false" +configure_args="-Duse_ssl=true -Duse_sys_openssl=true + -Duse_sys_capstone=true -Duse_sys_magic=true -Duse_sys_lz4=true + -Duse_sys_zip=true -Duse_sys_xxhash=true -Denable_tests=false" hostmakedepends="pkg-config" -makedepends="capstone-devel" +makedepends="openssl-devel capstone-devel liblz4-devel libzip-devel + xxHash-devel file-devel libuv-devel" short_desc="Advanced command line debugger and hexadecimal editor" maintainer="Orphaned <orphan@voidlinux.org>" 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=ef934b786cce10bf16e9e0b0fd3b3d338af33a83ae83bbd50101facc39549961 case "$XBPS_TARGET_MACHINE" in mips*) CFLAGS="-Os";; esac + +pre_configure() { + sed -i -e '/^ r_util_static_deps/d' libr/socket/meson.build +} + +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" + } +}
[-- Attachment #1: Type: text/plain, Size: 171 bytes --] New comment by ypsvlq on void-packages repository https://github.com/void-linux/void-packages/pull/35976#issuecomment-1092145577 Comment: Ugh, I'll rebase when I'm home
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --] There is an updated pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages radare2 https://github.com/void-linux/void-packages/pull/35976 radare2: update to 5.6.6. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35976.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-radare2-35976.patch --] [-- Type: text/x-diff, Size: 4303 bytes --] From 02cf1e4d950e63aaaa05f7508cee3baebecc0f56 Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> Date: Fri, 25 Mar 2022 23:55:48 +0000 Subject: [PATCH] radare2: update to 5.6.6. --- common/shlibs | 45 ++++++++++++++++++++-------------------- srcpkgs/radare2-devel | 1 + srcpkgs/radare2/template | 28 +++++++++++++++++++------ 3 files changed, 46 insertions(+), 28 deletions(-) create mode 120000 srcpkgs/radare2-devel diff --git a/common/shlibs b/common/shlibs index 848b488bb2d0..0e782d39ff2f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3180,28 +3180,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.6 radare2-5.6.6_1 +libr_config.so.5.6.6 radare2-5.6.6_1 +libr_cons.so.5.6.6 radare2-5.6.6_1 +libr_util.so.5.6.6 radare2-5.6.6_1 +libr_flag.so.5.6.6 radare2-5.6.6_1 +libr_asm.so.5.6.6 radare2-5.6.6_1 +libr_bin.so.5.6.6 radare2-5.6.6_1 +libr_anal.so.5.6.6 radare2-5.6.6_1 +libr_lang.so.5.6.6 radare2-5.6.6_1 +libr_debug.so.5.6.6 radare2-5.6.6_1 +libr_egg.so.5.6.6 radare2-5.6.6_1 +libr_bp.so.5.6.6 radare2-5.6.6_1 +libr_search.so.5.6.6 radare2-5.6.6_1 +libr_io.so.5.6.6 radare2-5.6.6_1 +libr_hash.so.5.6.6 radare2-5.6.6_1 +libr_socket.so.5.6.6 radare2-5.6.6_1 +libr_parse.so.5.6.6 radare2-5.6.6_1 +libr_syscall.so.5.6.6 radare2-5.6.6_1 +libr_crypto.so.5.6.6 radare2-5.6.6_1 +libr_fs.so.5.6.6 radare2-5.6.6_1 +libr_magic.so.5.6.6 radare2-5.6.6_1 +libr_reg.so.5.6.6 radare2-5.6.6_1 +libr_main.so.5.6.6 radare2-5.6.6_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/template b/srcpkgs/radare2/template index 39818e99e7f2..2581c5acc523 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,19 +1,35 @@ # Template file for 'radare2' -# cutter needs to be bumped when radare2 is updated pkgname=radare2 -version=5.0.0 +version=5.6.6 revision=1 build_style=meson -configure_args="-Duse_sys_capstone=true -Denable_tests=false" +configure_args="-Duse_ssl=true -Duse_sys_openssl=true + -Duse_sys_capstone=true -Duse_sys_magic=true -Duse_sys_lz4=true + -Duse_sys_zip=true -Duse_sys_xxhash=true -Denable_tests=false" hostmakedepends="pkg-config" -makedepends="capstone-devel" +makedepends="openssl-devel capstone-devel liblz4-devel libzip-devel + xxHash-devel file-devel libuv-devel" short_desc="Advanced command line debugger and hexadecimal editor" maintainer="Orphaned <orphan@voidlinux.org>" 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=ef934b786cce10bf16e9e0b0fd3b3d338af33a83ae83bbd50101facc39549961 case "$XBPS_TARGET_MACHINE" in mips*) CFLAGS="-Os";; esac + +pre_configure() { + sed -i -e '/^ r_util_static_deps/d' libr/socket/meson.build +} + +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" + } +}
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --] There is an updated pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages radare2 https://github.com/void-linux/void-packages/pull/35976 radare2: update to 5.6.8. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35976.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-radare2-35976.patch --] [-- Type: text/x-diff, Size: 4303 bytes --] From aa18d0ba31716c6f19b922f5bf0ebf5e90c8bb6e Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> 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/template | 28 +++++++++++++++++++------ 3 files changed, 46 insertions(+), 28 deletions(-) create mode 120000 srcpkgs/radare2-devel diff --git a/common/shlibs b/common/shlibs index 073830fc1442..e0452f10a31c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3181,28 +3181,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/template b/srcpkgs/radare2/template index 39818e99e7f2..a64c56a88151 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,19 +1,35 @@ # 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="-Duse_ssl=true -Duse_sys_openssl=true + -Duse_sys_capstone=true -Duse_sys_magic=true -Duse_sys_lz4=true + -Duse_sys_zip=true -Duse_sys_xxhash=true -Denable_tests=false" hostmakedepends="pkg-config" -makedepends="capstone-devel" +makedepends="openssl-devel capstone-devel liblz4-devel libzip-devel + xxHash-devel file-devel libuv-devel" short_desc="Advanced command line debugger and hexadecimal editor" maintainer="Orphaned <orphan@voidlinux.org>" 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 + +pre_configure() { + sed -i -e '/^ r_util_static_deps/d' libr/socket/meson.build +} + +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" + } +}
[-- Attachment #1: Type: text/plain, Size: 175 bytes --] New comment by ypsvlq on void-packages repository https://github.com/void-linux/void-packages/pull/35976#issuecomment-1108417239 Comment: Seems to just be an issue with CI?
[-- Attachment #1: Type: text/plain, Size: 215 bytes --] New comment by ypsvlq on void-packages repository https://github.com/void-linux/void-packages/pull/35976#issuecomment-1108417239 Comment: Seems to just be an issue with CI? armv6l-musl builds fine for me locally.
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --] There is an updated pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages radare2 https://github.com/void-linux/void-packages/pull/35976 radare2: update to 5.6.8. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35976.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-radare2-35976.patch --] [-- Type: text/x-diff, Size: 4303 bytes --] From b34043868d46f31c5697849511e37ef2f49610d8 Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> 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/template | 28 +++++++++++++++++++------ 3 files changed, 46 insertions(+), 28 deletions(-) create mode 120000 srcpkgs/radare2-devel diff --git a/common/shlibs b/common/shlibs index 4114151662fb..7e33a4d65484 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/template b/srcpkgs/radare2/template index 39818e99e7f2..a64c56a88151 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,19 +1,35 @@ # 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="-Duse_ssl=true -Duse_sys_openssl=true + -Duse_sys_capstone=true -Duse_sys_magic=true -Duse_sys_lz4=true + -Duse_sys_zip=true -Duse_sys_xxhash=true -Denable_tests=false" hostmakedepends="pkg-config" -makedepends="capstone-devel" +makedepends="openssl-devel capstone-devel liblz4-devel libzip-devel + xxHash-devel file-devel libuv-devel" short_desc="Advanced command line debugger and hexadecimal editor" maintainer="Orphaned <orphan@voidlinux.org>" 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 + +pre_configure() { + sed -i -e '/^ r_util_static_deps/d' libr/socket/meson.build +} + +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" + } +}
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --] There is an updated pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages radare2 https://github.com/void-linux/void-packages/pull/35976 radare2: update to 5.6.8. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35976.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-radare2-35976.patch --] [-- Type: text/x-diff, Size: 5526 bytes --] From 1c833367fa9fdfa2e2591cca348dbeaa03f1f19c Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> 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/try.patch | 20 -------------- srcpkgs/radare2/template | 29 +++++++++++++++----- 4 files changed, 47 insertions(+), 48 deletions(-) create mode 120000 srcpkgs/radare2-devel delete mode 100644 srcpkgs/radare2/patches/try.patch diff --git a/common/shlibs b/common/shlibs index 784375c7c9aa..719a41c61e65 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3185,28 +3185,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/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..1b6b5a615b38 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,19 +1,36 @@ # 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 <orphan@voidlinux.org>" 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 + +pre_configure() { + sed -i -e '/^ r_util_static_deps/d' libr/socket/meson.build +} + +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" + } +}
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --] There is an updated pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages radare2 https://github.com/void-linux/void-packages/pull/35976 radare2: update to 5.6.8. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35976.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-radare2-35976.patch --] [-- Type: text/x-diff, Size: 5526 bytes --] From 7ba27f2048d01fc6225e17a6d044fb0f7583e92e Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> 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/try.patch | 20 -------------- srcpkgs/radare2/template | 29 +++++++++++++++----- 4 files changed, 47 insertions(+), 48 deletions(-) create mode 120000 srcpkgs/radare2-devel delete mode 100644 srcpkgs/radare2/patches/try.patch diff --git a/common/shlibs b/common/shlibs index d75ecdda38dc..415421385351 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/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..1b6b5a615b38 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,19 +1,36 @@ # 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 <orphan@voidlinux.org>" 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 + +pre_configure() { + sed -i -e '/^ r_util_static_deps/d' libr/socket/meson.build +} + +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" + } +}
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --] There is an updated pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages radare2 https://github.com/void-linux/void-packages/pull/35976 radare2: update to 5.6.8. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35976.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-radare2-35976.patch --] [-- Type: text/x-diff, Size: 5576 bytes --] From 9197d90603109c647d3435751ac799b40a219147 Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> 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/try.patch | 20 -------------- srcpkgs/radare2/template | 30 ++++++++++++++++----- 4 files changed, 48 insertions(+), 48 deletions(-) create mode 120000 srcpkgs/radare2-devel 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/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..918b59b1ca7d 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,19 +1,37 @@ # 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 <orphan@voidlinux.org>" 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 + +pre_configure() { + # upstream bug, will be fixed in next release + vsed -i libr/socket/meson.build -e '/^ r_util_static_deps/d' +} + +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" + } +}
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --] There is an updated pull request by ypsvlq against master on the void-packages repository https://github.com/ypsvlq/void-packages radare2 https://github.com/void-linux/void-packages/pull/35976 radare2: update to 5.6.8. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35976.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-radare2-35976.patch --] [-- Type: text/x-diff, Size: 6461 bytes --] From 86f7bd974516f89d83a3b1a553c16cb3f85ee6dc Mon Sep 17 00:00:00 2001 From: Elaine Gibson <ypsvlq@gmail.com> 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 <orphan@voidlinux.org>" 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" + } +}
[-- Attachment #1: Type: text/plain, Size: 1059 bytes --] There's a merged pull request on the void-packages repository radare2: update to 5.6.8. https://github.com/void-linux/void-packages/pull/35976 Description: <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl -->