[rpms/openocd] rawhide: Update to upstream git snapshot, Drop deprecated options

[rpms/openocd] rawhide: Update to upstream git snapshot, Drop deprecated options

[Peter Robinson]

A new commit has been pushed.

Repo   : rpms/openocd
Branch : rawhide
Commit : 7e5f0947725967553394a492ccca6d20bf448cc7
Author : Peter Robinson <pbrobinson@gmail.com>
Date   : 2026-07-11T22:25:25+01:00
Stats  : +22/-294 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/openocd/c/7e5f0947725967553394a492ccca6d20bf448cc7?branch=rawhide

Log:
Update to upstream git snapshot, Drop deprecated options

---
diff --git a/.gitignore b/.gitignore
index e623c6c..21ef0ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /openocd-*.tar.bz2
+/openocd-*.tar.xz
+/openocd-*.tar.gz

diff --git a/0001-openocd-revert-workarounds-for-expr-syntax-change.patch b/0001-openocd-revert-workarounds-for-expr-syntax-change.patch
deleted file mode 100644
index fdca274..0000000
--- a/0001-openocd-revert-workarounds-for-expr-syntax-change.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 95603fae18f81eebdafc5b318e70f9e2cdefab9e Mon Sep 17 00:00:00 2001
-From: Antonio Borneo <borneo.antonio@gmail.com>
-Date: Sun, 18 Dec 2022 19:15:57 +0100
-Subject: [PATCH] openocd: revert workarounds for 'expr' syntax change
-
-With OpenOCD v0.12.0 released, drop the workarounds for 'expr'
-syntax change by reverting:
-- commit 320043c054dc ("openocd: fix for polling during "expr"
-  computation");
-- commit c7eaaf620488 ("openocd: prepare for jimtcl 0.81 'expr'
-  syntax change").
-
-Replace the call to target_call_timer_callbacks_now() with call
-to target_call_timer_callbacks().
-
-Change-Id: Iae5afc50e3f688e11176a52648efc9a6577a9a11
-Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
-Reviewed-on: https://review.openocd.org/c/openocd/+/7405
-Tested-by: jenkins
----
- src/helper/command.c | 14 +----------
- src/openocd.c        | 60 --------------------------------------------
- 2 files changed, 1 insertion(+), 73 deletions(-)
-
-diff --git a/src/helper/command.c b/src/helper/command.c
-index 6898e2d7c..ca66cf7dd 100644
---- a/src/helper/command.c
-+++ b/src/helper/command.c
-@@ -936,19 +936,7 @@ static int jim_command_dispatch(Jim_Interp *interp, int argc, Jim_Obj * const *a
- 	if (!command_can_run(cmd_ctx, c, Jim_GetString(argv[0], NULL)))
- 		return JIM_ERR;
- 
--	/*
--	 * TODO: to be removed after v0.12.0
--	 * workaround for https://sourceforge.net/p/openocd/tickets/362/
--	 * After syntax change of "expr" in jimtcl 0.81
--	 * the replacement of jimtcl "expr" with openocd version in
--	 * https://review.openocd.org/6510/
--	 * introduces too many target polling during math expressions with
--	 * "expr" commands.
--	 * After v0.12.0 replace the following two lines with
--	 * target_call_timer_callbacks();
--	 */
--	if (strcmp(c->name, "expr"))
--		target_call_timer_callbacks_now();
-+	target_call_timer_callbacks();
- 
- 	/*
- 	 * Black magic of overridden current target:
-diff --git a/src/openocd.c b/src/openocd.c
-index bef084f98..875da5a62 100644
---- a/src/openocd.c
-+++ b/src/openocd.c
-@@ -230,65 +230,6 @@ static int openocd_register_commands(struct command_context *cmd_ctx)
- 	return register_commands(cmd_ctx, NULL, openocd_command_handlers);
- }
- 
--/*
-- * TODO: to be removed after v0.12.0
-- * workaround for syntax change of "expr" in jimtcl 0.81
-- * replace "expr" with openocd version that prints the deprecated msg
-- */
--struct jim_scriptobj {
--	void *token;
--	Jim_Obj *filename_obj;
--	int len;
--	int subst_flags;
--	int in_use;
--	int firstline;
--	int linenr;
--	int missing;
--};
--
--static int jim_expr_command(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
--{
--	if (argc == 2)
--		return Jim_EvalExpression(interp, argv[1]);
--
--	if (argc > 2) {
--		Jim_Obj *obj = Jim_ConcatObj(interp, argc - 1, argv + 1);
--		Jim_IncrRefCount(obj);
--		const char *s = Jim_String(obj);
--		struct jim_scriptobj *script = Jim_GetIntRepPtr(interp->currentScriptObj);
--		if (interp->currentScriptObj == interp->emptyObj ||
--				strcmp(interp->currentScriptObj->typePtr->name, "script") ||
--				script->subst_flags ||
--				script->filename_obj == interp->emptyObj)
--			LOG_WARNING("DEPRECATED! use 'expr { %s }' not 'expr %s'", s, s);
--		else
--			LOG_WARNING("DEPRECATED! (%s:%d) use 'expr { %s }' not 'expr %s'",
--						Jim_String(script->filename_obj), script->linenr, s, s);
--		int retcode = Jim_EvalExpression(interp, obj);
--		Jim_DecrRefCount(interp, obj);
--		return retcode;
--	}
--
--	Jim_WrongNumArgs(interp, 1, argv, "expression ?...?");
--	return JIM_ERR;
--}
--
--static const struct command_registration expr_handler[] = {
--	{
--		.name = "expr",
--		.jim_handler = jim_expr_command,
--		.mode = COMMAND_ANY,
--		.help = "",
--		.usage = "",
--	},
--	COMMAND_REGISTRATION_DONE
--};
--
--static int workaround_for_jimtcl_expr(struct command_context *cmd_ctx)
--{
--	return register_commands(cmd_ctx, NULL, expr_handler);
--}
--
- struct command_context *global_cmd_ctx;
- 
- static struct command_context *setup_command_handler(Jim_Interp *interp)
-@@ -301,7 +242,6 @@ static struct command_context *setup_command_handler(Jim_Interp *interp)
- 	/* register subsystem commands */
- 	typedef int (*command_registrant_t)(struct command_context *cmd_ctx_value);
- 	static const command_registrant_t command_registrants[] = {
--		&workaround_for_jimtcl_expr,
- 		&openocd_register_commands,
- 		&server_register_commands,
- 		&gdb_register_commands,
--- 
-2.46.2
-

diff --git a/0002-jimtcl-update-to-version-0.82.patch b/0002-jimtcl-update-to-version-0.82.patch
deleted file mode 100644
index 1e5f38c..0000000
--- a/0002-jimtcl-update-to-version-0.82.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From dccf323c1f78d015f75db4cef8cdc33523e1abd6 Mon Sep 17 00:00:00 2001
-From: Antonio Borneo <borneo.antonio@gmail.com>
-Date: Sat, 4 Mar 2023 12:08:58 +0100
-Subject: [PATCH] jimtcl: update to version 0.82
-
-The new version modifies it's auto configure in change
-	https://github.com/msteveb/jimtcl/commit/ccd47be13019
-stating:
-	configure: Default to --full
-	Now use --minimal and/or --without-ext to disable things.
-
-With such change jimtcl doesn't build anymore as OpenOCD submodule
-because of errors linking with new dependencies openssl and zlib.
-
-Use option --minimal to keep the same build configuration as with
-former jimtcl 0.81.
-Add option --disable-ssl to avoid a build error on system with no
-ssl libraries installed. This is already fixed in jimtcl upstream
-but not part of 0.82. Note that ssl is not currently used by
-OpenOCD.
-
-Change-Id: I0879891dbd083bfbff1e904daf6cd549c3329bbf
-Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
-Reviewed-on: https://review.openocd.org/c/openocd/+/7517
-Tested-by: jenkins
----
- configure.ac | 4 ++--
- jimtcl       | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index cc7139c7c..ac2808e1f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -571,9 +571,9 @@ AS_IF([test "x$enable_buspirate" != "xno"], [
- AS_IF([test "x$use_internal_jimtcl" = "xyes"], [
-   AS_IF([test -f "$srcdir/jimtcl/configure"], [
-     AS_IF([test "x$use_internal_jimtcl_maintainer" = "xyes"], [
--      jimtcl_config_options="--disable-install-jim --with-ext=json --maintainer"
-+      jimtcl_config_options="--disable-install-jim --with-ext=json --minimal --disable-ssl --maintainer"
-     ], [
--      jimtcl_config_options="--disable-install-jim --with-ext=json"
-+      jimtcl_config_options="--disable-install-jim --with-ext=json --minimal --disable-ssl"
-     ])
-     AX_CONFIG_SUBDIR_OPTION([jimtcl], [$jimtcl_config_options])
-   ], [
-diff --git a/jimtcl b/jimtcl
-index a77ef1a62..1933e5457 160000
---- a/jimtcl
-+++ b/jimtcl
-@@ -1 +1 @@
--Subproject commit a77ef1a6218fad4c928ddbdc03c1aedc41007e70
-+Subproject commit 1933e5457b9512d39ebbe11ed32578aada149f49
--- 
-2.46.2
-

diff --git a/0003-jtag-vdebug-fix-endianness-support.patch b/0003-jtag-vdebug-fix-endianness-support.patch
deleted file mode 100644
index 49e1ce4..0000000
--- a/0003-jtag-vdebug-fix-endianness-support.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 81cf948bf4be9a05b364737a1283def1becfdb71 Mon Sep 17 00:00:00 2001
-From: Jacek Wuwer <jacekmw8@gmail.com>
-Date: Mon, 29 May 2023 17:46:08 +0200
-Subject: [PATCH] jtag/vdebug: fix endianness support
-
-This change fixes endianness support in the driver.
-
-Change-Id: Ida360bb58e988cea0a66fdc79e1610b528846fc4
-Signed-off-by: Jacek Wuwer <jacekmw8@gmail.com>
-Reviewed-on: https://review.openocd.org/c/openocd/+/7721
-Tested-by: jenkins
-Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
----
- src/jtag/drivers/vdebug.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/jtag/drivers/vdebug.c b/src/jtag/drivers/vdebug.c
-index 9223be23f..4187c9876 100644
---- a/src/jtag/drivers/vdebug.c
-+++ b/src/jtag/drivers/vdebug.c
-@@ -272,7 +272,7 @@ static int vdebug_socket_open(char *server_addr, uint32_t port)
- 		LOG_ERROR("socket_open: cannot resolve address %s, error %d", server_addr, vdebug_socket_error());
- 		rc = VD_ERR_SOC_ADDR;
- 	} else {
--		buf_set_u32((uint8_t *)ainfo->ai_addr->sa_data, 0, 16, htons(port));
-+		h_u16_to_be((uint8_t *)ainfo->ai_addr->sa_data, port);
- 		if (connect(hsock, ainfo->ai_addr, sizeof(struct sockaddr)) < 0) {
- 			LOG_ERROR("socket_open: cannot connect to %s:%d, error %d", server_addr, port, vdebug_socket_error());
- 			rc = VD_ERR_SOC_CONN;
-@@ -1125,7 +1125,7 @@ static int vdebug_dap_queue_ap_abort(struct adiv5_dap *dap, uint8_t *ack)
- 
- static int vdebug_dap_run(struct adiv5_dap *dap)
- {
--	if (pbuf->waddr)
-+	if (le_to_h_u16(pbuf->waddr))
- 		return vdebug_run_reg_queue(vdc.hsocket, pbuf, le_to_h_u16(pbuf->waddr));
- 
- 	return ERROR_OK;
--- 
-2.46.2
-

diff --git a/0004-openocd-fix-build-with-jimtcl-0.83.patch b/0004-openocd-fix-build-with-jimtcl-0.83.patch
deleted file mode 100644
index c2d34fd..0000000
--- a/0004-openocd-fix-build-with-jimtcl-0.83.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c26ae1e98e2b292743146ad0fb286c3511f7c952 Mon Sep 17 00:00:00 2001
-From: Antonio Borneo <borneo.antonio@gmail.com>
-Date: Fri, 27 Sep 2024 22:36:52 +0200
-Subject: [PATCH] openocd: fix build with jimtcl 0.83
-
-In jimtcl 0.82, the include file jim.h included in turn stdio.h
-This made redundant to include the former in openocd source files.
-Since jimtcl 0.83, jim.h drops the include of stdio.h, causing
-openocd build to fail.
-
-Include stdio.h in the files that need it.
-
-Change-Id: Ic81c9b273d7520f4d2d8c32bc3e0a6bcfffb67ed
-Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
----
- src/helper/configuration.h | 1 +
- src/helper/jim-nvp.c       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/helper/configuration.h b/src/helper/configuration.h
-index 295ea591d..d646670eb 100644
---- a/src/helper/configuration.h
-+++ b/src/helper/configuration.h
-@@ -11,6 +11,7 @@
- #ifndef OPENOCD_HELPER_CONFIGURATION_H
- #define OPENOCD_HELPER_CONFIGURATION_H
- 
-+#include <stdio.h>
- #include <helper/command.h>
- 
- int parse_cmdline_args(struct command_context *cmd_ctx,
-diff --git a/src/helper/jim-nvp.c b/src/helper/jim-nvp.c
-index e1ab64ae5..cdd4d3429 100644
---- a/src/helper/jim-nvp.c
-+++ b/src/helper/jim-nvp.c
-@@ -21,6 +21,7 @@
- #endif
- 
- #include "jim-nvp.h"
-+#include <stdio.h>
- #include <string.h>
- 
- int jim_get_nvp(Jim_Interp *interp,
--- 
-2.46.2
-

diff --git a/openocd.spec b/openocd.spec
index 4439ab2..c32f4f8 100644
--- a/openocd.spec
+++ b/openocd.spec
@@ -1,27 +1,26 @@
-%global _legacy_common_support 1
 #global rcVer 1
+# git archive --format=tar --prefix=openocd-0.12.0/ cb52502 | xz > openocd-0.12.0-cb52502.tar.xz
+%global snapshot cb52502
 
 Name:       openocd
 Version:    0.12.0
-Release:    3%{?rcVer:.rc%{rcVer}}%{?dist}.7
+Release:    4%{?rcVer:.rc%{rcVer}}%{?snapshot:.git%{snapshot}}%{?dist}
 Summary:    Debugging, in-system programming and boundary-scan testing for embedded devices
 
-# Automatically converted from old format: GPLv2 - review is highly recommended.
-License:    GPL-2.0-only
+License:    GPL-2.0-or-later
 URL:        https://sourceforge.net/projects/openocd
-Source0:    https://downloads.sourceforge.net/project/openocd/openocd/%{version}%{?rcVer:-rc%{rcVer}}/%{name}-%{version}%{?rcVer:-rc%{rcVer}}.tar.bz2
-Patch0:     0001-openocd-revert-workarounds-for-expr-syntax-change.patch
-Patch1:     0003-jtag-vdebug-fix-endianness-support.patch
-Patch2:     0004-openocd-fix-build-with-jimtcl-0.83.patch
-
+#Source0:    https://downloads.sourceforge.net/project/openocd/openocd/%{version}%{?rcVer:-rc%{rcVer}}/%{name}-%{version}%{?rcVer:-rc%{rcVer}}.tar.bz2
+Source0:    %{name}-%{version}-%{snapshot}.tar.xz
 
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
 BuildRequires: capstone-devel
 BuildRequires: chrpath
 BuildRequires: gcc
 BuildRequires: hidapi-devel
 BuildRequires: jimtcl-devel
-# Only used for gpio bitbang driver
-# BuildRequires: libgpiod-devel
+BuildRequires: libgpiod-devel
 BuildRequires: libjaylink-devel
 BuildRequires: libftdi-devel
 BuildRequires: libusbx-devel
@@ -40,14 +39,12 @@ debugging.
 %prep
 %autosetup -n %{name}-%{version}%{?rcVer:-rc%{rcVer}} -p1
 rm -rf jimtcl
+sed -i '/jimtcl/d' Makefile.am
 rm -f src/jtag/drivers/OpenULINK/ulink_firmware.hex
 sed -i 's/MODE=.*/TAG+="uaccess"/' contrib/60-openocd.rules
 
 %build
-pushd src/jtag/drivers/OpenULINK
-make PREFIX=sdcc hex
-popd
-
+autoreconf -vif
 %configure \
   --disable-werror \
   --enable-static \
@@ -56,7 +53,7 @@ popd
   --enable-ftdi \
   --enable-stlink \
   --enable-ti-icdi \
-  --enable-ulink \
+  --disable-ulink \
   --enable-usb-blaster-2 \
   --enable-ft232r \
   --enable-vsllink \
@@ -79,10 +76,8 @@ popd
   --enable-jtag_vpi \
   --enable-jtag_dpi \
   --enable-ioutil \
-  --enable-amtjtagaccel \
   --enable-ep39xx \
   --enable-at91rm9200 \
-  --enable-gw16012 \
   --enable-oocd_trace \
   --enable-buspirate \
   --enable-sysfsgpio \
@@ -106,9 +101,9 @@ chrpath --delete %{buildroot}/%{_bindir}/openocd
 
 %files
 %license COPYING
-%doc AUTHORS NEWS* NEWTAPS README TODO
+%doc AUTHORS NEWTAPS README.md
 %{_datadir}/%{name}/scripts
-%{_datadir}/%{name}/OpenULINK/ulink_firmware.hex
+%{_datadir}/%{name}/angie/
 %{_bindir}/%{name}
 %{_prefix}/lib/udev/rules.d/60-openocd.rules
 # doc
@@ -116,6 +111,10 @@ chrpath --delete %{buildroot}/%{_bindir}/openocd
 %{_mandir}/man1/*
 
 %changelog
+* Sat Jul 11 2026 Peter Robinson <pbrobinson@fedoraproject.org> 0.12.0-4
+- Update to upstream git snapshot
+- Drop deprecated options
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.0-3.7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

diff --git a/sources b/sources
index 8b16572..dd1db91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openocd-0.12.0.tar.bz2) = b32a8b9fe81ad23d8a544284f4bc626ca302e498dae95399a2f36756407dd1a63e8e9655ca1084e7cc13cf1b932d8f6a480f470a4c3ad502cd884ec7508738e9
+SHA512 (openocd-0.12.0-cb52502.tar.xz) = 8cf9aafd525e35a2745ad1907671979506b5fb610a1213be3ce1192163dc899386341e1e7a57925211afa491cc90ab69c075a1e44f5f7a2eaf6550eeb7f9511c