* Re: [PR PATCH] [Updated] radare2: update to 5.0.0.
2021-01-04 19:11 [PR PATCH] radare2: update to 5.0.0 jnbr
@ 2021-01-15 22:16 ` jnbr
2021-01-17 0:17 ` jnbr
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: jnbr @ 2021-01-15 22:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by jnbr against master on the void-packages repository
https://github.com/jnbr/void-packages radare2
https://github.com/void-linux/void-packages/pull/27665
radare2: update to 5.0.0.
A patch file from https://github.com/void-linux/void-packages/pull/27665.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-radare2-27665.patch --]
[-- Type: text/x-diff, Size: 2776 bytes --]
From 130880bd4479a942b182969cde5c00eb5c5cee30 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 15 Jan 2021 23:08:39 +0100
Subject: [PATCH 1/2] radare2: update to 5.0.0.
also switch to meson
---
srcpkgs/radare2/patches/trust-cc.patch | 13 -------------
srcpkgs/radare2/template | 8 ++++----
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/radare2/patches/trust-cc.patch
diff --git a/srcpkgs/radare2/patches/trust-cc.patch b/srcpkgs/radare2/patches/trust-cc.patch
deleted file mode 100644
index fc9c3c6e355..00000000000
--- a/srcpkgs/radare2/patches/trust-cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig
-+++ configure
-@@ -330,10 +330,6 @@
- COMPILER=CC
- printf "checking for c compiler... "
- HAVE_LANG_C=1
--if [ "${CROSSBUILD}" = 1 ]; then
-- (command -v ${HOST}-${CC} >/dev/null 2>&1)
-- if [ $? = 0 ]; then CC="${HOST}-${CC}"; fi
--fi
- echo "int main(int argc, char **argv){return 0;}" > test.c
- (exec ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c >/dev/null 2>&1)
- if [ $? = 0 ]; then echo ${CC}; else
diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template
index 3046be71cf5..7f8d753aae4 100644
--- a/srcpkgs/radare2/template
+++ b/srcpkgs/radare2/template
@@ -1,10 +1,10 @@
# Template file for 'radare2'
# cutter needs to be bumped when radare2 is updated
pkgname=radare2
-version=4.5.1
+version=5.0.0
revision=1
-build_style=gnu-configure
-configure_args="--with-syscapstone"
+build_style=meson
+configure_args="-Duse_sys_capstone=true"
hostmakedepends="pkg-config"
makedepends="capstone-devel"
short_desc="Advanced command line debugger and hexadecimal editor"
@@ -12,7 +12,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
license="LGPL-3.0-only"
homepage="http://www.radare.org"
distfiles="https://github.com/radareorg/radare2/archive/${version}.tar.gz"
-checksum=4e85b35987bd2ca5881ad9585970b970fe7374814bd383bd1cd62e961a0c228b
+checksum=517dd80ebd0569f31498887338eacb92e8cf054bc4625eef8ffe9ea174c1adae
case "$XBPS_TARGET_MACHINE" in
mips*) CFLAGS="-Os";;
From eeac57a90c48f70da5e7d76ae93230ec9be3095f Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 15 Jan 2021 23:09:25 +0100
Subject: [PATCH 2/2] cutter: rebuild for radare2-5.0.0
---
srcpkgs/cutter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index f0dadb5d5dd..646d7b64bab 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,7 +1,7 @@
# Template file for 'cutter'
pkgname=cutter
version=1.12.0
-revision=1
+revision=2
build_wrksrc=src
build_style=qmake
configure_args="CUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/RadareOrg/Cutter/plugins"
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Updated] radare2: update to 5.0.0.
2021-01-04 19:11 [PR PATCH] radare2: update to 5.0.0 jnbr
2021-01-15 22:16 ` [PR PATCH] [Updated] " jnbr
@ 2021-01-17 0:17 ` jnbr
2021-01-17 10:39 ` jnbr
2021-01-17 11:06 ` [PR PATCH] [Merged]: " jnbr
3 siblings, 0 replies; 5+ messages in thread
From: jnbr @ 2021-01-17 0:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by jnbr against master on the void-packages repository
https://github.com/jnbr/void-packages radare2
https://github.com/void-linux/void-packages/pull/27665
radare2: update to 5.0.0.
A patch file from https://github.com/void-linux/void-packages/pull/27665.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-radare2-27665.patch --]
[-- Type: text/x-diff, Size: 3959 bytes --]
From a0645abfcbb0e81e9b78aae38472a4277f5bce55 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 15 Jan 2021 23:08:39 +0100
Subject: [PATCH 1/2] radare2: update to 5.0.0.
also switch to meson
---
srcpkgs/radare2/patches/trust-cc.patch | 13 -------------
srcpkgs/radare2/patches/try.patch | 20 ++++++++++++++++++++
srcpkgs/radare2/template | 8 ++++----
3 files changed, 24 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/radare2/patches/trust-cc.patch
create mode 100644 srcpkgs/radare2/patches/try.patch
diff --git a/srcpkgs/radare2/patches/trust-cc.patch b/srcpkgs/radare2/patches/trust-cc.patch
deleted file mode 100644
index fc9c3c6e355..00000000000
--- a/srcpkgs/radare2/patches/trust-cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig
-+++ configure
-@@ -330,10 +330,6 @@
- COMPILER=CC
- printf "checking for c compiler... "
- HAVE_LANG_C=1
--if [ "${CROSSBUILD}" = 1 ]; then
-- (command -v ${HOST}-${CC} >/dev/null 2>&1)
-- if [ $? = 0 ]; then CC="${HOST}-${CC}"; fi
--fi
- echo "int main(int argc, char **argv){return 0;}" > test.c
- (exec ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c >/dev/null 2>&1)
- if [ $? = 0 ]; then echo ${CC}; else
diff --git a/srcpkgs/radare2/patches/try.patch b/srcpkgs/radare2/patches/try.patch
new file mode 100644
index 00000000000..32ecdb33973
--- /dev/null
+++ b/srcpkgs/radare2/patches/try.patch
@@ -0,0 +1,20 @@
+--- shlr/Makefile 2020-12-21 09:39:46.000000000 +0100
++++ 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 3046be71cf5..1f4601b46a2 100644
--- a/srcpkgs/radare2/template
+++ b/srcpkgs/radare2/template
@@ -1,10 +1,10 @@
# Template file for 'radare2'
# cutter needs to be bumped when radare2 is updated
pkgname=radare2
-version=4.5.1
+version=5.0.0
revision=1
-build_style=gnu-configure
-configure_args="--with-syscapstone"
+build_style=meson
+configure_args="-Duse_sys_capstone=true -Denable_tests=false"
hostmakedepends="pkg-config"
makedepends="capstone-devel"
short_desc="Advanced command line debugger and hexadecimal editor"
@@ -12,7 +12,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
license="LGPL-3.0-only"
homepage="http://www.radare.org"
distfiles="https://github.com/radareorg/radare2/archive/${version}.tar.gz"
-checksum=4e85b35987bd2ca5881ad9585970b970fe7374814bd383bd1cd62e961a0c228b
+checksum=517dd80ebd0569f31498887338eacb92e8cf054bc4625eef8ffe9ea174c1adae
case "$XBPS_TARGET_MACHINE" in
mips*) CFLAGS="-Os";;
From b70b05a029dd2152d40322acdaaeef16de7846af Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 15 Jan 2021 23:09:25 +0100
Subject: [PATCH 2/2] cutter: rebuild for radare2-5.0.0
---
srcpkgs/cutter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index f0dadb5d5dd..646d7b64bab 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,7 +1,7 @@
# Template file for 'cutter'
pkgname=cutter
version=1.12.0
-revision=1
+revision=2
build_wrksrc=src
build_style=qmake
configure_args="CUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/RadareOrg/Cutter/plugins"
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Updated] radare2: update to 5.0.0.
2021-01-04 19:11 [PR PATCH] radare2: update to 5.0.0 jnbr
2021-01-15 22:16 ` [PR PATCH] [Updated] " jnbr
2021-01-17 0:17 ` jnbr
@ 2021-01-17 10:39 ` jnbr
2021-01-17 11:06 ` [PR PATCH] [Merged]: " jnbr
3 siblings, 0 replies; 5+ messages in thread
From: jnbr @ 2021-01-17 10:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by jnbr against master on the void-packages repository
https://github.com/jnbr/void-packages radare2
https://github.com/void-linux/void-packages/pull/27665
radare2: update to 5.0.0.
A patch file from https://github.com/void-linux/void-packages/pull/27665.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-radare2-27665.patch --]
[-- Type: text/x-diff, Size: 5896 bytes --]
From cab0639348253085082f9cbb0992fcf7a91ffe67 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 15 Jan 2021 23:08:39 +0100
Subject: [PATCH 1/2] radare2: update to 5.0.0.
also switch to meson
---
common/shlibs | 44 +++++++++++++-------------
srcpkgs/radare2/patches/trust-cc.patch | 13 --------
srcpkgs/radare2/patches/try.patch | 20 ++++++++++++
srcpkgs/radare2/template | 8 ++---
4 files changed, 46 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/radare2/patches/trust-cc.patch
create mode 100644 srcpkgs/radare2/patches/try.patch
diff --git a/common/shlibs b/common/shlibs
index 5e6a8d0c6ec..cee41294547 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3197,28 +3197,28 @@ libkdeconnectinterfaces.so.1 kdeconnect-1.2_1
libkdeconnectcore.so.1 kdeconnect-1.2_1
libkpmcore.so.10 kpmcore-4.2.0_1
libpkcs11-helper.so.1 pkcs11-helper-1.22_1
-libr_core.so radare2-2.2.0_1
-libr_config.so radare2-2.2.0_1
-libr_cons.so radare2-2.2.0_1
-libr_util.so radare2-2.2.0_1
-libr_flag.so radare2-2.2.0_1
-libr_asm.so radare2-2.2.0_1
-libr_bin.so radare2-2.2.0_1
-libr_anal.so radare2-2.2.0_1
-libr_lang.so radare2-2.2.0_1
-libr_debug.so radare2-2.2.0_1
-libr_egg.so radare2-2.2.0_1
-libr_bp.so radare2-2.2.0_1
-libr_search.so radare2-2.2.0_1
-libr_io.so radare2-2.2.0_1
-libr_hash.so radare2-2.2.0_1
-libr_socket.so radare2-2.2.0_1
-libr_parse.so radare2-2.2.0_1
-libr_syscall.so radare2-2.2.0_1
-libr_crypto.so radare2-2.2.0_1
-libr_fs.so radare2-2.2.0_1
-libr_magic.so radare2-2.2.0_1
-libr_reg.so radare2-2.2.0_1
+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
libykpiv.so.1 libykpiv-1.5.0_1
libykcs11.so.1 libykcs11-1.5.0_1
libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1
diff --git a/srcpkgs/radare2/patches/trust-cc.patch b/srcpkgs/radare2/patches/trust-cc.patch
deleted file mode 100644
index fc9c3c6e355..00000000000
--- a/srcpkgs/radare2/patches/trust-cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig
-+++ configure
-@@ -330,10 +330,6 @@
- COMPILER=CC
- printf "checking for c compiler... "
- HAVE_LANG_C=1
--if [ "${CROSSBUILD}" = 1 ]; then
-- (command -v ${HOST}-${CC} >/dev/null 2>&1)
-- if [ $? = 0 ]; then CC="${HOST}-${CC}"; fi
--fi
- echo "int main(int argc, char **argv){return 0;}" > test.c
- (exec ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c >/dev/null 2>&1)
- if [ $? = 0 ]; then echo ${CC}; else
diff --git a/srcpkgs/radare2/patches/try.patch b/srcpkgs/radare2/patches/try.patch
new file mode 100644
index 00000000000..32ecdb33973
--- /dev/null
+++ b/srcpkgs/radare2/patches/try.patch
@@ -0,0 +1,20 @@
+--- shlr/Makefile 2020-12-21 09:39:46.000000000 +0100
++++ 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 3046be71cf5..1f4601b46a2 100644
--- a/srcpkgs/radare2/template
+++ b/srcpkgs/radare2/template
@@ -1,10 +1,10 @@
# Template file for 'radare2'
# cutter needs to be bumped when radare2 is updated
pkgname=radare2
-version=4.5.1
+version=5.0.0
revision=1
-build_style=gnu-configure
-configure_args="--with-syscapstone"
+build_style=meson
+configure_args="-Duse_sys_capstone=true -Denable_tests=false"
hostmakedepends="pkg-config"
makedepends="capstone-devel"
short_desc="Advanced command line debugger and hexadecimal editor"
@@ -12,7 +12,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
license="LGPL-3.0-only"
homepage="http://www.radare.org"
distfiles="https://github.com/radareorg/radare2/archive/${version}.tar.gz"
-checksum=4e85b35987bd2ca5881ad9585970b970fe7374814bd383bd1cd62e961a0c228b
+checksum=517dd80ebd0569f31498887338eacb92e8cf054bc4625eef8ffe9ea174c1adae
case "$XBPS_TARGET_MACHINE" in
mips*) CFLAGS="-Os";;
From 116850a3be6b29e805231e8bb15427385610eb7c Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 15 Jan 2021 23:09:25 +0100
Subject: [PATCH 2/2] cutter: rebuild for radare2-5.0.0
---
srcpkgs/cutter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index f0dadb5d5dd..646d7b64bab 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,7 +1,7 @@
# Template file for 'cutter'
pkgname=cutter
version=1.12.0
-revision=1
+revision=2
build_wrksrc=src
build_style=qmake
configure_args="CUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/RadareOrg/Cutter/plugins"
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Merged]: radare2: update to 5.0.0.
2021-01-04 19:11 [PR PATCH] radare2: update to 5.0.0 jnbr
` (2 preceding siblings ...)
2021-01-17 10:39 ` jnbr
@ 2021-01-17 11:06 ` jnbr
3 siblings, 0 replies; 5+ messages in thread
From: jnbr @ 2021-01-17 11:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
There's a merged pull request on the void-packages repository
radare2: update to 5.0.0.
https://github.com/void-linux/void-packages/pull/27665
Description:
^ permalink raw reply [flat|nested] 5+ messages in thread