X Strike Force X.Org X11 SVN commit: r2670 - in branches/7.1/xserver/xorg-server/debian: . patches
Author: dnusinow
Date: 2006-08-06 16:08:33 -0400 (Sun, 06 Aug 2006)
New Revision: 2670
Removed:
branches/7.1/xserver/xorg-server/debian/patches/16_SECURITY_setuid.diff
Modified:
branches/7.1/xserver/xorg-server/debian/changelog
branches/7.1/xserver/xorg-server/debian/patches/06_arm_is_not_x86_and_has_no_vga.diff
branches/7.1/xserver/xorg-server/debian/patches/series
Log:
Remove obsolete patch and refresh others
Modified: branches/7.1/xserver/xorg-server/debian/changelog
===================================================================
--- branches/7.1/xserver/xorg-server/debian/changelog 2006-08-06 20:05:26 UTC (rev 2669)
+++ branches/7.1/xserver/xorg-server/debian/changelog 2006-08-06 20:08:33 UTC (rev 2670)
@@ -3,10 +3,11 @@
[ David Nusinow ]
* New upstream release
* Move patch target call so that we don't try and build twice
- * Remove obsolete 15_security_allocate_local.diff
+ * Remove obsolete 15_security_allocate_local.diff and
+ 16_SECURITY_setuid.diff
* Add 15_symlink_mesa.diff
- -- David Nusinow <dnusinow@debian.org> Sun, 6 Aug 2006 16:05:15 +0000
+ -- David Nusinow <dnusinow@debian.org> Sun, 6 Aug 2006 16:07:43 +0000
xorg-server (1:1.0.2-9) unstable; urgency=high
Modified: branches/7.1/xserver/xorg-server/debian/patches/06_arm_is_not_x86_and_has_no_vga.diff
===================================================================
--- branches/7.1/xserver/xorg-server/debian/patches/06_arm_is_not_x86_and_has_no_vga.diff 2006-08-06 20:05:26 UTC (rev 2669)
+++ branches/7.1/xserver/xorg-server/debian/patches/06_arm_is_not_x86_and_has_no_vga.diff 2006-08-06 20:08:33 UTC (rev 2670)
@@ -11,10 +11,10 @@
Not submitted to XFree86.
-Index: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c
+Index: xorg-server/hw/xfree86/common/xf86Bus.c
===================================================================
---- xc/programs/Xserver/hw/xfree86/common/xf86Bus.c.orig 2005-10-18 19:44:24.000000000 -0400
-+++ xc/programs/Xserver/hw/xfree86/common/xf86Bus.c 2005-10-18 22:40:27.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Bus.c 2006-08-06 15:47:43.000000000 +0000
++++ xorg-server/hw/xfree86/common/xf86Bus.c 2006-08-06 16:06:38.000000000 +0000
@@ -3078,7 +3078,7 @@
CheckGenericGA()
{
@@ -24,10 +24,10 @@
IOADDRESS GenericIOBase = VGAHW_GET_IOBASE();
CARD8 CurrentValue, TestValue;
-Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
+Index: xorg-server/hw/xfree86/os-support/linux/lnx_video.c
===================================================================
---- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c.orig 2005-10-18 19:44:57.000000000 -0400
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c 2005-10-18 22:40:27.000000000 -0400
+--- xorg-server.orig/hw/xfree86/os-support/linux/lnx_video.c 2006-08-06 16:01:10.000000000 +0000
++++ xorg-server/hw/xfree86/os-support/linux/lnx_video.c 2006-08-06 16:06:38.000000000 +0000
@@ -466,7 +466,7 @@
Base,realBase,alignOff);
#endif
@@ -47,7 +47,7 @@
ioperm(0, 1024, 0);
#endif
@@ -615,7 +615,7 @@
- Bool
+ _X_EXPORT Bool
xf86DisableInterrupts()
{
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__)
@@ -65,7 +65,7 @@
iopl(0);
ioperm(0, 1024, 0);
@@ -647,7 +647,7 @@
- void
+ _X_EXPORT void
xf86EnableInterrupts()
{
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__)
@@ -82,10 +82,10 @@
if (!ExtendedEnabled) {
iopl(0);
ioperm(0, 1024, 0);
-Index: xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h
+Index: xorg-server/hw/xfree86/vgahw/vgaHW.h
===================================================================
---- xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h.orig 2005-10-18 19:45:00.000000000 -0400
-+++ xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h 2005-10-18 22:40:27.000000000 -0400
+--- xorg-server.orig/hw/xfree86/vgahw/vgaHW.h 2006-08-06 15:47:43.000000000 +0000
++++ xorg-server/hw/xfree86/vgahw/vgaHW.h 2006-08-06 16:06:38.000000000 +0000
@@ -176,7 +176,7 @@
#define BITS_PER_GUN 6
#define COLORMAP_SIZE 256
Deleted: branches/7.1/xserver/xorg-server/debian/patches/16_SECURITY_setuid.diff
===================================================================
--- branches/7.1/xserver/xorg-server/debian/patches/16_SECURITY_setuid.diff 2006-08-06 20:05:26 UTC (rev 2669)
+++ branches/7.1/xserver/xorg-server/debian/patches/16_SECURITY_setuid.diff 2006-08-06 20:08:33 UTC (rev 2670)
@@ -1,92 +0,0 @@
-Index: xorg-server-1.1.0/hw/xfree86/common/xf86Init.c
-===================================================================
---- xorg-server-1.1.0.orig/hw/xfree86/common/xf86Init.c 2006-05-09 18:04:19.000000000 +0000
-+++ xorg-server-1.1.0/hw/xfree86/common/xf86Init.c 2006-08-06 14:06:30.000000000 +0000
-@@ -1905,7 +1905,11 @@
- FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno));
- break;
- case 0: /* child */
-- setuid(getuid());
-+ if (setuid(getuid()) == -1) {
-+ xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n",
-+ strerror(errno));
-+ exit(255);
-+ }
- /* set stdin, stdout to the consoleFd */
- for (i = 0; i < 2; i++) {
- if (xf86Info.consoleFd != i) {
-Index: xorg-server-1.1.0/hw/xfree86/os-support/shared/libc_wrapper.c
-===================================================================
---- xorg-server-1.1.0.orig/hw/xfree86/os-support/shared/libc_wrapper.c 2006-03-25 19:52:04.000000000 +0000
-+++ xorg-server-1.1.0/hw/xfree86/os-support/shared/libc_wrapper.c 2006-08-06 14:06:30.000000000 +0000
-@@ -1270,7 +1270,10 @@
- #ifndef SELF_CONTAINED_WRAPPER
- xf86DisableIO();
- #endif
-- setuid(getuid());
-+ if (setuid(getuid()) == -1) {
-+ ErrorF("xf86Execl: setuid() failed: %s\n", strerror(errno));
-+ exit(255);
-+ }
- #if !defined(SELF_CONTAINED_WRAPPER)
- /* set stdin, stdout to the consoleFD, and leave stderr alone */
- for (i = 0; i < 2; i++)
-Index: xorg-server-1.1.0/hw/xfree86/parser/write.c
-===================================================================
---- xorg-server-1.1.0.orig/hw/xfree86/parser/write.c 2005-07-03 07:01:37.000000000 +0000
-+++ xorg-server-1.1.0/hw/xfree86/parser/write.c 2006-08-06 14:06:30.000000000 +0000
-@@ -170,7 +170,10 @@
- strerror(errno));
- return 0;
- case 0: /* child */
-- setuid(getuid());
-+ if (setuid(getuid() == -1)
-+ FatalError("xf86writeConfigFile(): "
-+ "setuid failed(%s)\n",
-+ strerror(errno));
- ret = doWriteConfigFile(filename, cptr);
- exit(ret);
- break;
-Index: xorg-server-1.1.0/os/utils.c
-===================================================================
---- xorg-server-1.1.0.orig/os/utils.c 2006-08-06 14:05:30.000000000 +0000
-+++ xorg-server-1.1.0/os/utils.c 2006-08-06 14:06:30.000000000 +0000
-@@ -1722,8 +1722,10 @@
- case -1: /* error */
- p = -1;
- case 0: /* child */
-- setgid(getgid());
-- setuid(getuid());
-+ if (setgid(getgid()) == -1)
-+ _exit(127);
-+ if (setuid(getuid()) == -1)
-+ _exit(127);
- execl("/bin/sh", "sh", "-c", command, (char *)NULL);
- _exit(127);
- default: /* parent */
-@@ -1774,8 +1776,10 @@
- xfree(cur);
- return NULL;
- case 0: /* child */
-- setgid(getgid());
-- setuid(getuid());
-+ if (setgid(getgid()) == -1)
-+ _exit(127);
-+ if (setuid(getuid()) == -1)
-+ _exit(127);
- if (*type == 'r') {
- if (pdes[1] != 1) {
- /* stdout */
-@@ -1849,8 +1853,10 @@
- xfree(cur);
- return NULL;
- case 0: /* child */
-- setgid(getgid());
-- setuid(getuid());
-+ if (setgid(getgid()) == -1)
-+ _exit(127);
-+ if (setuid(getuid()) == -1)
-+ _exit(127);
- if (*type == 'r') {
- if (pdes[1] != 1) {
- /* stdout */
Modified: branches/7.1/xserver/xorg-server/debian/patches/series
===================================================================
--- branches/7.1/xserver/xorg-server/debian/patches/series 2006-08-06 20:05:26 UTC (rev 2669)
+++ branches/7.1/xserver/xorg-server/debian/patches/series 2006-08-06 20:08:33 UTC (rev 2670)
@@ -3,7 +3,7 @@
03_xnest_manpage_overhaul.diff
04_read_rom_in_chunks.diff
05_arm_cache_flush.diff -p3
-06_arm_is_not_x86_and_has_no_vga.diff -p3
+06_arm_is_not_x86_and_has_no_vga.diff
07_xorgconf_manpage_overhaul.diff -p0
08_s390_servermd.diff -p3
09_debian_xserver_rtff.diff -p0
@@ -13,4 +13,3 @@
13_debian_add_xkbpath_env_variable.diff
14_debian_always_look_in_our_module_path.diff
15_symlink_mesa.diff
-16_SECURITY_setuid.diff
Reply to: