From c2f5f1688465e1db4f2658eac23488ca136c8540fe18052fd59bf45b299a429e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 15 Jan 2007 23:16:34 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=6 --- loadmod-bug197195.diff | 15 +++++++++++++++ xorg-x11-server.changes | 6 ++++++ xorg-x11-server.spec | 7 ++++++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 loadmod-bug197195.diff diff --git a/loadmod-bug197195.diff b/loadmod-bug197195.diff new file mode 100644 index 0000000..68635ea --- /dev/null +++ b/loadmod-bug197195.diff @@ -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; diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 15abcbe..49147b4 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -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 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 49df79b..b70fa52 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel URL: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.2 -Release: 41 +Release: 42 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -81,6 +81,7 @@ Patch38: cve-2006-6101_6102_6103.diff Patch39: 0018-vnc-support.txt Patch40: 0018-vnc-support.txt.diff %endif +Patch41: loadmod-bug197195.diff Patch334: p_pci-domain.diff Patch357: p_pci-ce-x.diff @@ -173,6 +174,7 @@ popd %patch39 -p1 %patch40 -p0 %endif +%patch41 -p1 %build autoreconf -fi @@ -496,6 +498,9 @@ exit 0 %endif %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 - added build of VNC support (0018-vnc-support.txt/ 0018-vnc-support.txt.diff); see 0018-vnc-support.txt.mbox for