X Strike Force X.Org X11 SVN commit: r1485 - in trunk/debian: . patches patches/general
Author: dnusinow
Date: 2006-03-20 22:30:41 -0500 (Mon, 20 Mar 2006)
New Revision: 1485
Added:
trunk/debian/patches/general/036_geteuid_security.diff
Modified:
trunk/debian/MANIFEST.alpha.in
trunk/debian/MANIFEST.amd64.in
trunk/debian/MANIFEST.arm.in
trunk/debian/MANIFEST.hppa.in
trunk/debian/MANIFEST.i386.in
trunk/debian/MANIFEST.ia64.in
trunk/debian/MANIFEST.m68k.in
trunk/debian/MANIFEST.mips.in
trunk/debian/MANIFEST.mipsel.in
trunk/debian/MANIFEST.powerpc.in
trunk/debian/MANIFEST.s390.in
trunk/debian/MANIFEST.sparc.in
trunk/debian/changelog
trunk/debian/patches/series
trunk/debian/xlibs.install
Log:
* Add general/036_geteuid_security.diff for upstream security fix. Patch by
Daniel Stone. See upstream bug #6213.
* Overdue fixes to allow the evdev driver patch to work. This includes
MANIFEST .install file updates
Modified: trunk/debian/MANIFEST.alpha.in
===================================================================
--- trunk/debian/MANIFEST.alpha.in 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/MANIFEST.alpha.in 2006-03-21 03:30:41 UTC (rev 1485)
@@ -135,6 +135,7 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
+etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -153,6 +154,7 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
+etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.amd64.in
===================================================================
--- trunk/debian/MANIFEST.amd64.in 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/MANIFEST.amd64.in 2006-03-21 03:30:41 UTC (rev 1485)
@@ -135,6 +135,7 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
+etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -153,6 +154,7 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
+etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.arm.in
===================================================================
--- trunk/debian/MANIFEST.arm.in 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/MANIFEST.arm.in 2006-03-21 03:30:41 UTC (rev 1485)
@@ -135,6 +135,7 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
+etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -153,6 +154,7 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
+etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.hppa.in
===================================================================
--- trunk/debian/MANIFEST.hppa.in 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/MANIFEST.hppa.in 2006-03-21 03:30:41 UTC (rev 1485)
@@ -135,6 +135,7 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
+etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -153,6 +154,7 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
+etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.i386.in
===================================================================
--- trunk/debian/MANIFEST.i386.in 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/MANIFEST.i386.in 2006-03-21 03:30:41 UTC (rev 1485)
@@ -135,6 +135,7 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
+etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -153,6 +154,7 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
+etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.ia64.in
===================================================================
--- trunk/debian/MANIFEST.ia64.in 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/MANIFEST.ia64.in 2006-03-21 03:30:41 UTC (rev 1485)
@@ -135,6 +135,7 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
+etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -153,6 +154,7 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
+etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.m68k.in
===================================================================
--- trunk/debian/MANIFEST.m68k.in 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/MANIFEST.m68k.in 2006-03-21 03:30:41 UTC (rev 1485)
@@ -135,6 +135,7 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
+etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -153,6 +154,7 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
+etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.mips.in
===================================================================
--- trunk/debian/MANIFEST.mips.in 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/MANIFEST.mips.in 2006-03-21 03:30:41 UTC (rev 1485)
@@ -135,6 +135,7 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
+etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -153,6 +154,7 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
+etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.mipsel.in
===================================================================
--- trunk/debian/MANIFEST.mipsel.in 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/MANIFEST.mipsel.in 2006-03-21 03:30:41 UTC (rev 1485)
@@ -135,6 +135,7 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
+etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -153,6 +154,7 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
+etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.powerpc.in
===================================================================
--- trunk/debian/MANIFEST.powerpc.in 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/MANIFEST.powerpc.in 2006-03-21 03:30:41 UTC (rev 1485)
@@ -135,6 +135,7 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
+etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -153,6 +154,7 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
+etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.s390.in
===================================================================
--- trunk/debian/MANIFEST.s390.in 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/MANIFEST.s390.in 2006-03-21 03:30:41 UTC (rev 1485)
@@ -130,6 +130,7 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
+etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -148,6 +149,7 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
+etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.sparc.in
===================================================================
--- trunk/debian/MANIFEST.sparc.in 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/MANIFEST.sparc.in 2006-03-21 03:30:41 UTC (rev 1485)
@@ -135,6 +135,7 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
+etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -153,6 +154,7 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
+etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/changelog 2006-03-21 03:30:41 UTC (rev 1485)
@@ -1,10 +1,8 @@
-xorg-x11 (6.9.0.dfsg.1-5) unstable; urgency=low
+xorg-x11 (6.9.0.dfsg.1-5) unstable; urgency=high
[ David Martínez Moreno ]
* hurd/800_gnu_config.diff: Fix for local socket creation in the Hurd:
sockets are BSD4.4-like (closes: #348011).
- * Updated Catalan translation. Thanks, Ivan Vilata i Balaguer (closes:
- #350765).
[ David Nusinow ]
* Remove resize from xutils description. This program has been moved to the
@@ -24,6 +22,8 @@
be deleted.
* Add general/029_enable_truetype_font_hinting.diff. Thanks to Eugene Konev
for seeing that this one got through. (closes: #340001)
+ * Add general/036_geteuid_security.diff for upstream security fix. Patch by
+ Daniel Stone. See upstream bug #6213.
[ Denis Barbier ]
* Update debian/xserver-xorg.config.in to reflect changes in XKB layouts.
@@ -41,7 +41,7 @@
* Correct the ru_RU.UTF-8 locale alias. This adds
general/011b_ru_RU_UTF-8_XLC_LOCALE.diff (closes: #330144)
- -- David Martínez Moreno <ender@debian.org> Tue, 21 Feb 2006 11:51:32 +0100
+ -- David Nusinow <dnusinow@debian.org> Sun, 19 Mar 2006 23:03:55 -0500
xorg-x11 (6.9.0.dfsg.1-4) unstable; urgency=low
Added: trunk/debian/patches/general/036_geteuid_security.diff
===================================================================
--- trunk/debian/patches/general/036_geteuid_security.diff 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/patches/general/036_geteuid_security.diff 2006-03-21 03:30:41 UTC (rev 1485)
@@ -0,0 +1,28 @@
+$Id$
+
+See upstream bug https://bugs.freedesktop.org/show_bug.cgi?id=6213
+
+Patch by Daniel Stone.
+
+Index: xc/programs/Xserver/hw/xfree86/common/xf86Init.c
+===================================================================
+--- xc/programs/Xserver/hw/xfree86/common/xf86Init.c.orig 2006-03-19 19:36:16.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c 2006-03-19 19:38:02.000000000 -0500
+@@ -1412,7 +1412,7 @@
+ }
+
+ /* First the options that are only allowed for root */
+- if (getuid() == 0 || geteuid != 0)
++ if (getuid() == 0 || geteuid() != 0)
+ {
+ if (!strcmp(argv[i], "-modulepath"))
+ {
+@@ -1715,7 +1715,7 @@
+ }
+ if (!strcmp(argv[i], "-configure"))
+ {
+- if (getuid() != 0 && geteuid == 0) {
++ if (getuid() != 0 && geteuid() == 0) {
+ ErrorF("The '-configure' option can only be used by root.\n");
+ exit(1);
+ }
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/patches/series 2006-03-21 03:30:41 UTC (rev 1485)
@@ -40,6 +40,7 @@
general/033_evdev_rewrite.diff
general/034_evdev_xkb.diff -p0
general/035_tdfx_disable_dri_on_16mb_with_highres.diff -p0
+general/036_geteuid_security.diff -p0
general/041_make_xcursor_icondir_configurable.diff -p0
general/043_ati_r128_update_chip_identification.diff -p0
general/044_chips_default_to_noaccel_on_69k.diff -p0
Modified: trunk/debian/xlibs.install
===================================================================
--- trunk/debian/xlibs.install 2006-03-21 02:41:23 UTC (rev 1484)
+++ trunk/debian/xlibs.install 2006-03-21 03:30:41 UTC (rev 1485)
@@ -53,6 +53,7 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
+etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -71,6 +72,7 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
+etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Reply to: