From f224813bd5bb55618d45d03c7c1fe81abcf5d9f1 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 21 Aug 2018 13:55:37 -0400 Subject: [PATCH] libX11 1.6.6 --- .gitignore | 1 + ...le-array-member-instead-of-fake-size.patch | 66 ---- libX11.spec | 324 +----------------- sources | 2 +- 4 files changed, 7 insertions(+), 386 deletions(-) delete mode 100644 0001-Use-flexible-array-member-instead-of-fake-size.patch diff --git a/.gitignore b/.gitignore index cd38e32..7c4f16b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ libX11-1.3.99.901.tar.bz2 /libX11-1.6.3.tar.bz2 /libX11-1.6.4.tar.bz2 /libX11-1.6.5.tar.bz2 +/libX11-1.6.6.tar.bz2 diff --git a/0001-Use-flexible-array-member-instead-of-fake-size.patch b/0001-Use-flexible-array-member-instead-of-fake-size.patch deleted file mode 100644 index 1891db9..0000000 --- a/0001-Use-flexible-array-member-instead-of-fake-size.patch +++ /dev/null @@ -1,66 +0,0 @@ -From a9dafdd57c71473fa3a2ec4887e973e4e9876d83 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Thu, 15 Mar 2018 09:50:58 +0100 -Subject: [PATCH libX11] Use flexible array member instead of fake size. - -The _XimCacheStruct structure is followed in memory by two strings containing -fname and encoding. The memory was accessed using the last member of the -structure `char fname[1]`. That is a lie, prohibits us from using sizeof and -confuses checkers. Lets declare it properly as a flexible array, so compilers -don't complain about writing past that array. As bonus we can replace the -XOffsetOf with regular sizeof. - -Fixes GCC8 error: - In function 'strcpy', - inlined from '_XimWriteCachedDefaultTree' at imLcIm.c:479:5, - inlined from '_XimCreateDefaultTree' at imLcIm.c:616:2, - inlined from '_XimLocalOpenIM' at imLcIm.c:700:5: - /usr/include/bits/string_fortified.h:90:10: error: '__builtin_strcpy' - forming offset 2 is out of the bounds [0, 1] [-Werror=array-bounds] - return __builtin___strcpy_chk (__dest, __src, __bos (__dest)); - -Caused by this line seemingly writing past the fname[1] array: - imLcIm.c:479: strcpy (m->fname+strlen(name)+1, encoding); - -Reviewed-by: Keith Packard -Signed-off-by: Peter Hutterer ---- - modules/im/ximcp/imLcIm.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/modules/im/ximcp/imLcIm.c b/modules/im/ximcp/imLcIm.c -index c19695df..743df77b 100644 ---- a/modules/im/ximcp/imLcIm.c -+++ b/modules/im/ximcp/imLcIm.c -@@ -82,8 +82,8 @@ struct _XimCacheStruct { - DTCharIndex mbused; - DTCharIndex wcused; - DTCharIndex utf8used; -- char fname[1]; -- /* char encoding[1] */ -+ char fname[]; -+ /* char encoding[] */ - }; - - static struct _XimCacheStruct* _XimCache_mmap = NULL; -@@ -281,7 +281,7 @@ _XimReadCachedDefaultTree( - assert (m->id == XIM_CACHE_MAGIC); - assert (m->version == XIM_CACHE_VERSION); - if (size != m->size || -- size < XOffsetOf (struct _XimCacheStruct, fname) + namelen + encodinglen) { -+ size < sizeof (struct _XimCacheStruct) + namelen + encodinglen) { - fprintf (stderr, "Ignoring broken XimCache %s [%s]\n", name, encoding); - munmap (m, size); - return False; -@@ -442,7 +442,7 @@ _XimWriteCachedDefaultTree( - int fd; - FILE *fp; - struct _XimCacheStruct *m; -- int msize = (XOffsetOf(struct _XimCacheStruct, fname) -+ int msize = (sizeof(struct _XimCacheStruct) - + strlen(name) + strlen(encoding) + 2 - + XIM_CACHE_TREE_ALIGNMENT-1) & -XIM_CACHE_TREE_ALIGNMENT; - DefTreeBase *b = &im->private.local.base; --- -2.14.3 - diff --git a/libX11.spec b/libX11.spec index 97e3bf3..dbdd6c3 100644 --- a/libX11.spec +++ b/libX11.spec @@ -4,8 +4,8 @@ Summary: Core X11 protocol client library Name: libX11 -Version: 1.6.5 -Release: 9%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.6.6 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -19,7 +19,6 @@ Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}. %endif Patch2: dont-forward-keycode-0.patch -Patch01: 0001-Use-flexible-array-member-instead-of-fake-size.patch BuildRequires: xorg-x11-util-macros >= 1.11 BuildRequires: pkgconfig(xproto) >= 7.0.15 @@ -61,7 +60,6 @@ libX11/libxcb interoperability library %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %patch2 -p1 -b .dont-forward-keycode-0 -%patch01 -p1 %build autoreconf -v --install --force @@ -126,6 +124,9 @@ make %{?_smp_mflags} check %{_mandir}/man5/*.5* %changelog +* Tue Aug 21 2018 Adam Jackson - 1.6.6-1 +- libX11 1.6.6 + * Fri Jul 13 2018 Fedora Release Engineering - 1.6.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild @@ -202,318 +203,3 @@ make %{?_smp_mflags} check * Tue Jun 04 2013 Peter Hutterer 1.6.0-1 - libX11 1.6.0 - -* Mon May 27 2013 Peter Hutterer 1.5.99.902-1 -- Update to 1.5.99.902 (same code-base, just easier in Requires) - -* Fri May 24 2013 Peter Hutterer 1.5.99.901-3..20130524gita3bdd2b09 -- Udpate to git snapshot to fix CVEs listed below -- CVE-2013-1997 -- CVE-2013-1981 -- CVE-2013-2004 - -* Sun Mar 10 2013 Peter Hutterer 1.5.99.901-2 -- Add BR for Pod::Usage, needed by compose-chart.pl - -* Sun Mar 10 2013 Peter Hutterer 1.5.99.901.-1 -- libX11 1.6RC1 - -* Thu Feb 14 2013 Fedora Release Engineering - 1.5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 1.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jun 12 2012 Peter Hutterer 1.5.0-2 -- run autoreconf to get rid of rpath define (#828513) - -* Mon Jun 04 2012 Peter Hutterer 1.5.0-1 -- libX11 1.5 - -* Tue May 01 2012 Peter Hutterer 1.4.99.901-2 -- Rebuild to pick up new compose symbols from updated x11 proto - -* Tue Mar 20 2012 Peter Hutterer 1.4.99.901-1 -- libX11 1.5RC1 - -* Fri Jan 13 2012 Fedora Release Engineering - 1.4.99.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Dec 22 2011 Peter Hutterer 1.4.99.1-2 -- fix dont-forward-keycode-0.patch, symbol name change - -* Wed Dec 21 2011 Peter Hutterer 1.4.99.1-1 -- libX11 1.4.99.1 - -* Fri Jul 29 2011 Peter Hutterer 1.4.4-1 -- libX11 1.4.4 - -* Wed Apr 06 2011 Peter Hutterer 1.4.3-1 -- libX11 1.4.3 - -* Fri Mar 18 2011 Adam Jackson 1.4.2-1 -- libX11 1.4.2 - -* Mon Feb 07 2011 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Nov 22 2010 Peter Hutterer 1.4.0-1 -- libX11 1.4 - -* Mon Nov 01 2010 Peter Hutterer 1.3.99.903-1 -- libX11 1.3.99.903 (1.4 RC1) - -* Mon Sep 06 2010 Peter Hutterer 1.3.99.901-1 -- libX11 1.3.99.901 (1.4 RC1) - -* Thu Aug 12 2010 Peter Hutterer 1.3.5-1 -- libX11 1.3.5 -- Drop 54a96360 patch, upstream. - -* Tue Aug 10 2010 Bill Nottingham - 1.3.4-3 -- Merge upstream commit 54a96360, fixes use-after-free (fd.o 29412) - -* Mon Jul 19 2010 Matěj Cepl - 1.3.4-2 -- don't own /usr/share/X11, filesystem owns it already (#569395) - -* Fri Jun 04 2010 Adam Jackson 1.3.4-1 -- libX11 1.3.4 - -* Mon Apr 12 2010 Matěj Cepl - 1.3.1-3 -- Fix XCopyGC manpage (#579102) - -* Mon Oct 19 2009 Adam Jackson 1.3.1-2 -- libX11 1.3.1 - -* Tue Oct 06 2009 Peter Hutterer 1.3-1 -- libX11 1.3 - -* Thu Aug 13 2009 Parag 1.2.99-5.20090805 -- Merge-review cleanups #226062 - -* Thu Aug 06 2009 Peter Hutterer 1.2.99-4.20090805 -- Today's git snapshot -- minor soname bump to 6.3.0 - -* Fri Jul 24 2009 Fedora Release Engineering - 1.2.99-3.20090712 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jul 23 2009 Adam Jackson 1.2.99-2.20090712 -- Un-require xorg-x11-filesystem -- Remove useless %%dir - -* Sun Jul 12 2009 Peter Hutterer 1.2.99-1.20090712 -- Today's git snapshot -- libX11-1.2.1-indic.patch: Drop. - -* Mon Jul 06 2009 Adam Jackson 1.2.1-3 -- -common subpackage - -* Tue May 26 2009 Peter Hutterer - 1.2.1-2 -- libX11-1.2.1-indic.patch: Add new Indic language information to nls - directory files (#497971) - -* Tue May 26 2009 Peter Hutterer - 1.2.1-1 -- libX11 1.2.1 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Feb 21 2009 Adam Jackson 1.2-2 -- Merge review cleanups. (#226062) - -* Wed Feb 18 2009 Adam Jackson 1.2-1 -- libX11 1.2 - -* Wed Feb 04 2009 Adam Jackson 1.1.99.2-4 -- libX11-1.1.99.2-compose-updates.patch: Update compose sequences (from git) - -* Mon Feb 02 2009 Caolán McNamara 1.1.99.2-3 -- Resolves: rhbz#477174 don't hang in OOo, acroread, ekiga, xine, etc. - -* Thu Dec 18 2008 Adam Jackson 1.1.99.2-2 -- BR: util-macros - -* Thu Dec 18 2008 Adam Jackson 1.1.99.2-1 -- libX11 1.1.99.2 - -* Tue Nov 18 2008 Peter Hutterer 1.1.4-6 -- libX11-1.1.4-XF86Suspend.patch: add XF86Suspend and XF86Hibernate keysyms. - -* Fri Oct 24 2008 Peter Hutterer 1.1.4-5 -- libX11-1.1.4-keysysm.patch: add a bunch of keysyms for remote controls and - special keys. - -* Wed Sep 17 2008 Adam Jackson 1.1.4-4 -- libX11-1.1.4-xcb-xreply-leak.patch: Fix the BadFont case. - -* Wed Sep 17 2008 Adam Jackson 1.1.4-3 -- libX11-1.1.4-xcb-xreply-leak.patch: Fix a leak when the client has a - non-fatal error handler. (mclasen, fdo #17616) - -* Tue Jul 15 2008 Adam Jackson 1.1.4-2 -- Fix license tag. - -* Thu Mar 06 2008 Adam Jackson 1.1.4-1 -- libX11 1.1.4 - -* Tue Feb 19 2008 Fedora Release Engineering - 1.1.3-5 -- Autorebuild for GCC 4.3 - -* Fri Oct 19 2007 Kristian Høgsberg - 1.1.3-4 -- Add patch from upstream to add keysyms for brightness buttons (#330491). - -* Tue Oct 16 2007 Adam Jackson 1.1.3-3 -- libX11-devel Requires: libxcb-devel. - -* Wed Oct 10 2007 Adam Jackson 1.1.3-2 -- libX11-1.1.3-xkb-lock-fix.patch: Don't LockDisplay() recursively. Fixes - Gnome hang at logout. (#326461) - -* Mon Sep 24 2007 Adam Jackson 1.1.3-1 -- libX11 1.1.3 - -* Thu Sep 20 2007 Adam Jackson 1.1.2-4 -- Update xtrans dep and rebuild. - -* Mon Sep 17 2007 Adam Jackson 1.1.2-3 -- libX11-1.1.2-GetMotionEvents.patch: Fix the definition of XGetMotionEvents - to match the argument order in the headers. (#274671) - -* Tue Aug 21 2007 Adam Jackson - 1.1.2-2 -- Rebuild for build id - -* Mon Jul 23 2007 Adam Jackson 1.1.2-1 -- libX11 1.1.2. -- Enable XCB for libX11 transport. - -* Sat Apr 21 2007 Matthias Clasen 1.0.3-9 -- Don't install INSTALL - -* Fri Apr 06 2007 Adam Jackson 1.0.3-8 -- Fix for CVE 2007-1667. - -* Mon Jan 29 2007 Adam Jackson 1.0.3-7 -- Fix xim fd leak. - -* Thu Nov 09 2006 Caius Chance 1.0.3-6.fc7 -- Fix XIM hangs when switching input context (Soren Sandmann, #201284) - -* Fri Oct 13 2006 Kristian Høgsberg 1.0.3-5.fc7 -- Add pkgconfig dependency for -devel package. - -* Sat Sep 30 2006 Soren Sandmann 1.0.3-4.fc6 -- Fix patch so it actually applies. (#208508) - -* Sat Sep 30 2006 Soren Sandmann 1.0.3-4.fc6 -- Fix typos in patch for indic locales (#208580) - -* Wed Sep 20 2006 Soren Sandmann 1.0.3-3.fc6 -- Add patch to not forward keycode 0 (#194357). - -* Wed Jul 19 2006 Mike A. Harris 1.0.3-2.fc6 -- Added libX11-nls-indic-locales-bug185376.patch to add support for various - indic locales which have now been committed upstream (#185376) - -* Wed Jul 12 2006 Jesse Keating 1.0.3-1.1.fc6 -- rebuild - -* Mon Jul 10 2006 Mike A. Harris 1.0.3-1.fc6 -- Updated libX11 to version 1.0.3 -- Remove libX11-1.0.1-setuid.diff as it is included in the 1.0.3 release. -- Added 'dist' tag to "Release:" - -* Wed Jun 28 2006 Mike A. Harris 1.0.2-1 -- Updated libX11 to version 1.0.2 -- Bump BuildRequires and Requires to "xorg-x11-proto-devel >= 7.1-2" to meet - new "xproto >= 7.0.6" dependency. -- Disable libX11-0.99.3-datadir-locale-dir-fix.patch as it is now included - upstream. -- Remove autoconf dependency as we no longer need it. - -* Tue Jun 20 2006 Mike A. Harris 1.0.1-3 -- Added libX11-1.0.1-setuid.diff to fix potential security issue (#196094) -- Change dependency on "filesystem" package to "xorg-x11-filesystem" package, - so we can control this dep centrally. -- Added NEWS to doc list. - -* Wed Jun 07 2006 Mike A. Harris 1.0.1-2 -- Remove package ownership of mandir/libdir/etc. - -* Fri May 12 2006 Adam Jackson 1.0.1-1 -- Bump to 1.0.1 - -* Thu Feb 23 2006 Christopher Aillon 1.0.0-3 -- Look for the versioned libXcursor.so.1 (fixes 179044) - -* Fri Feb 10 2006 Jesse Keating 1.0.0-2.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating 1.0.0-2.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Sat Dec 24 2005 Mike A. Harris 1.0.0-2 -- Added "Requires: libXau-devel, libXdmcp-devel" to -devel subpackage (#176313) - -* Fri Dec 16 2005 Mike A. Harris 1.0.0-1 -- Updated libX11 to version 1.0.0 from X11R7 RC4 - -* Tue Dec 13 2005 Mike A. Harris 0.99.4-1 -- Updated libX11 to version 0.99.4 from X11R7 RC3 -- Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-3", to ensure - that /usr/lib/X11 and /usr/include/X11 pre-exist. -- Removed 'x' suffix from manpage directories to match RC3 upstream. - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Tue Nov 22 2005 Mike A. Harris 0.99.3-4 -- Added libX11-0.99.3-datadir-locale-dir-fix.patch, to fix build to install - the locale data files into datadir instead of libdir. (#173282) - -* Mon Nov 14 2005 Jeremy Katz 0.99.3-3 -- require newer filesystem package (#172610) - -* Fri Nov 11 2005 Mike A. Harris 0.99.3-2 -- Moved _smp_mflags from 'make install' to 'make' invocation, duh. - -* Fri Nov 11 2005 Mike A. Harris 0.99.3-1 -- Updated libX11 to version 0.99.3 from X11R7 RC2 -- Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes' -- Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes' - -* Mon Nov 07 2005 Mike A. Harris 0.99.2-2 -- Fix devel subpackage summary and description with s/libXdmcp/libX11/ - -* Fri Oct 21 2005 Mike A. Harris 0.99.2-1 -- Updated to libX11-0.99.2 from the X11R7 RC1 release. -- Added en_GR.UTF-8 locale to file manifest. -- Forcibly remove Xcms.txt - -* Sun Oct 02 2005 Mike A. Harris 0.99.0-4 -- Added _smp_mflags to make invocation to speed up SMP builds - -* Thu Sep 29 2005 Mike A. Harris 0.99.0-3 -- Renamed package to remove xorg-x11 from the name due to unanimous decision - between developers. -- Use Fedora Extras style BuildRoot tag. -- Disable static library creation by default. -- Add missing defattr to devel subpackage -- Add missing documentation files to doc macro - -* Tue Aug 23 2005 Mike A. Harris 0.99.0-2 -- Renamed package to prepend "xorg-x11" to the name for consistency with - the rest of the X11R7 packages. -- Added "Requires: %%{name} = %%{version}-%%{release}" dependency to devel - subpackage to ensure the devel package matches the installed shared libs. -- Added virtual "Provides: lib" and "Provides: lib-devel" to - allow applications to use implementation agnostic dependencies. -- Added post/postun scripts which call ldconfig. -- Added Conflicts with XFree86-libs and xorg-x11-libs to runtime package, - and Conflicts with XFree86-devel and xorg-x11-devel to devel package. - -* Mon Aug 22 2005 Mike A. Harris 0.99.0-1.1 -- Added Requires: xorg-x11-proto-devel to libX11-devel subpackage - -* Mon Aug 22 2005 Mike A. Harris 0.99.0-1 -- Initial build. diff --git a/sources b/sources index 95cf6e1..0b8f573 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libX11-1.6.5.tar.bz2) = 63c40d37c92b8d1ac78541830b0c624c4e936924b26bce769936e0e2523fa8997be364647705057065f803f804897ea8173d1c41ef69a92832f20cc7c0fd40a0 +SHA512 (libX11-1.6.6.tar.bz2) = 9866dc6b158b15a96efe140b6fa68a775889a37e5565a126216211fee63868e02629a9f9f41816d590ef150560f43b8864010a77a6318c9109e76aec1d21b4d7