git: 191cc66025d1 - main - devel/openocd-devel: Update g20250708 => g20250901

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Mon, 15 Sep 2025 14:10:48 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=191cc66025d1dd972ab4f6be3cf2fc9a59b78e08

commit 191cc66025d1dd972ab4f6be3cf2fc9a59b78e08
Author:     Mateusz Wiącek <wiacek.m@witia.com.pl>
AuthorDate: 2025-09-15 14:02:28 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-09-15 14:10:31 +0000

    devel/openocd-devel: Update g20250708 => g20250901
    
    Resolves failing build due to libusb API by forcing usage of malloc(3)
    and free(3).
    
    Commit log:
    https://github.com/openocd-org/openocd/compare/6872f7e40...0732a9bb7
    
    PR:     289610
---
 devel/openocd-devel/Makefile                       |  8 +++---
 devel/openocd-devel/distinfo                       | 14 +++++-----
 .../files/patch-src_jtag_drivers_libusb__helper.c  | 32 ++++++++++++++++++++++
 .../openocd-devel/files/patch-src_server_server.c  | 11 ++++++++
 devel/openocd-devel/pkg-plist                      | 32 +++++++++++++++++++---
 5 files changed, 82 insertions(+), 15 deletions(-)

diff --git a/devel/openocd-devel/Makefile b/devel/openocd-devel/Makefile
index 631c1bc5ccd9..99f5bd47107d 100644
--- a/devel/openocd-devel/Makefile
+++ b/devel/openocd-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openocd
-DISTVERSION=	g20250708
+DISTVERSION=	g20250901
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-devel
 
@@ -14,11 +14,11 @@ USES=		autoreconf gmake libtool makeinfo pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openocd-org
-GH_TAGNAME=	6872f7e40
-GH_TUPLE=	msteveb:jimtcl:f160866:jimtcl/jimtcl
+GH_TAGNAME=	0732a9bb7
+GH_TUPLE=	msteveb:jimtcl:0.83:jimtcl/jimtcl
 
 USE_GITLAB=	nodefault
-GL_TUPLE=	https://gitlab.zapb.de:libjaylink:libjaylink:f73ad5e:libjaylink/src/jtag/drivers/libjaylink
+GL_TUPLE=	https://gitlab.zapb.de:libjaylink:libjaylink:0.3.1:libjaylink/src/jtag/drivers/libjaylink
 
 GNU_CONFIGURE=	yes
 
diff --git a/devel/openocd-devel/distinfo b/devel/openocd-devel/distinfo
index a4913e632305..5523784102a7 100644
--- a/devel/openocd-devel/distinfo
+++ b/devel/openocd-devel/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1753910927
-SHA256 (openocd-org-openocd-g20250708-6872f7e40_GH0.tar.gz) = ee069f9c59e177547540730de0e129a54ac88002167852dc1459e727c01afb34
-SIZE (openocd-org-openocd-g20250708-6872f7e40_GH0.tar.gz) = 3356558
-SHA256 (msteveb-jimtcl-f160866_GH0.tar.gz) = 478f9a8bd1f435139dba6c9d8ba260b1111d7d724d98688a7b98804be08b712b
-SIZE (msteveb-jimtcl-f160866_GH0.tar.gz) = 4465652
-SHA256 (libjaylink-f73ad5e.tar.bz2) = 023daec65d3c43b756545dd136506d0a85e687ac19be41be7c47c27e70e53c17
-SIZE (libjaylink-f73ad5e.tar.bz2) = 59032
+TIMESTAMP = 1757872941
+SHA256 (openocd-org-openocd-g20250901-0732a9bb7_GH0.tar.gz) = 5620a3ee8797d8c47bb6544e6db97ade2c7d6b4e652affef8d54a6f378455114
+SIZE (openocd-org-openocd-g20250901-0732a9bb7_GH0.tar.gz) = 3404237
+SHA256 (msteveb-jimtcl-0.83_GH0.tar.gz) = 6f2df00009f5ac4ad654c1ae1d2f8ed18191de38d1f5a88a54ea99cc16936686
+SIZE (msteveb-jimtcl-0.83_GH0.tar.gz) = 4465834
+SHA256 (libjaylink-0.3.1.tar.bz2) = 3a1dea87a0ec57c24d2e017b0f5fc11953edda8fac8eeec7c5a1452a4c8816f6
+SIZE (libjaylink-0.3.1.tar.bz2) = 61062
diff --git a/devel/openocd-devel/files/patch-src_jtag_drivers_libusb__helper.c b/devel/openocd-devel/files/patch-src_jtag_drivers_libusb__helper.c
new file mode 100644
index 000000000000..590e20257588
--- /dev/null
+++ b/devel/openocd-devel/files/patch-src_jtag_drivers_libusb__helper.c
@@ -0,0 +1,32 @@
+--- src/jtag/drivers/libusb_helper.c.orig	2025-09-13 12:06:50 UTC
++++ src/jtag/drivers/libusb_helper.c
+@@ -378,6 +378,24 @@ int jtag_libusb_handle_events_completed(int *completed
+ 	return libusb_handle_events_completed(jtag_libusb_context, completed);
+ }
+ 
++#if __FreeBSD__ >= 15
++uint8_t *oocd_libusb_dev_mem_alloc(libusb_device_handle *devh,
++			size_t length)
++{
++	return malloc(length);
++}
++
++int oocd_libusb_dev_mem_free(libusb_device_handle *devh,
++		uint8_t *buffer, size_t length)
++{
++	if (!buffer)
++		return ERROR_OK;
++
++	free(buffer);
++	return ERROR_OK;
++}
++#else
++
+ static enum {
+ 	DEV_MEM_NOT_YET_DECIDED,
+ 	DEV_MEM_AVAILABLE,
+@@ -433,3 +451,4 @@ int oocd_libusb_dev_mem_free(libusb_device_handle *dev
+ 	}
+ 	return ERROR_FAIL;
+ }
++#endif
diff --git a/devel/openocd-devel/files/patch-src_server_server.c b/devel/openocd-devel/files/patch-src_server_server.c
new file mode 100644
index 000000000000..8ef702968f2e
--- /dev/null
+++ b/devel/openocd-devel/files/patch-src_server_server.c
@@ -0,0 +1,11 @@
+--- src/server/server.c.orig	2025-09-13 12:06:50 UTC
++++ src/server/server.c
+@@ -604,7 +604,7 @@ static void sig_handler(int sig)
+ 	/* store only first signal that hits us */
+ 	if (shutdown_openocd == CONTINUE_MAIN_LOOP) {
+ 		shutdown_openocd = SHUTDOWN_WITH_SIGNAL_CODE;
+-		assert(sig >= SIG_ATOMIC_MIN && sig <= SIG_ATOMIC_MAX);
++		//assert(sig >= SIG_ATOMIC_MIN && sig <= SIG_ATOMIC_MAX);
+ 		last_signal = sig;
+ 		LOG_DEBUG("Terminating on Signal %d", sig);
+ 	} else
diff --git a/devel/openocd-devel/pkg-plist b/devel/openocd-devel/pkg-plist
index 3d425336f6a3..b654ce88c20d 100644
--- a/devel/openocd-devel/pkg-plist
+++ b/devel/openocd-devel/pkg-plist
@@ -77,6 +77,7 @@ share/man/man1/openocd.1.gz
 %%DATADIR%%/scripts/board/digilent_nexys2.cfg
 %%DATADIR%%/scripts/board/digilent_nexys_video.cfg
 %%DATADIR%%/scripts/board/digilent_zedboard.cfg
+%%DATADIR%%/scripts/board/digilent_zybo.cfg
 %%DATADIR%%/scripts/board/diolan_lpc4350-db1.cfg
 %%DATADIR%%/scripts/board/diolan_lpc4357-db1.cfg
 %%DATADIR%%/scripts/board/dk-tm4c129.cfg
@@ -181,6 +182,7 @@ share/man/man1/openocd.1.gz
 %%DATADIR%%/scripts/board/microchip_same51_curiosity_nano.cfg
 %%DATADIR%%/scripts/board/microchip_same54_xplained_pro.cfg
 %%DATADIR%%/scripts/board/microchip_saml11_xplained_pro.cfg
+%%DATADIR%%/scripts/board/mikroe/clicker4-stm32f745vg.cfg
 %%DATADIR%%/scripts/board/mini2440.cfg
 %%DATADIR%%/scripts/board/mini6410.cfg
 %%DATADIR%%/scripts/board/minispartan6.cfg
@@ -227,6 +229,7 @@ share/man/man1/openocd.1.gz
 %%DATADIR%%/scripts/board/phytec_lpc3250.cfg
 %%DATADIR%%/scripts/board/pic-p32mx.cfg
 %%DATADIR%%/scripts/board/pico-debug.cfg
+%%DATADIR%%/scripts/board/pico2-debug.cfg
 %%DATADIR%%/scripts/board/pipistrello.cfg
 %%DATADIR%%/scripts/board/propox_mmnet1001.cfg
 %%DATADIR%%/scripts/board/pxa255_sst.cfg
@@ -249,10 +252,10 @@ share/man/man1/openocd.1.gz
 %%DATADIR%%/scripts/board/rsc-w910.cfg
 %%DATADIR%%/scripts/board/sayma_amc.cfg
 %%DATADIR%%/scripts/board/sheevaplug.cfg
-%%DATADIR%%/scripts/board/sifive-e31arty.cfg
-%%DATADIR%%/scripts/board/sifive-e51arty.cfg
-%%DATADIR%%/scripts/board/sifive-hifive1-revb.cfg
-%%DATADIR%%/scripts/board/sifive-hifive1.cfg
+%%DATADIR%%/scripts/board/sifive/e31-arty.cfg
+%%DATADIR%%/scripts/board/sifive/e51-arty.cfg
+%%DATADIR%%/scripts/board/sifive/hifive1-rev-b.cfg
+%%DATADIR%%/scripts/board/sifive/hifive1.cfg
 %%DATADIR%%/scripts/board/smdk6410.cfg
 %%DATADIR%%/scripts/board/snps_em_sk.cfg
 %%DATADIR%%/scripts/board/snps_em_sk_v1.cfg
@@ -525,6 +528,7 @@ share/man/man1/openocd.1.gz
 %%DATADIR%%/scripts/interface/beaglebone-swd-native.cfg
 %%DATADIR%%/scripts/interface/buspirate.cfg
 %%DATADIR%%/scripts/interface/chameleon.cfg
+%%DATADIR%%/scripts/interface/cmsis-dap-tcp.cfg
 %%DATADIR%%/scripts/interface/cmsis-dap.cfg
 %%DATADIR%%/scripts/interface/dln-2-gpiod.cfg
 %%DATADIR%%/scripts/interface/dummy.cfg
@@ -634,8 +638,18 @@ share/man/man1/openocd.1.gz
 %%DATADIR%%/scripts/interface/openjtag.cfg
 %%DATADIR%%/scripts/interface/osbdm.cfg
 %%DATADIR%%/scripts/interface/parport.cfg
+%%DATADIR%%/scripts/interface/parport/altium.cfg
+%%DATADIR%%/scripts/interface/parport/amt-wiggler-old.cfg
+%%DATADIR%%/scripts/interface/parport/arm-jtag.cfg
+%%DATADIR%%/scripts/interface/parport/aspo.cfg
+%%DATADIR%%/scripts/interface/parport/chameleon.cfg
 %%DATADIR%%/scripts/interface/parport/dlc5.cfg
+%%DATADIR%%/scripts/interface/parport/flashlink.cfg
+%%DATADIR%%/scripts/interface/parport/lattice.cfg
+%%DATADIR%%/scripts/interface/parport/triton.cfg
+%%DATADIR%%/scripts/interface/parport/wiggler-ntrst-inverted.cfg
 %%DATADIR%%/scripts/interface/parport/wiggler.cfg
+%%DATADIR%%/scripts/interface/parport/wiggler2.cfg
 %%DATADIR%%/scripts/interface/parport_dlc5.cfg
 %%DATADIR%%/scripts/interface/raspberrypi-gpio-connector.cfg
 %%DATADIR%%/scripts/interface/raspberrypi-native.cfg
@@ -678,6 +692,7 @@ share/man/man1/openocd.1.gz
 %%DATADIR%%/scripts/target/ar71xx.cfg
 %%DATADIR%%/scripts/target/arm_corelink_sse200.cfg
 %%DATADIR%%/scripts/target/armada370.cfg
+%%DATADIR%%/scripts/target/artery/at32f4x.cfg
 %%DATADIR%%/scripts/target/at32ap7000.cfg
 %%DATADIR%%/scripts/target/at91r40008.cfg
 %%DATADIR%%/scripts/target/at91rm9200.cfg
@@ -853,6 +868,12 @@ share/man/man1/openocd.1.gz
 %%DATADIR%%/scripts/target/max32620.cfg
 %%DATADIR%%/scripts/target/max32625.cfg
 %%DATADIR%%/scripts/target/max3263x.cfg
+%%DATADIR%%/scripts/target/max32670.cfg
+%%DATADIR%%/scripts/target/max32672.cfg
+%%DATADIR%%/scripts/target/max32675.cfg
+%%DATADIR%%/scripts/target/max32680.cfg
+%%DATADIR%%/scripts/target/max32690.cfg
+%%DATADIR%%/scripts/target/max32xxx_common.cfg
 %%DATADIR%%/scripts/target/mc13224v.cfg
 %%DATADIR%%/scripts/target/mdr32f9q2i.cfg
 %%DATADIR%%/scripts/target/microchip/mpfs.cfg
@@ -889,6 +910,7 @@ share/man/man1/openocd.1.gz
 %%DATADIR%%/scripts/target/pxa270.cfg
 %%DATADIR%%/scripts/target/pxa3xx.cfg
 %%DATADIR%%/scripts/target/qn908x.cfg
+%%DATADIR%%/scripts/target/qualcomm/qcs6490.cfg
 %%DATADIR%%/scripts/target/qualcomm_qca4531.cfg
 %%DATADIR%%/scripts/target/quark_d20xx.cfg
 %%DATADIR%%/scripts/target/quark_x10xx.cfg
@@ -902,6 +924,7 @@ share/man/man1/openocd.1.gz
 %%DATADIR%%/scripts/target/renesas_s7g2.cfg
 %%DATADIR%%/scripts/target/rk3308.cfg
 %%DATADIR%%/scripts/target/rk3399.cfg
+%%DATADIR%%/scripts/target/rk3588.cfg
 %%DATADIR%%/scripts/target/rp2040.cfg
 %%DATADIR%%/scripts/target/rp2350.cfg
 %%DATADIR%%/scripts/target/rsl10.cfg
@@ -944,6 +967,7 @@ share/man/man1/openocd.1.gz
 %%DATADIR%%/scripts/target/stm32l4x.cfg
 %%DATADIR%%/scripts/target/stm32l5x.cfg
 %%DATADIR%%/scripts/target/stm32u0x.cfg
+%%DATADIR%%/scripts/target/stm32u3x.cfg
 %%DATADIR%%/scripts/target/stm32u5x.cfg
 %%DATADIR%%/scripts/target/stm32w108xx.cfg
 %%DATADIR%%/scripts/target/stm32wbax.cfg