summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2026-10-22 09:20:27 +0000
committerCoprDistGit <infra@openeuler.org>2026-10-22 09:20:27 +0000
commit51f32f2c0f31403b8500d76a51a39465c8d91675 (patch)
tree7fc963832d42e52c76c8473b248b70b6cc06131b
parentc181c4daee3a6150931075556c19e42103cf2112 (diff)
automatic import of ros-humble-cwiid
-rw-r--r--cwiid-format-security.patch12
-rw-r--r--ros-humble-cwiid.spec9
2 files changed, 20 insertions, 1 deletions
diff --git a/cwiid-format-security.patch b/cwiid-format-security.patch
new file mode 100644
index 0000000..c4044df
--- /dev/null
+++ b/cwiid-format-security.patch
@@ -0,0 +1,12 @@
+diff --git a/wmgui/main.c b/wmgui/main.c
+--- a/wmgui/main.c
++++ b/wmgui/main.c
+@@ -442,7 +442,7 @@ void message(GtkMessageType type, const gchar *message, GtkWindow *parent)
+ {
+ GtkWidget *dialog;
+
+- dialog = gtk_message_dialog_new(parent, 0, type, GTK_BUTTONS_OK, message);
++ dialog = gtk_message_dialog_new(parent, 0, type, GTK_BUTTONS_OK, "%s", message);
+ gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_destroy(dialog);
+ }
diff --git a/ros-humble-cwiid.spec b/ros-humble-cwiid.spec
index b49eae6..75e7d01 100644
--- a/ros-humble-cwiid.spec
+++ b/ros-humble-cwiid.spec
@@ -6,7 +6,7 @@
Name: ros-humble-cwiid
Version: 0.6.00
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: CWiid Wiimote Interface — libcwiid and tools (wmgui/wminput/lswm)
License: GPLv2
@@ -17,6 +17,10 @@ Source0: https://github.com/abstrakraft/cwiid/archive/fadf11e89b579bcc033
# 导致 aarch64 编译产物无 PIC 但链接 PIE → R_AARCH64_ADR_PREL_PG_HI21 重定位失败。
# 修复:在 CFLAGS 定义中前置 @CFLAGS@(configure 保存的 RPM optflags)。
Patch0: cwiid-cflags.patch
+# wmgui/main.c:445 将非字面量 message 直接传给 gtk_message_dialog_new 的
+# 格式串参数,触发 -Werror=format-security(RPM optflags 含 -Werror=format-security)。
+# 修复:改用 "%s", message 显式格式串。
+Patch1: cwiid-format-security.patch
Group: Development/Libraries
Packager: openEuler Builder <builder@openeuler.org>
@@ -90,6 +94,9 @@ autoreconf -if
%{_libdir}/pkgconfig/cwiid.pc
%changelog
+* Thu Oct 22 2026 openEuler Builder <builder@openeuler.org> - 0.6.00-3
+- Fix -Werror=format-security in wmgui/main.c: use "%s" format literal for gtk_message_dialog_new.
+
* Thu Oct 22 2026 openEuler Builder <builder@openeuler.org> - 0.6.00-2
- Fix aarch64 PIE link failure: include @CFLAGS@ (RPM optflags with -fPIE) in defs.mak.in.