Hello community, here is the log from the commit of package xorg-x11-server checked in at Sat Sep 22 23:43:28 CEST 2007. -------- --- xorg-x11-server/xorg-x11-server.changes 2007-09-11 18:14:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2007-09-21 16:43:10.917814000 +0200 @@ -1,0 +2,6 @@ +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) + +------------------------------------------------------------------- New: ---- edit_data_sanity_check.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.L12963/_old 2007-09-22 23:42:54.000000000 +0200 +++ /var/tmp/diff_new_pack.L12963/_new 2007-09-22 23:42:54.000000000 +0200 @@ -18,10 +18,10 @@ %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 @@ 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 @@ 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 @@ 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 @@ 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 @@ %patch76 -p1 %patch77 %patch78 -p1 +%patch79 -p1 %build pushd xorg-docs-* @@ -345,7 +347,6 @@ %clean rm -rf "$RPM_BUILD_ROOT" %ifnarch s390 s390x - %verifyscript %verify_permissions -e /usr/bin/Xorg %endif @@ -555,8 +556,10 @@ %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 ++++++ edit_data_sanity_check.diff ++++++ 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; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org