Hello community,
here is the log from the commit of package xorg-x11
checked in at Mon Aug 7 18:14:14 CEST 2006.
--------
--- xorg-x11/xorg-x11.changes 2006-08-06 16:58:01.000000000 +0200
+++ xorg-x11/xorg-x11.changes 2006-08-07 16:31:49.000000000 +0200
@@ -1,0 +2,13 @@
+Mon Aug 7 11:30:12 CEST 2006 - sndirsch@suse.de
+
+- p_xrdb.diff:
+ * fix xrdb when hostname is set to "(none)" (Bug #149007)
+- p_twm_sig11.diff:
+ * twm can segfault when it cannot collect attribute information
+ on a window that has been destroyed before it got a chance to
+ collect it's attribute. twm seems to assume that it is always
+ able to collect this information and disregards the error if
+ the function that attempts to collect it fails (eich, Bug #150869)
+- x11r6.9.0-setuid.diff:
+ * setuid() return value check problems on Linux systems (Bug #179768)
+-------------------------------------------------------------------
New:
----
p_twm_sig11.diff
p_xrdb.diff
x11r6.9.0-setuid.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.6Tev0c/_old 2006-08-07 18:13:05.000000000 +0200
+++ /var/tmp/diff_new_pack.6Tev0c/_new 2006-08-07 18:13:05.000000000 +0200
@@ -14,7 +14,7 @@
BuildRequires: fontconfig-devel freetype2-devel libpng-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
URL: http://xorg.freedesktop.org/
Version: 7.1
-Release: 9
+Release: 10
License: X11/MIT, Other License(s), see package
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -132,6 +132,9 @@
Patch12: ps_suse.diff
Patch13: p_xauth.diff
Patch14: p_bugzilla-117193-luit-sometimes-hangs.diff
+Patch15: p_xrdb.diff
+Patch16: p_twm_sig11.diff
+Patch17: x11r6.9.0-setuid.diff
%description
This package contains the X.Org core and sample applications.
@@ -227,6 +230,13 @@
pushd luit-*
%patch14 -p3
popd
+pushd xrdb-*
+%patch15 -p2
+popd
+pushd twm-*/src
+%patch16 -p2
+popd
+%patch17
%build
@@ -372,6 +382,17 @@
/var/lib/xdm/authdir/
%changelog -n xorg-x11
+* Mon Aug 07 2006 - sndirsch@suse.de
+- p_xrdb.diff:
+ * fix xrdb when hostname is set to "(none)" (Bug #149007)
+- p_twm_sig11.diff:
+ * twm can segfault when it cannot collect attribute information
+ on a window that has been destroyed before it got a chance to
+ collect it's attribute. twm seems to assume that it is always
+ able to collect this information and disregards the error if
+ the function that attempts to collect it fails (eich, Bug #150869)
+- x11r6.9.0-setuid.diff:
+ * setuid() return value check problems on Linux systems (Bug #179768)
* Sat Aug 05 2006 - sndirsch@suse.de
- p_xauth.diff:
* Let X authorization be tolerant to hostname changes (Bug #98627)
++++++ p_twm_sig11.diff ++++++
Index: programs/twm/add_window.c
===================================================================
RCS file: /work/cvsdir/cvs/xc/programs/twm/add_window.c,v
retrieving revision 1.1.1.10
diff -u -r1.1.1.10 add_window.c
--- programs/twm/add_window.c 27 Apr 2005 15:56:32 -0000 1.1.1.10
+++ programs/twm/add_window.c 1 Mar 2006 10:59:44 -0000
@@ -1538,10 +1538,11 @@
cwins = (ColormapWindow **) malloc(sizeof(ColormapWindow *));
if (XFindContext(dpy, tmp->w, ColormapContext, (caddr_t *)&cwins[0]) ==
- XCNOENT)
+ XCNOENT) {
cwins[0] = CreateColormapWindow(tmp->w,
(Bool) tmp->cmaps.number_cwins == 0, False);
- else
+ if (cwins[0] == NULL) number_cmap_windows = 0;
+ } else
cwins[0]->refcnt++;
}
++++++ p_xrdb.diff ++++++
--- programs/xrdb/xrdb.c.orig 2005-11-30 11:35:57.000000000 +0100
+++ programs/xrdb/xrdb.c 2006-02-08 10:52:38.636213051 +0100
@@ -514,6 +514,8 @@
int n;
XmuGetHostname(client, MAXHOSTNAMELEN);
+ if (!strcmp(client,"(none)"))
+ strncpy(client,"\"(none)\"", sizeof(client));
strncpy(server, XDisplayName(host), sizeof(server));
server[sizeof(server) - 1] = '\0';
/* search for final colon to skip over any embedded colons in IPv6
++++++ x11r6.9.0-setuid.diff ++++++
--- xc/programs/xf86dga/dga.c 23 Apr 2004 19:54:47 -0000 1.2
+++ xf86dga-X11R7.0-1.0.1/dga.c 5 Jun 2006 10:35:21 -0000
@@ -16,6 +16,7 @@
#include