This commit is contained in:
parent
ea401e969d
commit
9c7dca0690
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:2f8c004c0b914d460e6fd2b48d8b425cf4778d415467fc1f1d938b200462d18b
|
|
||||||
size 573915
|
|
3
libXfont-1.2.8.tar.bz2
Normal file
3
libXfont-1.2.8.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:374a2ca12f62a4d9f09a17a34765a5289cefa9db7f9f0913e1c3731b4088aad8
|
||||||
|
size 583236
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:7e6339539d3d0a4fc95cc23ca2b13ae67dd783e011b3cc5ca76040e376bff57f
|
|
||||||
size 244920
|
|
3
libXi-1.0.4.tar.bz2
Normal file
3
libXi-1.0.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:6296c2ab6b630857c5bfa446c42a8570d57d6e44932288e58bddfcdcf5360ef2
|
||||||
|
size 247794
|
@ -1,70 +0,0 @@
|
|||||||
commit 5dda1e1509d40ef64ebc816ce538cef462a4fa51
|
|
||||||
Author: Jamey Sharp <jamey@minilop.net>
|
|
||||||
Date: Sun Oct 15 00:03:57 2006 -0700
|
|
||||||
|
|
||||||
Don't call XInput_find_display in _XiGetExtensionVersion, while the Display lock is held.
|
|
||||||
|
|
||||||
_XiGetExtensionVersion has two callers. One had already called
|
|
||||||
XInput_find_display, and the other could easily do so outside the
|
|
||||||
Display lock. So I change the _XiGetExtensionVersion interface to
|
|
||||||
accept a previously-computed XExtDisplayInfo from the caller.
|
|
||||||
Besides being more correct, this should be slightly faster. :-)
|
|
||||||
|
|
||||||
Thanks to Magnus Kessler <Magnus.Kessler@gmx.net> for identifying
|
|
||||||
the bug and proposing a workaround.
|
|
||||||
|
|
||||||
diff --git a/src/XExtInt.c b/src/XExtInt.c
|
|
||||||
index e5baccb..aa838ef 100644
|
|
||||||
--- a/src/XExtInt.c
|
|
||||||
+++ b/src/XExtInt.c
|
|
||||||
@@ -207,7 +207,7 @@ _XiCheckExtInit(dpy, version_index)
|
|
||||||
return (-1);
|
|
||||||
}
|
|
||||||
((XInputData *) info->data)->vers =
|
|
||||||
- _XiGetExtensionVersion(dpy, "XInputExtension");
|
|
||||||
+ _XiGetExtensionVersion(dpy, "XInputExtension", info);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (versions[version_index].major_version > Dont_Check) {
|
|
||||||
diff --git a/src/XGetVers.c b/src/XGetVers.c
|
|
||||||
index 1f4fd7a..ef41fea 100644
|
|
||||||
--- a/src/XGetVers.c
|
|
||||||
+++ b/src/XGetVers.c
|
|
||||||
@@ -64,9 +64,10 @@ XExtensionVersion *
|
|
||||||
XGetExtensionVersion(register Display * dpy, _Xconst char *name)
|
|
||||||
{
|
|
||||||
XExtensionVersion *ext;
|
|
||||||
+ XExtDisplayInfo *info = XInput_find_display(dpy);
|
|
||||||
|
|
||||||
LockDisplay(dpy);
|
|
||||||
- ext = _XiGetExtensionVersion(dpy, name);
|
|
||||||
+ ext = _XiGetExtensionVersion(dpy, name, info);
|
|
||||||
if (ext != (XExtensionVersion *) NoSuchExtension) {
|
|
||||||
UnlockDisplay(dpy);
|
|
||||||
SyncHandle();
|
|
||||||
@@ -75,12 +76,11 @@ XGetExtensionVersion(register Display *
|
|
||||||
}
|
|
||||||
|
|
||||||
XExtensionVersion *
|
|
||||||
-_XiGetExtensionVersion(register Display * dpy, _Xconst char *name)
|
|
||||||
+_XiGetExtensionVersion(register Display * dpy, _Xconst char *name, XExtDisplayInfo *info)
|
|
||||||
{
|
|
||||||
xGetExtensionVersionReq *req;
|
|
||||||
xGetExtensionVersionReply rep;
|
|
||||||
XExtensionVersion *ext;
|
|
||||||
- XExtDisplayInfo *info = XInput_find_display(dpy);
|
|
||||||
|
|
||||||
if (_XiCheckExtInit(dpy, Dont_Check) == -1)
|
|
||||||
return ((XExtensionVersion *) NoSuchExtension);
|
|
||||||
diff --git a/src/XIint.h b/src/XIint.h
|
|
||||||
index ba965a6..ae6d33f 100644
|
|
||||||
--- a/src/XIint.h
|
|
||||||
+++ b/src/XIint.h
|
|
||||||
@@ -12,6 +12,6 @@ extern XExtDisplayInfo *XInput_find_disp
|
|
||||||
|
|
||||||
extern int _XiCheckExtInit(Display *, int);
|
|
||||||
|
|
||||||
-extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *);
|
|
||||||
+extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *, XExtDisplayInfo *);
|
|
||||||
|
|
||||||
#endif
|
|
@ -1,45 +0,0 @@
|
|||||||
commit 60dccd9a7be95e35b4b8c90934888efedfde84cc
|
|
||||||
Author: Jamey Sharp <jamey@minilop.net>
|
|
||||||
Date: Sun Nov 19 01:04:26 2006 -0800
|
|
||||||
|
|
||||||
Bug #8663: _XiCheckExtInit must drop the Display lock in all error cases.
|
|
||||||
|
|
||||||
diff --git a/src/XExtInt.c b/src/XExtInt.c
|
|
||||||
index 427e406..8366104 100644
|
|
||||||
--- a/src/XExtInt.c
|
|
||||||
+++ b/src/XExtInt.c
|
|
||||||
@@ -80,9 +80,6 @@ typedef struct _XInputData
|
|
||||||
XExtensionVersion *vers;
|
|
||||||
} XInputData;
|
|
||||||
|
|
||||||
-#define XInputCheckExtension(dpy,i,val) \
|
|
||||||
- XextCheckExtension (dpy, i, xinput_extension_name, val)
|
|
||||||
-
|
|
||||||
static /* const */ XExtensionHooks xinput_extension_hooks = {
|
|
||||||
NULL, /* create_gc */
|
|
||||||
NULL, /* copy_gc */
|
|
||||||
@@ -183,6 +180,12 @@ _xidevicebusy(dpy, error)
|
|
||||||
*error = info->codes->first_error + XI_DeviceBusy;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int XInputCheckExtension(Display *dpy, XExtDisplayInfo *info)
|
|
||||||
+{
|
|
||||||
+ XextCheckExtension (dpy, info, xinput_extension_name, 0);
|
|
||||||
+ return 1;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/***********************************************************************
|
|
||||||
*
|
|
||||||
* Check to see if the input extension is installed in the server.
|
|
||||||
@@ -198,7 +201,10 @@ _XiCheckExtInit(dpy, version_index, info
|
|
||||||
{
|
|
||||||
XExtensionVersion *ext;
|
|
||||||
|
|
||||||
- XInputCheckExtension(dpy, info, -1);
|
|
||||||
+ if (!XInputCheckExtension(dpy, info)) {
|
|
||||||
+ UnlockDisplay(dpy);
|
|
||||||
+ return (-1);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (info->data == NULL) {
|
|
||||||
info->data = (XPointer) Xmalloc(sizeof(XInputData));
|
|
@ -1,3 +1,37 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 11 22:12:01 CEST 2007 - sndirsch@suse.de
|
||||||
|
|
||||||
|
- updated libXi to release 1.0.4
|
||||||
|
* Don't call XInput_find_display in _XiGetExtensionVersion, while
|
||||||
|
the Display lock is held.
|
||||||
|
- obsoletes libXi-20061015090357.diff
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 11 03:52:26 CEST 2007 - sndirsch@suse.de
|
||||||
|
|
||||||
|
- updated libXi to release 1.0.3
|
||||||
|
* X.Org Bug #8663: _XiCheckExtInit must drop the Display lock in
|
||||||
|
all error cases
|
||||||
|
- obsoletes libXi-20061119100426.diff
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Apr 6 11:45:46 CEST 2007 - sndirsch@suse.de
|
||||||
|
|
||||||
|
- updated libXfont to release 1.2.8:
|
||||||
|
* Actually use loadable font modules
|
||||||
|
* Add #pragma weak for Sun cc where needed
|
||||||
|
* added -flat_namespace to CFLAGS for Darwin
|
||||||
|
* Integer overflow vulnerabilities
|
||||||
|
- obsoletes bug-247730-247732_libXfont.diff
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 26 12:57:55 CEST 2007 - sndirsch@suse.de
|
||||||
|
|
||||||
|
- bug-247730-247732_libXfont.diff:
|
||||||
|
* X Window System Server fonts.dir File Parsing Integer Overflow
|
||||||
|
Vulnerability / X Window System Server BDF Font Parsing Integer
|
||||||
|
Overflow Vulnerability (Bugs #247730, #247732)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Mar 17 11:11:50 CET 2007 - sndirsch@suse.de
|
Sat Mar 17 11:11:50 CET 2007 - sndirsch@suse.de
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ Provides: libXaw.so.8 libXaw.so.7 libXaw.so.6
|
|||||||
%endif
|
%endif
|
||||||
URL: http://xorg.freedesktop.org/
|
URL: http://xorg.freedesktop.org/
|
||||||
Version: 7.2
|
Version: 7.2
|
||||||
Release: 48
|
Release: 53
|
||||||
License: X11/MIT
|
License: X11/MIT
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
@ -34,10 +34,10 @@ Source6: libXcomposite-0.3.1.tar.bz2
|
|||||||
Source7: libXcursor-1.1.8.tar.bz2
|
Source7: libXcursor-1.1.8.tar.bz2
|
||||||
Source8: libXdamage-1.1.1.tar.bz2
|
Source8: libXdamage-1.1.1.tar.bz2
|
||||||
Source9: libXevie-1.0.2.tar.bz2
|
Source9: libXevie-1.0.2.tar.bz2
|
||||||
Source10: libXfont-1.2.7.tar.bz2
|
Source10: libXfont-1.2.8.tar.bz2
|
||||||
Source11: libXfontcache-1.0.4.tar.bz2
|
Source11: libXfontcache-1.0.4.tar.bz2
|
||||||
Source12: libXft-2.1.12.tar.bz2
|
Source12: libXft-2.1.12.tar.bz2
|
||||||
Source13: libXi-1.0.2.tar.bz2
|
Source13: libXi-1.0.4.tar.bz2
|
||||||
Source14: libXinerama-1.0.2.tar.bz2
|
Source14: libXinerama-1.0.2.tar.bz2
|
||||||
Source15: libXprintAppUtil-X11R7.0-1.0.1.tar.bz2
|
Source15: libXprintAppUtil-X11R7.0-1.0.1.tar.bz2
|
||||||
Source16: libXrandr-1.2.1.tar.bz2
|
Source16: libXrandr-1.2.1.tar.bz2
|
||||||
@ -61,8 +61,6 @@ Patch2: libXft-2.1.7-lcd-filter-2.patch
|
|||||||
Patch3: p_xft_cjk.diff
|
Patch3: p_xft_cjk.diff
|
||||||
Patch4: p_xft_register.diff
|
Patch4: p_xft_register.diff
|
||||||
Patch5: libxkbui.diff
|
Patch5: libxkbui.diff
|
||||||
Patch6: libXi-20061015090357.diff
|
|
||||||
Patch7: libXi-20061119100426.diff
|
|
||||||
Patch8: bug233919-libXaw.diff
|
Patch8: bug233919-libXaw.diff
|
||||||
Patch10: libXxf86misc-xcb.diff
|
Patch10: libXxf86misc-xcb.diff
|
||||||
|
|
||||||
@ -145,10 +143,6 @@ popd
|
|||||||
pushd libxkbui-*
|
pushd libxkbui-*
|
||||||
%patch5
|
%patch5
|
||||||
popd
|
popd
|
||||||
pushd libXi-*
|
|
||||||
%patch6 -p1
|
|
||||||
%patch7 -p1
|
|
||||||
popd
|
|
||||||
pushd libXaw-*
|
pushd libXaw-*
|
||||||
%patch8 -p0
|
%patch8 -p0
|
||||||
popd
|
popd
|
||||||
@ -221,6 +215,28 @@ exit 0
|
|||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Apr 11 2007 - sndirsch@suse.de
|
||||||
|
- updated libXi to release 1.0.4
|
||||||
|
* Don't call XInput_find_display in _XiGetExtensionVersion, while
|
||||||
|
the Display lock is held.
|
||||||
|
- obsoletes libXi-20061015090357.diff
|
||||||
|
* Wed Apr 11 2007 - sndirsch@suse.de
|
||||||
|
- updated libXi to release 1.0.3
|
||||||
|
* X.Org Bug #8663: _XiCheckExtInit must drop the Display lock in
|
||||||
|
all error cases
|
||||||
|
- obsoletes libXi-20061119100426.diff
|
||||||
|
* Fri Apr 06 2007 - sndirsch@suse.de
|
||||||
|
- updated libXfont to release 1.2.8:
|
||||||
|
* Actually use loadable font modules
|
||||||
|
* Add #pragma weak for Sun cc where needed
|
||||||
|
* added -flat_namespace to CFLAGS for Darwin
|
||||||
|
* Integer overflow vulnerabilities
|
||||||
|
- obsoletes bug-247730-247732_libXfont.diff
|
||||||
|
* Mon Mar 26 2007 - sndirsch@suse.de
|
||||||
|
- bug-247730-247732_libXfont.diff:
|
||||||
|
* X Window System Server fonts.dir File Parsing Integer Overflow
|
||||||
|
Vulnerability / X Window System Server BDF Font Parsing Integer
|
||||||
|
Overflow Vulnerability (Bugs #247730, #247732)
|
||||||
* Sat Mar 17 2007 - sndirsch@suse.de
|
* Sat Mar 17 2007 - sndirsch@suse.de
|
||||||
- updated libXinerama to release 1.0.2
|
- updated libXinerama to release 1.0.2
|
||||||
* Add support for source code checkers such as sparse & lint
|
* Add support for source code checkers such as sparse & lint
|
||||||
|
Loading…
Reference in New Issue
Block a user