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

Accepting request 480845 from X11:XOrg

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/480845
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=342
This commit is contained in:
Dominique Leuenberger 2017-03-21 21:45:43 +00:00 committed by Git OBS Bridge
commit 6e8f29c351
5 changed files with 13 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
u_busfault_sigaction-Only-initialize-pointer-when-matched.patch
View File

@ -1,42 +0,0 @@
From: Egbert Eich <eich@suse.de>
Date: Mon Jan 11 21:48:15 2016 +0100
Subject: [PATCH]busfault_sigaction: Only initialize pointer when matched
Patch-mainline: to be upstreamed
References: boo#961439
Signed-off-by: Egbert Eich <eich@suse.com>
When looping over the registered map ranges, don't use
the variable holding the final result as loop variable -
It would always be initialized, on an empty list or
when we run past the end of the list when no entry was
found.
Signed-off-by: Egbert Eich <eich@suse.de>
---
os/busfault.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/os/busfault.c b/os/busfault.c
index d4afa6d..53f02e6 100644
--- a/os/busfault.c
+++ b/os/busfault.c
@@ -98,13 +98,15 @@ static void
busfault_sigaction(int sig, siginfo_t *info, void *param)
{
void *fault = info->si_addr;
- struct busfault *busfault = NULL;
+ struct busfault *tmp, *busfault = NULL;
void *new_addr;
/* Locate the faulting address in our list of shared segments
*/
- xorg_list_for_each_entry(busfault, &busfaults, list) {
- if ((char *) busfault->addr <= (char *) fault && (char *) fault < (char *) busfault->addr + busfault->size) {
+ xorg_list_for_each_entry(tmp, &busfaults, list) {
+ if ((char *) tmp->addr <= (char *) fault &&
+ (char *) fault < (char *) tmp->addr + tmp->size) {
+ busfault = tmp;
break;
}
}

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

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

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

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

9
xorg-x11-server.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Mar 17 12:29:42 UTC 2017 - tobias.johannes.klausmann@mni.thm.de
- Update to version 1.19.3:
A couple more minor fixes, most notably a revert of a page-flipping
change that regressed some drivers.
- Remove upstreamd patches:
+ u_busfault_sigaction-Only-initialize-pointer-when-matched.patch
-------------------------------------------------------------------
Thu Mar 2 23:29:00 UTC 2017 - tobias.johannes.klausmann@mni.thm.de

4
xorg-x11-server.spec
View File

@ -41,7 +41,7 @@
%endif
Name: xorg-x11-server
Version: 1.19.2
Version: 1.19.3
Release: 0
Url: http://xorg.freedesktop.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -200,7 +200,6 @@ Patch117: xorg-x11-server-byte-order.patch
Patch160: u_vesa-Add-VBEDPMSGetCapabilities-VBEDPMSGet.patch
Patch206: u_busfault_sigaction-Only-initialize-pointer-when-matched.patch
Patch208: u_Panning-Set-panning-state-in-xf86RandR12ScreenSetSize.patch
Patch209: u_pci-primary-Fix-up-primary-PCI-device-detection-for-the-platfrom-bus.patch
Patch210: u_os-connections-Check-for-stale-FDs.patch
@ -330,7 +329,6 @@ sh %{SOURCE92} --verify . %{SOURCE91}
%patch160 -p1
%patch206 -p1
%patch208 -p1
%patch209 -p1