开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

_service:extract_file:libX11.spec Deleted

@@ -1,125 +0,0 @@
-Name:		libX11
-Version:	1.7.2
-Release:	2
-Summary:	Core X11 protocol client library
-License:	MIT
-URL:		http://www.x.org
-Source0:	https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
-
-Patch1:         dont-forward-keycode-0.patch
-
-BuildRequires:	xorg-x11-util-macros >= 1.11 xorg-x11-proto-devel perl-Pod-Usage libXau-devel
-BuildRequires:  libxcb-devel >= 1.2 libXdmcp-devel xorg-x11-xtrans-devel >= 1.0.3-4
-
-Provides:       %{name}-common = %{version}-%{release}
-Obsoletes:      %{name}-common < %{version}-%{release}
-
-Provides:       %{name}-xcb = %{version}-%{release}
-Obsoletes:      %{name}-xcb < %{version}-%{release}
-
-%description
-Core X11 protocol client library.
-
-%package        devel
-Summary:        Development files for %{name}
-Requires:       %{name} = %{version}-%{release}
-
-%description    devel
-The %{name}-devel package contains libraries and header files for %{name}.
-
-%package_help
-
-%prep
-%autosetup -n %{name}-%{version} -p1
-
-%build
-autoreconf -ivf
-%configure --disable-silent-rules
-%make_build
-
-%install
-%make_install
-
-mkdir -p $RPM_BUILD_ROOT/var/cache/libX11/compose
-%delete_la
-
-%check
-make %{?_smp_mflags} check
-
-%ldconfig_scriptlets
-
-%files
-%defattr(-,root,root)
-%doc AUTHORS
-%license COPYING
-%{_libdir}/*.so.*
-%{_datadir}/X11/locale/*
-%{_datadir}/X11/XErrorDB
-%dir /var/cache/libX11/compose
-%exclude %{_docdir}/*
-%exclude %{_datadir}/X11/Xcms.txt
-
-%files          devel
-%defattr(-,root,root)
-%{_libdir}/*.a
-%{_libdir}/*.so
-%{_includedir}/X11/*.h
-%{_libdir}/pkgconfig/*.pc
-%{_includedir}/X11/extensions/XKBgeom.h
-
-%files          help
-%defattr(-,root,root)
-%doc README.md NEWS ChangeLog
-%{_mandir}/*/*
-
-%changelog
-* Wed Dec 15 2021 wangkerong <wangkerong@huawei.com> - 1.7.2-2
-- provide XKBgeom header file
-
-* Sat Nov 27 2021 dongyuzhen <dongyuzhen@huawei.com> - 1.7.2-1
-- update to 1.7.2
-
-* Fri Jun 11 2021 zhanglin <lin.zhang@turbolinux.com.cn> - 1.7.0-2
-- Type:bugfix
-- Id:NA
-- SUG:NA
-- DESC:fix CVE-2021-31535
-
-* Thu Jan 28 2021 hanhui <hanhui15@huawei.com> - 1.7.0-1
-- Type: enhancement
-- ID:   NA
-- SUG:  NA
-- DESC: update to 1.7.0
-
-* Wed Sep 30 2020 chengguipeng<chenguipeng1@huawei.com> - 1.6.9-4
-- Type:bugfix
-- Id:NA
-- SUG:NA
-- DESC:fix CVE-2020-14363
-
-* Tue Sep 8 2020 zhanghua <zhanghua40@huawei.com> - 1.6.9-3
-- Type:bugfix
-- Id:NA
-- SUG:NA
-- DESC:fix CVE-2020-14344
-
-* Mon Nov 4 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.6.9-2
-- Type:bugfix
-- Id:NA
-- SUG:NA
-- DESC:remove the XKBgeom.h
-
-* Fri Nov 1 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.6.9-1
-- Type:bugfix
-- Id:NA
-- SUG:NA
-- DESC:update to 1.6.9
-
-* Sat Oct 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.6.7-2
-- Type:bugfix
-- Id:NA
-- SUG:NA
-- DESC:change the directory of the license file
-
-* Fri Aug 30 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.6.7-1
-- Package init

_service:tar_scm:libX11.spec Added

@@ -0,0 +1,134 @@
+Name:		libX11
+Version:	1.8.1
+Release:	3
+Summary:	Core X11 protocol client library
+License:	MIT
+URL:		http://www.x.org
+Source0:	https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz
+
+Patch1:         dont-forward-keycode-0.patch
+Patch6001:	backport-CVE-2022-3554.patch
+
+BuildRequires:	xorg-x11-util-macros >= 1.11 xorg-x11-proto-devel perl-Pod-Usage libXau-devel
+BuildRequires:  libxcb-devel >= 1.2 libXdmcp-devel xorg-x11-xtrans-devel >= 1.0.3-4 make
+
+Provides:       %{name}-common = %{version}-%{release}
+Obsoletes:      %{name}-common < %{version}-%{release}
+
+Provides:       %{name}-xcb = %{version}-%{release}
+Obsoletes:      %{name}-xcb < %{version}-%{release}
+
+%description
+Core X11 protocol client library.
+
+%package        devel
+Summary:        Development files for %{name}
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for %{name}.
+
+%package_help
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+%build
+autoreconf -ivf
+%configure --disable-silent-rules --disable-static
+%make_build
+
+%install
+%make_install
+
+mkdir -p $RPM_BUILD_ROOT/var/cache/libX11/compose
+%delete_la
+
+%check
+make %{?_smp_mflags} check
+
+%ldconfig_scriptlets
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS
+%license COPYING
+%{_libdir}/*.so.*
+%{_datadir}/X11/locale/*
+%{_datadir}/X11/XErrorDB
+%dir /var/cache/libX11/compose
+%exclude %{_docdir}/*
+%exclude %{_datadir}/X11/Xcms.txt
+
+%files          devel
+%defattr(-,root,root)
+%{_libdir}/*.so
+%{_includedir}/X11/*.h
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/X11/extensions/XKBgeom.h
+
+%files          help
+%defattr(-,root,root)
+%doc README.md NEWS ChangeLog
+%{_mandir}/*/*
+
+%changelog
+* Fri Nov 04 2022 wangkerong <wangkerong@h-partners.com> - 1.8.1-3
+- disable static library
+
+* Mon Oct 24 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 1.8.1-2
+- fix CVE-2022-3554
+
+* Mon Jun 20 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1.8.1-1
+- update to 1.8.1
+
+* Wed Dec 15 2021 wangkerong <wangkerong@huawei.com> - 1.7.2-2
+- provide XKBgeom header file
+
+* Sat Nov 27 2021 dongyuzhen <dongyuzhen@huawei.com> - 1.7.2-1
+- update to 1.7.2
+
+* Fri Jun 11 2021 zhanglin <lin.zhang@turbolinux.com.cn> - 1.7.0-2
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:fix CVE-2021-31535
+
+* Thu Jan 28 2021 hanhui <hanhui15@huawei.com> - 1.7.0-1
+- Type: enhancement
+- ID:   NA
+- SUG:  NA
+- DESC: update to 1.7.0
+
+* Wed Sep 30 2020 chengguipeng<chenguipeng1@huawei.com> - 1.6.9-4
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:fix CVE-2020-14363
+
+* Tue Sep 8 2020 zhanghua <zhanghua40@huawei.com> - 1.6.9-3
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:fix CVE-2020-14344
+
+* Mon Nov 4 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.6.9-2
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:remove the XKBgeom.h
+
+* Fri Nov 1 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.6.9-1
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:update to 1.6.9
+
+* Sat Oct 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.6.7-2
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:change the directory of the license file
+
+* Fri Aug 30 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.6.7-1
+- Package init

_service:extract_file:dont-forward-keycode-0.patch Deleted

@@ -1,53 +0,0 @@
-diff -up libX11-1.6.3/modules/im/ximcp/imDefFlt.c.jx libX11-1.6.3/modules/im/ximcp/imDefFlt.c
---- libX11-1.6.3/modules/im/ximcp/imDefFlt.c.jx	2015-03-09 18:28:45.000000000 -0400
-+++ libX11-1.6.3/modules/im/ximcp/imDefFlt.c	2015-03-10 12:32:31.912149644 -0400
-@@ -142,7 +142,7 @@ _XimProtoKeypressFilter(
- {
-     Xim		im = (Xim)ic->core.im;
- 
--    if (IS_FABRICATED(im)) {
-+    if ((ev->keycode == 0) || IS_FABRICATED(im)) {
- 	_XimPendingFilter(ic);
- 	UNMARK_FABRICATED(im);
- 	return NOTFILTERD;
-diff -up libX11-1.6.3/modules/im/ximcp/imDefLkup.c.jx libX11-1.6.3/modules/im/ximcp/imDefLkup.c
---- libX11-1.6.3/modules/im/ximcp/imDefLkup.c.jx	2015-03-09 18:28:45.000000000 -0400
-+++ libX11-1.6.3/modules/im/ximcp/imDefLkup.c	2015-03-10 12:32:31.911149637 -0400
-@@ -332,6 +332,17 @@ _XimForwardEvent(
-     XEvent	*ev,
-     Bool	 sync)
- {
-+    /*
-+     * Don't forward a key event which has keycode=0.
-+     * keycode=0 is reserved for special purpose to let Xmb/wcLookupString()
-+     * functions know that there is a commited string available from IM.
-+     */
-+    if (((ev->type == KeyPress) || (ev->type == KeyRelease))) {
-+        if (((XKeyEvent *)ev)->keycode == 0) {
-+            return True;
-+        }
-+    }
-+
- #ifdef EXT_FORWARD
-     if (((ev->type == KeyPress) || (ev->type == KeyRelease)))
- 	if (_XimExtForwardKeyEvent(ic, (XKeyEvent *)ev, sync))
-@@ -604,6 +615,19 @@ _XimUnregCommitInfo(
-     Xfree(info->keysym);
-     ic->private.proto.commit_info = info->next;
-     Xfree(info);
-+
-+    /*
-+     * "Commit" uses fabricated flag to process a commited string
-+     * from IM engine.  
-+     * Turn off the fabricated flag here (unregister the commited
-+     * information function). Otherwise, next regular key press
-+     * event will be ignored at _XimProtoKeypressFilter() and it
-+     * will not be passed to IM engine.
-+     */
-+    if (IS_FABRICATED(ic)) {
-+        UNMARK_FABRICATED(ic);
-+    }
-+
-     return;
- }
-

_service:tar_scm:backport-CVE-2022-3554.patch Added

@@ -0,0 +1,56 @@
+From 1d11822601fd24a396b354fa616b04ed3df8b4ef Mon Sep 17 00:00:00 2001
+From: "Thomas E. Dickey" <dickey@invisible-island.net>
+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 <luangruo@yahoo.com>
+    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 <dickey@invisible-island.net>
+
+Conflict:NA
+Reference:https://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=1d11822601fd24a396b354fa616b04ed3df8b4ef
+---
+ 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.27.0
+

_service:tar_scm:dont-forward-keycode-0.patch Added

@@ -0,0 +1,53 @@
+diff -up libX11-1.6.3/modules/im/ximcp/imDefFlt.c.jx libX11-1.6.3/modules/im/ximcp/imDefFlt.c
+--- libX11-1.6.3/modules/im/ximcp/imDefFlt.c.jx	2015-03-09 18:28:45.000000000 -0400
++++ libX11-1.6.3/modules/im/ximcp/imDefFlt.c	2015-03-10 12:32:31.912149644 -0400
+@@ -142,7 +142,7 @@ _XimProtoKeypressFilter(
+ {
+     Xim		im = (Xim)ic->core.im;
+ 
+-    if (IS_FABRICATED(im)) {
++    if ((ev->keycode == 0) || IS_FABRICATED(im)) {
+ 	_XimPendingFilter(ic);
+ 	UNMARK_FABRICATED(im);
+ 	return NOTFILTERD;
+diff -up libX11-1.6.3/modules/im/ximcp/imDefLkup.c.jx libX11-1.6.3/modules/im/ximcp/imDefLkup.c
+--- libX11-1.6.3/modules/im/ximcp/imDefLkup.c.jx	2015-03-09 18:28:45.000000000 -0400
++++ libX11-1.6.3/modules/im/ximcp/imDefLkup.c	2015-03-10 12:32:31.911149637 -0400
+@@ -332,6 +332,17 @@ _XimForwardEvent(
+     XEvent	*ev,
+     Bool	 sync)
+ {
++    /*
++     * Don't forward a key event which has keycode=0.
++     * keycode=0 is reserved for special purpose to let Xmb/wcLookupString()
++     * functions know that there is a commited string available from IM.
++     */
++    if (((ev->type == KeyPress) || (ev->type == KeyRelease))) {
++        if (((XKeyEvent *)ev)->keycode == 0) {
++            return True;
++        }
++    }
++
+ #ifdef EXT_FORWARD
+     if (((ev->type == KeyPress) || (ev->type == KeyRelease)))
+ 	if (_XimExtForwardKeyEvent(ic, (XKeyEvent *)ev, sync))
+@@ -604,6 +615,19 @@ _XimUnregCommitInfo(
+     Xfree(info->keysym);
+     ic->private.proto.commit_info = info->next;
+     Xfree(info);
++
++    /*
++     * "Commit" uses fabricated flag to process a commited string
++     * from IM engine.  
++     * Turn off the fabricated flag here (unregister the commited
++     * information function). Otherwise, next regular key press
++     * event will be ignored at _XimProtoKeypressFilter() and it
++     * will not be passed to IM engine.
++     */
++    if (IS_FABRICATED(ic)) {
++        UNMARK_FABRICATED(ic);
++    }
++
+     return;
+ }
+

_service Changed

_service:extract_file:libX11-1.7.2.tar.bz2 Deleted

_service:extract_file:libX11.yaml Deleted

_service:tar_scm:libX11-1655193291.6672ff1.tar -> _service:tar_scm:libX11-1.8.1.tar.xz Changed

_service:tar_scm:libX11.yaml Added