From 40658738d69e1e254a8991badf04783cfe5a72e4ed52b3586e3f3105bd87a725 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 22 Sep 2007 21:43:29 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=45 --- edit_data_sanity_check.diff | 19 +++++++++++++++++++ xorg-x11-server.changes | 6 ++++++ xorg-x11-server.spec | 17 ++++++++++------- 3 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 edit_data_sanity_check.diff diff --git a/edit_data_sanity_check.diff b/edit_data_sanity_check.diff new file mode 100644 index 0000000..2dc203b --- /dev/null +++ b/edit_data_sanity_check.diff @@ -0,0 +1,19 @@ +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index d375da8..aead061 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -2097,7 +2097,13 @@ xf86OutputSetEDID (xf86OutputPtr output, + for (i = 0; i < 4; i++) { + if (edid_mon->det_mon[i].type == DT && + edid_mon->det_mon[i].section.d_timings.h_size != 0 && +- edid_mon->det_mon[i].section.d_timings.v_size != 0) ++ edid_mon->det_mon[i].section.d_timings.v_size != 0 && ++ /* some sanity checking for aspect ration */ ++ ((edid_mon->det_mon[i].section.d_timings.h_size / ++ edid_mon->det_mon[i].section.d_timings.v_size) < 2) && ++ ((edid_mon->det_mon[i].section.d_timings.v_size / ++ edid_mon->det_mon[i].section.d_timings.h_size) < 2) ++ ) + { + output->mm_width = edid_mon->det_mon[i].section.d_timings.h_size; + output->mm_height = edid_mon->det_mon[i].section.d_timings.v_size; diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 35892c7..a024b36 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 21 16:45:02 CEST 2007 - sndirsch@suse.de + +- edit_data_sanity_check.diff: + * added sanity check for monitor EDID data (Bug #326454) + ------------------------------------------------------------------- Tue Sep 11 18:05:39 CEST 2007 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index ca101fc..c0f40e5 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -18,10 +18,10 @@ BuildRequires: Mesa-devel fontconfig-devel freetype2-devel ghostscript-library %if %vnc BuildRequires: libjpeg-devel %endif -URL: http://xorg.freedesktop.org/ +Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.2 -Release: 136 +Release: 142 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -101,6 +101,7 @@ Patch75: randr12-b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4.diff Patch76: randr12-2926cf1da7e4ed63573bfaecdd7e19beb3057d9b.diff Patch77: fbdevhw.diff Patch78: use-composite-for-unequal-depths.patch +Patch79: edit_data_sanity_check.diff Patch334: p_pci-domain.diff Patch357: p_pci-ce-x.diff @@ -115,7 +116,7 @@ Group: System/X11/Servers/XF86_4 Provides: xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-server:/usr/bin/Xdmx Obsoletes: xorg-x11-Xnest xorg-x11-Xvfb Requires: xorg-x11-fonts-core -Autoreqprov: on +AutoReqProv: on %description extra This package contains additional Xservers (Xdmx, Xephyr, Xnest, Xvfb). @@ -129,7 +130,7 @@ Group: System/Libraries Provides: xorg-x11-sdk Obsoletes: xorg-x11-sdk Requires: xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXrender-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXt-devel xorg-x11-libXmu-devel xorg-x11-libXfixes-devel xorg-x11-libxkbfile-devel xorg-x11-libfontenc-devel xorg-x11-libXv-devel xorg-x11-libXprintUtil-devel xorg-x11-devel freetype2-devel fontconfig-devel libdrm-devel glitz-devel xorg-x11-server -Autoreqprov: on +AutoReqProv: on %description sdk This package contains the X.Org Server SDK. @@ -147,7 +148,7 @@ Obsoletes: XFree86-Xvnc Provides: vnc-x86 Obsoletes: vnc-x86 %endif -Autoreqprov: on +AutoReqProv: on %description -n xorg-x11-Xvnc An X Window System server for Virtual Network Computing (VNC). @@ -222,6 +223,7 @@ popd %patch76 -p1 %patch77 %patch78 -p1 +%patch79 -p1 %build pushd xorg-docs-* @@ -345,7 +347,6 @@ rm $RPM_BUILD_ROOT/mfb.h %clean rm -rf "$RPM_BUILD_ROOT" %ifnarch s390 s390x - %verifyscript %verify_permissions -e /usr/bin/Xorg %endif @@ -555,8 +556,10 @@ exit 0 %defattr(-, root, root) /usr/bin/Xvnc %endif - %changelog +* Fri Sep 21 2007 - sndirsch@suse.de +- edit_data_sanity_check.diff: + * added sanity check for monitor EDID data (Bug #326454) * Tue Sep 11 2007 - sndirsch@suse.de - reverted changes by schwab on Fri Sep 7; these resulted i a black screen during Xserver start with any driver on non-IA64 platforms