From 89825c32c5e426dd7cc56c52c4227543cc907b3c6900b885bf2c1ac2907688ac Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 15 Mar 2023 16:56:58 +0000 Subject: [PATCH 1/2] Accepting request 1070405 from home:llyyr:branches:X11:XOrg Other distros have already updated to it with no reports of it causing crashes anymore - Update to version 1.8.4 This release fixes the regressions in previous 1.8.x related to the thread- -safety-constructor option. - supersedes U_fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch OBS-URL: https://build.opensuse.org/request/show/1070405 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libX11?expand=0&rev=97 --- ...ak-in-XRegisterIMInstantiateCallback.patch | 53 ------------------- libX11-1.8.1.tar.xz | 3 -- libX11-1.8.4.tar.xz | 3 ++ libX11.changes | 8 +++ libX11.spec | 6 +-- 5 files changed, 13 insertions(+), 60 deletions(-) delete mode 100644 U_fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch delete mode 100644 libX11-1.8.1.tar.xz create mode 100644 libX11-1.8.4.tar.xz diff --git a/U_fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch b/U_fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch deleted file mode 100644 index 5263257..0000000 --- a/U_fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 1d11822601fd24a396b354fa616b04ed3df8b4ef Mon Sep 17 00:00:00 2001 -From: "Thomas E. Dickey" -Date: Tue, 4 Oct 2022 18:26:17 -0400 -Subject: [PATCH] fix a memory leak in XRegisterIMInstantiateCallback - -Analysis: - - _XimRegisterIMInstantiateCallback() opens an XIM and closes it using - the internal function pointers, but the internal close function does - not free the pointer to the XIM (this would be done in XCloseIM()). - -Report/patch: - - Date: Mon, 03 Oct 2022 18:47:32 +0800 - From: Po Lu - To: xorg-devel@lists.x.org - Subject: Re: Yet another leak in Xlib - - For reference, here's how I'm calling XRegisterIMInstantiateCallback: - - XSetLocaleModifiers (""); - XRegisterIMInstantiateCallback (compositor.display, - XrmGetDatabase (compositor.display), - (char *) compositor.resource_name, - (char *) compositor.app_name, - IMInstantiateCallback, NULL); - - and XMODIFIERS is: - - @im=ibus - -Signed-off-by: Thomas E. Dickey ---- - modules/im/ximcp/imInsClbk.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/modules/im/ximcp/imInsClbk.c b/modules/im/ximcp/imInsClbk.c -index 95b379cb..c10e347f 100644 ---- a/modules/im/ximcp/imInsClbk.c -+++ b/modules/im/ximcp/imInsClbk.c -@@ -212,6 +212,9 @@ _XimRegisterIMInstantiateCallback( - if( xim ) { - lock = True; - xim->methods->close( (XIM)xim ); -+ /* XIMs must be freed manually after being opened; close just -+ does the protocol to deinitialize the IM. */ -+ XFree( xim ); - lock = False; - icb->call = True; - callback( display, client_data, NULL ); --- -2.35.3 - diff --git a/libX11-1.8.1.tar.xz b/libX11-1.8.1.tar.xz deleted file mode 100644 index 0e501e2..0000000 --- a/libX11-1.8.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1bc41aa1bbe01401f330d76dfa19f386b79c51881c7bbfee9eb4e27f22f2d9f7 -size 1818460 diff --git a/libX11-1.8.4.tar.xz b/libX11-1.8.4.tar.xz new file mode 100644 index 0000000..1d6ebc4 --- /dev/null +++ b/libX11-1.8.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518 +size 1835316 diff --git a/libX11.changes b/libX11.changes index d13ef67..bf9abef 100644 --- a/libX11.changes +++ b/libX11.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 9 11:58:32 UTC 2023 - llyyr + +- Update to version 1.8.4 + This release fixes the regressions in previous 1.8.x related to the thread- + -safety-constructor option. +- supersedes U_fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch + ------------------------------------------------------------------- Mon Dec 5 20:33:29 UTC 2022 - Stefan Dirsch diff --git a/libX11.spec b/libX11.spec index 1d92a01..f4d0e0d 100644 --- a/libX11.spec +++ b/libX11.spec @@ -1,7 +1,7 @@ # # spec file for package libX11 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libX11 -Version: 1.8.1 +Version: 1.8.4 Release: 0 Summary: Core X11 protocol client library License: MIT @@ -32,7 +32,6 @@ Patch1: p_xlib_skip_ext_env.diff # PATCH-FIX-UPSTREAM en-locales.diff fdo#48596 bnc#388711 -- Add missing data for more en locales Patch2: en-locales.diff Patch3: u_no-longer-crash-in-XVisualIDFromVisual.patch -Patch4: U_fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch BuildRequires: fdupes BuildRequires: libtool BuildRequires: pkgconfig @@ -136,7 +135,6 @@ test -f nls/ja.S90/XLC_LOCALE.pre && exit 1 %patch1 %patch2 %patch3 -p1 -%patch4 -p1 %build %configure \ From 740e906ccc3181edbd2a5959668fae1990d998997d921fe9a32378255d3cf2f4 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 15 Mar 2023 16:59:15 +0000 Subject: [PATCH 2/2] added bugnumber to changelog as reference OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libX11?expand=0&rev=98 --- libX11.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libX11.changes b/libX11.changes index bf9abef..29ae005 100644 --- a/libX11.changes +++ b/libX11.changes @@ -3,7 +3,7 @@ Thu Mar 9 11:58:32 UTC 2023 - llyyr - Update to version 1.8.4 This release fixes the regressions in previous 1.8.x related to the thread- - -safety-constructor option. + -safety-constructor option. (boo#1209176) - supersedes U_fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch -------------------------------------------------------------------