rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=133

Browse Source
This commit is contained in:
OBS User unknown 2009-07-08 22:02:21 +00:00 committed by Git OBS Bridge
parent e4d3c89642
commit 1b40f19b05
10 changed files with 39 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
bug-507190_xorg-x11-server-bnc381139-randr-fix-timestamps.diff
View File

@ -1,140 +0,0 @@
From 0b1a5ecb8f7f8338cffff5b2441116687d2bbb66 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 28 May 2009 14:46:05 -0700
Subject: [PATCH 1/3] Make RANDR 'set' timestamps follow client specified time. Bug 21987.
The lastSetTime value which indicates when the configuration within the
server was last changed was not getting set in the appropriate RandR
requests.
Signed-off-by: Keith Packard <keithp@keithp.com>
---
randr/rrcrtc.c | 3 ++-
randr/rrscreen.c | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index ec65a04..3bd0138 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -837,6 +837,7 @@ ProcRRSetCrtcConfig (ClientPtr client)
goto sendReply;
}
rep.status = RRSetConfigSuccess;
+ pScrPriv->lastSetTime = time;
sendReply:
if (outputs)
@@ -846,7 +847,7 @@ sendReply:
/* rep.status has already been filled in */
rep.length = 0;
rep.sequenceNumber = client->sequence;
- rep.newTimestamp = pScrPriv->lastConfigTime.milliseconds;
+ rep.newTimestamp = pScrPriv->lastSetTime.milliseconds;
if (client->swapped)
{
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index f391973..6683731 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -921,8 +921,10 @@ ProcRRSetScreenConfig (ClientPtr client)
if (!RRCrtcSet (crtc, mode, 0, 0, stuff->rotation, 1, &output))
rep.status = RRSetConfigFailed;
- else
+ else {
+ pScreenPriv->lastSetTime = time;
rep.status = RRSetConfigSuccess;
+ }
/*
* XXX Configure other crtcs to mirror as much as possible
--
1.6.0.2
From 33944b5fe72385b40ff9a8ed42394ce1687b3974 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@novell.com>
Date: Fri, 29 May 2009 13:57:05 -0500
Subject: [PATCH 2/3] Add missing fields to SRR*NotifyEvent()
Also, remove redundant field swaps and make others match the order in which
they are declared in the xRR*NotifyEvent structs.
Signed-off-by: Federico Mena Quintero <federico@novell.com>
---
randr/randr.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/randr/randr.c b/randr/randr.c
index bc2b995..77807d8 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -120,11 +120,11 @@ SRRScreenChangeNotifyEvent(xRRScreenChangeNotifyEvent *from,
cpswapl(from->root, to->root);
cpswapl(from->window, to->window);
cpswaps(from->sizeID, to->sizeID);
+ cpswaps(from->subpixelOrder, to->subpixelOrder);
cpswaps(from->widthInPixels, to->widthInPixels);
cpswaps(from->heightInPixels, to->heightInPixels);
cpswaps(from->widthInMillimeters, to->widthInMillimeters);
cpswaps(from->heightInMillimeters, to->heightInMillimeters);
- cpswaps(from->subpixelOrder, to->subpixelOrder);
}
static void
@@ -138,7 +138,6 @@ SRRCrtcChangeNotifyEvent(xRRCrtcChangeNotifyEvent *from,
cpswapl(from->window, to->window);
cpswapl(from->crtc, to->crtc);
cpswapl(from->mode, to->mode);
- cpswapl(from->window, to->window);
cpswaps(from->rotation, to->rotation);
cpswaps(from->x, to->x);
cpswaps(from->y, to->y);
@@ -160,6 +159,8 @@ SRROutputChangeNotifyEvent(xRROutputChangeNotifyEvent *from,
cpswapl(from->crtc, to->crtc);
cpswapl(from->mode, to->mode);
cpswaps(from->rotation, to->rotation);
+ to->connection = from->connection;
+ to->subpixelOrder = from->subpixelOrder;
}
static void
@@ -173,6 +174,7 @@ SRROutputPropertyNotifyEvent(xRROutputPropertyNotifyEvent *from,
cpswapl(from->output, to->output);
cpswapl(from->atom, to->atom);
cpswapl(from->timestamp, to->timestamp);
+ to->state = from->state;
}
static void
--
1.6.0.2
From 9834c1c5d27eedc28ff8e488c476f12487a1d749 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@novell.com>
Date: Fri, 29 May 2009 17:07:08 -0500
Subject: [PATCH 3/3] Fix field name
---
randr/rrscreen.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index 6683731..aa85a9b 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -922,7 +922,7 @@ ProcRRSetScreenConfig (ClientPtr client)
if (!RRCrtcSet (crtc, mode, 0, 0, stuff->rotation, 1, &output))
rep.status = RRSetConfigFailed;
else {
- pScreenPriv->lastSetTime = time;
+ pScrPriv->lastSetTime = time;
rep.status = RRSetConfigSuccess;
}
--
1.6.0.2

21
includes-fix.diff
View File

@ -1,21 +0,0 @@
--- hw/xfree86/common/Makefile.am.orig 2009-06-19 21:06:18.000000000 +0200
+++ hw/xfree86/common/Makefile.am 2009-06-19 21:08:00.000000000 +0200
@@ -47,7 +47,7 @@
xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
xf86cmap.h xf86fbman.h xf86str.h xf86RAC.h xf86Xinput.h xisb.h \
$(XVSDKINCS) xorgVersion.h \
- xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h
+ xf86sbusBus.h xf86xvpriv.h
DISTCLEANFILES = xf86Build.h
CLEANFILES = $(BUILT_SOURCES)
--- hw/xfree86/parser/Makefile.am.orig 2009-06-19 19:20:14.000000000 +0000
+++ hw/xfree86/parser/Makefile.am 2009-06-19 19:21:53.000000000 +0000
@@ -35,6 +35,4 @@
xf86tokens.h
sdk_HEADERS = \
- $(LIBHEADERS) \
- xf86Parser.h \
- xf86Optrec.h
+ $(LIBHEADERS)

31
security-Fix-a-crash-caused-by-wrong-ordering-of-fo.patch
View File

@ -1,31 +0,0 @@
From 5d48f288eccb57dfe1751946c9d60dbd3ac0129a Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 16 Apr 2009 22:39:54 -0400
Subject: security: Fix a crash caused by wrong ordering of format arguments.
(cherry picked from commit 3481b32ab971c41cb972f6819ae049f3e9f7033b)
---
Xext/security.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Xext/security.c b/Xext/security.c
index 4b34bb0..e660cc8 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -948,9 +948,10 @@ SecuritySend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
SecurityAudit("Security: denied client %d from sending event "
"of type %s to window 0x%x of client %d\n",
- rec->client->index, rec->pWin->drawable.id,
- wClient(rec->pWin)->index,
- LookupEventName(rec->events[i].u.u.type));
+ rec->client->index,
+ LookupEventName(rec->events[i].u.u.type),
+ rec->pWin->drawable.id,
+ wClient(rec->pWin)->index);
rec->status = BadAccess;
return;
}
--
1.6.1.3

38
security-Grant-untrusted-windows-remove-access-on-a.patch
View File

@ -1,38 +0,0 @@
From 11db545a86c8933c638a0bc1fcd4f2c65279f617 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 16 Apr 2009 22:48:11 -0400
Subject: security: Grant untrusted windows remove access on all windows.
This allows untrusted clients to destroy their own windows when they
have been reparented by a trusted window manager.
(cherry picked from commit 4559d2ace6ac55fe361f572ded0769cdd1f3b545)
---
Xext/security.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Xext/security.c b/Xext/security.c
index e660cc8..b9f411e 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -74,6 +74,7 @@ static char *SecurityTrustedExtensions[] = {
static const Mask SecurityResourceMask =
DixGetAttrAccess | DixReceiveAccess | DixListPropAccess |
DixGetPropAccess | DixListAccess;
+static const Mask SecurityWindowExtraMask = DixRemoveAccess;
static const Mask SecurityRootWindowExtraMask =
DixReceiveAccess | DixSendAccess | DixAddAccess | DixRemoveAccess;
static const Mask SecurityDeviceMask =
@@ -817,6 +818,10 @@ SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
if (subj->haveState && subj->trustLevel != XSecurityClientTrusted)
((WindowPtr)rec->res)->forcedBG = TRUE;
+ /* additional permissions for specific resource types */
+ if (rec->rtype == RT_WINDOW)
+ allowed |= SecurityWindowExtraMask;
+
/* special checks for server-owned resources */
if (cid == 0) {
if (rec->rtype & RC_DRAWABLE)
--
1.6.1.3

67
security-Revert-behavior-of-extension-access-for-co.patch
View File

@ -1,67 +0,0 @@
From 93e0a648138e569087fc6e07c1a28abfa92a4dde Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 16 Apr 2009 22:33:12 -0400
Subject: security: Revert behavior of extension access for compatibility.
Previously, three extensions were defined as "trusted" by the extension:
BIG-REQUESTS, XC-MISC, and XPrint. No other extensions were permitted
to be used by untrusted clients.
In commit 8b5d21cc1d1f4e9d20e5d5eca44cb1e60a419763 this was changed for
some reason. Return to the old, compatible behavior.
(cherry picked from commit 6045506be0cebca4ebbe943ae77f020aafa703d4)
---
Xext/security.c | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/Xext/security.c b/Xext/security.c
index e379063..4b34bb0 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -61,10 +61,10 @@ typedef struct {
} SecurityStateRec;
/* Extensions that untrusted clients shouldn't have access to */
-static char *SecurityUntrustedExtensions[] = {
- "RandR",
- "SECURITY",
- "XFree86-DGA",
+static char *SecurityTrustedExtensions[] = {
+ "XC-MISC",
+ "BIG-REQUESTS",
+ "XpExtension",
NULL
};
@@ -852,16 +852,18 @@ SecurityExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
- if (subj->haveState && subj->trustLevel != XSecurityClientTrusted)
- while (SecurityUntrustedExtensions[i])
- if (!strcmp(SecurityUntrustedExtensions[i++], rec->ext->name)) {
- SecurityAudit("Security: denied client %d access to extension "
- "%s on request %s\n",
- rec->client->index, rec->ext->name,
- SecurityLookupRequestName(rec->client));
- rec->status = BadAccess;
- return;
- }
+ if (subj->haveState && subj->trustLevel == XSecurityClientTrusted)
+ return;
+
+ while (SecurityTrustedExtensions[i])
+ if (!strcmp(SecurityTrustedExtensions[i++], rec->ext->name))
+ return;
+
+ SecurityAudit("Security: denied client %d access to extension "
+ "%s on request %s\n",
+ rec->client->index, rec->ext->name,
+ SecurityLookupRequestName(rec->client));
+ rec->status = BadAccess;
}
static void
--
1.6.1.3

3
xorg-server-1.6.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0edbaa994797cb7944a4129d33b634ad99164b21ec32355d56996a178d38bfcf
size 4636802

3
xorg-server-1.6.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:893e92ad2ccd1bcd646bba9540dd9dfc53ccc95f8dc5fd69444afe54fae8c261
size 4647067

15
xorg-x11-server.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Jul 8 02:09:43 CEST 2009 - sndirsch@novell.com
- xorg-server 1.6.2
* This is the second update to the 1.6 version and is designed
to be a drop-in compatible version with various bug fixes and
other improvements.
- obsoletes various patches
* bug-507190_xorg-x11-server-bnc381139-randr-fix-timestamps.diff
* includes-fix.diff
* security-Fix-a-crash-caused-by-wrong-ordering-of-fo.patch
* security-Grant-untrusted-windows-remove-access-on-a.patch
* security-Revert-behavior-of-extension-access-for-co.patch
- adjusted zap_warning_xserver.diff
-------------------------------------------------------------------
Thu Jul 2 15:51:47 CEST 2009 - mhopf@novell.com

14
xorg-x11-server.spec
View File

@ -20,7 +20,7 @@
%define moblin 0
Name: xorg-x11-server
%define dirsuffix 1.6.1
%define dirsuffix 1.6.2
%define fglrx_driver_hack 0
### FIXME
%define vnc 1
@ -33,7 +33,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.4
Release: 45
Release: 46
License: GPL v2 or later ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@ -112,21 +112,16 @@ Patch129: bug474071-fix1.diff
Patch131: commit-cadf65a.diff
Patch132: fixed-SYNC-extension-trigger-BlockHandler-test.diff
Patch140: fbdev_fallback_fail_fix.diff
Patch141: bug-507190_xorg-x11-server-bnc381139-randr-fix-timestamps.diff
Patch142: bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff
Patch143: autoconfig_fallback_fbdev_first.diff
Patch144: keyrelease-1.5.2.diff
Patch145: driver-autoconfig.diff
Patch146: includes-fix.diff
Patch147: truetype_fontpath.diff
Patch160: libdri_noPanoramiXExtension_symbol.patch
Patch161: cache-xkbcomp-output-for-fast-start-up.patch
Patch162: xserver-boottime.patch
Patch163: xserver-1.5.0-bg-none-root.patch
Patch164: xorg-detect-psb.patch
Patch165: security-Revert-behavior-of-extension-access-for-co.patch
Patch166: security-Fix-a-crash-caused-by-wrong-ordering-of-fo.patch
Patch167: security-Grant-untrusted-windows-remove-access-on-a.patch
Patch168: 0001-Unclaim-PCI-slot-if-driver-probing-fails.patch
%description
@ -246,12 +241,10 @@ popd
%patch131 -p1
%patch132 -p1
%patch140 -p1
%patch141 -p1
%patch142 -p1
%patch143 -p0
%patch144 -p1
%patch145 -p0
%patch146 -p0
%patch147 -p0
%patch160 -p1
%patch161 -p1
@ -260,9 +253,6 @@ popd
%patch163 -p1
%endif
%patch164 -p1
%patch165 -p1
%patch166 -p1
%patch167 -p1
%patch168 -p1
%build

59
zap_warning_xserver.diff
View File

@ -62,33 +62,6 @@ diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/doc/man/xorg.conf.man.pre xorg-se
.BI "Option \*qDontZoom\*q \*q" boolean \*q
This disallows the use of the
.B Ctrl+Alt+Keypad\-Plus
--- xorg-server-1.6.0/hw/xfree86/common/xf86Config.c.orig 2009-02-25 20:12:11.000000000 +0100
+++ xorg-server-1.6.0/hw/xfree86/common/xf86Config.c 2009-02-27 16:28:19.000000000 +0100
@@ -697,6 +697,7 @@ typedef enum {
FLAG_NOTRAPSIGNALS,
FLAG_DONTVTSWITCH,
FLAG_DONTZAP,
+ FLAG_ZAPWARNING,
FLAG_DONTZOOM,
FLAG_DISABLEVIDMODE,
FLAG_ALLOWNONLOCAL,
@@ -734,6 +735,8 @@ static OptionInfoRec FlagOptions[] = {
{0}, FALSE },
{ FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
{0}, TRUE },
+ { FLAG_ZAPWARNING, "ZapWarning", OPTV_BOOLEAN,
+ {0}, FALSE },
{ FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN,
{0}, FALSE },
{ FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN,
@@ -847,6 +850,7 @@ configServerFlags(XF86ConfFlagsPtr flags
xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
if (!xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap))
xf86Info.dontZap = !party_like_its_1989;
+ xf86GetOptValBool(FlagOptions, FLAG_ZAPWARNING, &xf86Info.ZapWarning);
xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
--- xorg-server-1.6.0/hw/xfree86/common/xf86Globals.c.orig 2009-02-27 16:23:51.000000000 +0100
+++ xorg-server-1.6.0/hw/xfree86/common/xf86Globals.c 2009-02-27 16:30:19.000000000 +0100
@@ -106,6 +106,7 @@ xf86InfoRec xf86Info = {
@ -112,24 +85,30 @@ diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/doc/man/xorg.conf.man.pre xorg-se
.TP 8
.B Ctrl+Alt+Keypad-Plus
Change video mode to next one specified in the configuration file.
--- xorg-server-1.6.0/hw/xfree86/common/xf86Config.c.orig 2009-02-28 20:29:42.000000000 +0100
+++ xorg-server-1.6.0/hw/xfree86/common/xf86Config.c 2009-02-28 20:30:44.000000000 +0100
@@ -734,7 +734,7 @@ static OptionInfoRec FlagOptions[] = {
{ FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN,
--- xorg-server-1.6.2/hw/xfree86/common/xf86Config.c.orig 2009-07-07 19:48:58.000000000 +0200
+++ xorg-server-1.6.2/hw/xfree86/common/xf86Config.c 2009-07-08 02:46:35.000000000 +0200
@@ -706,6 +706,7 @@
FLAG_NOTRAPSIGNALS,
FLAG_DONTVTSWITCH,
FLAG_DONTZAP,
+ FLAG_ZAPWARNING,
FLAG_DONTZOOM,
FLAG_DISABLEVIDMODE,
FLAG_ALLOWNONLOCAL,
@@ -743,6 +744,8 @@
{0}, FALSE },
{ FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
- {0}, TRUE },
+ {0}, FALSE },
{ FLAG_ZAPWARNING, "ZapWarning", OPTV_BOOLEAN,
{0}, FALSE },
+ { FLAG_ZAPWARNING, "ZapWarning", OPTV_BOOLEAN,
+ {0}, FALSE },
{ FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN,
@@ -848,8 +848,7 @@ configServerFlags(XF86ConfFlagsPtr flags
{0}, FALSE },
{ FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN,
@@ -855,6 +858,7 @@
xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
- if (!xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap))
- xf86Info.dontZap = !party_like_its_1989;
+ xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
xf86GetOptValBool(FlagOptions, FLAG_ZAPWARNING, &xf86Info.ZapWarning);
xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
+ xf86GetOptValBool(FlagOptions, FLAG_ZAPWARNING, &xf86Info.ZapWarning);
xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);