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=6

Browse Source
This commit is contained in:
OBS User unknown 2007-01-15 23:16:34 +00:00 committed by Git OBS Bridge
parent 903ab05768
commit c2f5f16884
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
loadmod-bug197195.diff Normal file
View File

@ -0,0 +1,15 @@
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 12f5dc9..c84529f 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -408,8 +408,8 @@ FindModuleInSubdir(const char *dirpath,
while ((direntry = readdir(dir))) {
if (direntry->d_name[0] == '.')
continue;
- if ((stat(direntry->d_name, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
- snprintf(tmpBuf, PATH_MAX, "%s/%s", dirpath, direntry->d_name);
+ snprintf(tmpBuf, PATH_MAX, "%s/%s", dirpath, direntry->d_name);
+ if ((stat(tmpBuf, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
if ((ret = FindModuleInSubdir(tmpBuf, module)))
break;
continue;

6
xorg-x11-server.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 15 18:27:54 CET 2007 - sndirsch@suse.de
- loadmod-bug197195.diff:
* check the complete path (Bug #197195)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 14 15:12:59 CET 2007 - sndirsch@suse.de Sun Jan 14 15:12:59 CET 2007 - sndirsch@suse.de

7
xorg-x11-server.spec
View File

@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel
URL: http://xorg.freedesktop.org/ URL: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0 %define EXPERIMENTAL 0
Version: 7.2 Version: 7.2
Release: 41 Release: 42
License: X11/MIT License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
@ -81,6 +81,7 @@ Patch38: cve-2006-6101_6102_6103.diff
Patch39: 0018-vnc-support.txt Patch39: 0018-vnc-support.txt
Patch40: 0018-vnc-support.txt.diff Patch40: 0018-vnc-support.txt.diff
%endif %endif
Patch41: loadmod-bug197195.diff
Patch334: p_pci-domain.diff Patch334: p_pci-domain.diff
Patch357: p_pci-ce-x.diff Patch357: p_pci-ce-x.diff
@ -173,6 +174,7 @@ popd
%patch39 -p1 %patch39 -p1
%patch40 -p0 %patch40 -p0
%endif %endif
%patch41 -p1
%build %build
autoreconf -fi autoreconf -fi
@ -496,6 +498,9 @@ exit 0
%endif %endif
%changelog -n xorg-x11-server %changelog -n xorg-x11-server
* Mon Jan 15 2007 - sndirsch@suse.de
- loadmod-bug197195.diff:
* check the complete path (Bug #197195)
* Sun Jan 14 2007 - sndirsch@suse.de * Sun Jan 14 2007 - sndirsch@suse.de
- added build of VNC support (0018-vnc-support.txt/ - added build of VNC support (0018-vnc-support.txt/
0018-vnc-support.txt.diff); see 0018-vnc-support.txt.mbox for 0018-vnc-support.txt.diff); see 0018-vnc-support.txt.mbox for