X Strike Force X.Org X11 SVN commit: r2666 - in branches/7.1/xserver/xorg-server/debian: . patches
Author: dnusinow
Date: 2006-08-06 15:46:33 -0400 (Sun, 06 Aug 2006)
New Revision: 2666
Removed:
branches/7.1/xserver/xorg-server/debian/patches/15_security_allocate_local.diff
Modified:
branches/7.1/xserver/xorg-server/debian/changelog
branches/7.1/xserver/xorg-server/debian/patches/02_libvgahw_gcc4_volatile_fix.diff
branches/7.1/xserver/xorg-server/debian/patches/04_read_rom_in_chunks.diff
branches/7.1/xserver/xorg-server/debian/patches/12_security_policy_in_etc.diff
branches/7.1/xserver/xorg-server/debian/patches/13_debian_add_xkbpath_env_variable.diff
branches/7.1/xserver/xorg-server/debian/patches/14_debian_always_look_in_our_module_path.diff
branches/7.1/xserver/xorg-server/debian/patches/16_SECURITY_setuid.diff
branches/7.1/xserver/xorg-server/debian/patches/series
Log:
* New upstream release
* Remove obsolete 15_security_allocate_local.diff
Modified: branches/7.1/xserver/xorg-server/debian/changelog
===================================================================
--- branches/7.1/xserver/xorg-server/debian/changelog 2006-08-06 19:39:13 UTC (rev 2665)
+++ branches/7.1/xserver/xorg-server/debian/changelog 2006-08-06 19:46:33 UTC (rev 2666)
@@ -1,9 +1,11 @@
-xorg-server (1:1.0.2-10) UNRELEASED; urgency=low
+xorg-server (1:1.1.0-1) UNRELEASED-experimental; urgency=low
[ 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
- -- David Nusinow <dnusinow@debian.org> Sun, 2 Jul 2006 21:29:39 -0400
+ -- David Nusinow <dnusinow@debian.org> Sun, 6 Aug 2006 15:44:37 +0000
xorg-server (1:1.0.2-9) unstable; urgency=high
Modified: branches/7.1/xserver/xorg-server/debian/patches/02_libvgahw_gcc4_volatile_fix.diff
===================================================================
--- branches/7.1/xserver/xorg-server/debian/patches/02_libvgahw_gcc4_volatile_fix.diff 2006-08-06 19:39:13 UTC (rev 2665)
+++ branches/7.1/xserver/xorg-server/debian/patches/02_libvgahw_gcc4_volatile_fix.diff 2006-08-06 19:46:33 UTC (rev 2666)
@@ -2,11 +2,11 @@
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=161242 (by Olivier
Baudron). See also Debian #318218 and bugs merged to it
-Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/vgahw/vgaHW.c
+Index: xorg-server-1.1.0/hw/xfree86/vgahw/vgaHW.c
===================================================================
---- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/vgahw/vgaHW.c 2006-01-04 23:08:15.000000000 -0500
-+++ xorg-server-X11R7.0-1.0.1/hw/xfree86/vgahw/vgaHW.c 2006-02-26 18:18:48.000000000 -0500
-@@ -432,12 +432,16 @@
+--- xorg-server-1.1.0.orig/hw/xfree86/vgahw/vgaHW.c 2006-02-10 22:00:27.000000000 +0000
++++ xorg-server-1.1.0/hw/xfree86/vgahw/vgaHW.c 2006-08-06 14:02:32.000000000 +0000
+@@ -435,12 +435,16 @@
static void
mmioWriteAttr(vgaHWPtr hwp, CARD8 index, CARD8 value)
{
@@ -24,7 +24,7 @@
moutb(VGA_ATTR_INDEX, index);
moutb(VGA_ATTR_DATA_W, value);
}
-@@ -445,12 +449,16 @@
+@@ -448,12 +452,16 @@
static CARD8
mmioReadAttr(vgaHWPtr hwp, CARD8 index)
{
@@ -42,7 +42,7 @@
moutb(VGA_ATTR_INDEX, index);
return minb(VGA_ATTR_DATA_R);
}
-@@ -470,7 +478,11 @@
+@@ -473,7 +481,11 @@
static void
mmioEnablePalette(vgaHWPtr hwp)
{
@@ -55,7 +55,7 @@
moutb(VGA_ATTR_INDEX, 0x00);
hwp->paletteEnabled = TRUE;
}
-@@ -478,7 +490,11 @@
+@@ -481,7 +493,11 @@
static void
mmioDisablePalette(vgaHWPtr hwp)
{
Modified: branches/7.1/xserver/xorg-server/debian/patches/04_read_rom_in_chunks.diff
===================================================================
--- branches/7.1/xserver/xorg-server/debian/patches/04_read_rom_in_chunks.diff 2006-08-06 19:39:13 UTC (rev 2665)
+++ branches/7.1/xserver/xorg-server/debian/patches/04_read_rom_in_chunks.diff 2006-08-06 19:46:33 UTC (rev 2666)
@@ -1,8 +1,8 @@
-Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/bus/linuxPci.c
+Index: xorg-server-1.1.0/hw/xfree86/os-support/bus/linuxPci.c
===================================================================
---- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/os-support/bus/linuxPci.c 2006-01-04 23:07:36.000000000 -0500
-+++ xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/bus/linuxPci.c 2006-02-26 23:33:05.000000000 -0500
-@@ -742,8 +742,10 @@
+--- xorg-server-1.1.0.orig/hw/xfree86/os-support/bus/linuxPci.c 2006-04-28 22:28:56.000000000 +0000
++++ xorg-server-1.1.0/hw/xfree86/os-support/bus/linuxPci.c 2006-08-06 14:02:36.000000000 +0000
+@@ -740,8 +740,10 @@
write(fd, "1", 2);
lseek(fd, 0, SEEK_SET);
Modified: branches/7.1/xserver/xorg-server/debian/patches/12_security_policy_in_etc.diff
===================================================================
--- branches/7.1/xserver/xorg-server/debian/patches/12_security_policy_in_etc.diff 2006-08-06 19:39:13 UTC (rev 2665)
+++ branches/7.1/xserver/xorg-server/debian/patches/12_security_policy_in_etc.diff 2006-08-06 19:46:33 UTC (rev 2666)
@@ -1,30 +1,30 @@
-Index: xorg-server-1.0.2/configure.ac
+Index: xorg-server-1.1.0/configure.ac
===================================================================
---- xorg-server-1.0.2.orig/configure.ac 2006-03-21 08:42:38.000000000 +0700
-+++ xorg-server-1.0.2/configure.ac 2006-04-16 21:59:53.000000000 +0800
-@@ -352,6 +352,9 @@
+--- xorg-server-1.1.0.orig/configure.ac 2006-05-22 20:40:00.000000000 +0000
++++ xorg-server-1.1.0/configure.ac 2006-08-06 14:04:45.000000000 +0000
+@@ -375,6 +375,9 @@
AC_ARG_WITH(rgb-path, AS_HELP_STRING([--with-rgb-path=PATH], [Path to RGB database (default: ${datadir}/X11/rgb)]),
[ RGBPATH="$withval" ],
[ RGBPATH="${datadir}/X11/rgb" ])
+AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH], [Path to server config (default: ${libdir}/xserver)]),
-+ [ SERVERCONFIG="$withval" ],
-+ [ SERVERCONFIG="${libdir}/xserver" ])
- AC_ARG_ENABLE(builddocs, AS_HELP_STRING([--enable-builddocs], [Build docs (default: disabled)]),
- [BUILDDOCS=$enableval],
- [BUILDDOCS=no])
-@@ -719,6 +722,7 @@
++ [ SERVERCONFIG="$withval" ],
++ [ SERVERCONFIG="${libdir}/xserver" ])
+ AC_ARG_WITH(dri-driver-path, AS_HELP_STRING([--with-dri-driver-path=PATH], [Path to DRI drivers (default: ${libdir}/dri)]),
+ [ DRI_DRIVER_PATH="$withval" ],
+ [ DRI_DRIVER_PATH="${libdir}/dri" ])
+@@ -806,6 +809,7 @@
AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])
+AC_DEFINE_DIR(SERVERCONFIGdir, SERVERCONFIG, [Server config path])
+ AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])
AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_STRING_SHORT"], [Short vendor name])
- AC_DEFINE_UNQUOTED(XORG_RELEASE, ["$VENDOR_RELEASE_STRING"], [Vendor release])
-Index: xorg-server-1.0.2/Xext/Makefile.am
+Index: xorg-server-1.1.0/Xext/Makefile.am
===================================================================
---- xorg-server-1.0.2.orig/Xext/Makefile.am 2006-03-21 08:42:38.000000000 +0700
-+++ xorg-server-1.0.2/Xext/Makefile.am 2006-04-16 21:59:13.000000000 +0800
-@@ -70,7 +70,6 @@
+--- xorg-server-1.1.0.orig/Xext/Makefile.am 2006-04-05 21:23:06.000000000 +0000
++++ xorg-server-1.1.0/Xext/Makefile.am 2006-08-06 14:03:48.000000000 +0000
+@@ -73,7 +73,6 @@
if XCSECURITY
BUILTIN_SRCS += $(XCSECURITY_SRCS)
Modified: branches/7.1/xserver/xorg-server/debian/patches/13_debian_add_xkbpath_env_variable.diff
===================================================================
--- branches/7.1/xserver/xorg-server/debian/patches/13_debian_add_xkbpath_env_variable.diff 2006-08-06 19:39:13 UTC (rev 2665)
+++ branches/7.1/xserver/xorg-server/debian/patches/13_debian_add_xkbpath_env_variable.diff 2006-08-06 19:46:33 UTC (rev 2666)
@@ -1,8 +1,8 @@
-Index: xorg-server-1.0.2/xkb/xkbInit.c
+Index: xorg-server-1.1.0/xkb/xkbInit.c
===================================================================
---- xorg-server-1.0.2.orig/xkb/xkbInit.c
-+++ xorg-server-1.0.2/xkb/xkbInit.c
-@@ -906,6 +906,14 @@
+--- xorg-server-1.1.0.orig/xkb/xkbInit.c 2006-03-25 22:35:48.000000000 +0000
++++ xorg-server-1.1.0/xkb/xkbInit.c 2006-08-06 14:05:30.000000000 +0000
+@@ -874,6 +874,14 @@
extern unsigned char XkbDfltAccessXOptions;
int
@@ -17,11 +17,11 @@
XkbProcessArguments(int argc,char *argv[],int i)
{
if (strcmp(argv[i],"-kb")==0) {
-Index: xorg-server-1.0.2/os/utils.c
+Index: xorg-server-1.1.0/os/utils.c
===================================================================
---- xorg-server-1.0.2.orig/os/utils.c
-+++ xorg-server-1.0.2/os/utils.c
-@@ -712,6 +712,7 @@
+--- xorg-server-1.1.0.orig/os/utils.c 2006-03-25 19:52:05.000000000 +0000
++++ xorg-server-1.1.0/os/utils.c 2006-08-06 14:05:30.000000000 +0000
+@@ -715,6 +715,7 @@
*/
void InitGlobals(void)
{
Modified: branches/7.1/xserver/xorg-server/debian/patches/14_debian_always_look_in_our_module_path.diff
===================================================================
--- branches/7.1/xserver/xorg-server/debian/patches/14_debian_always_look_in_our_module_path.diff 2006-08-06 19:39:13 UTC (rev 2665)
+++ branches/7.1/xserver/xorg-server/debian/patches/14_debian_always_look_in_our_module_path.diff 2006-08-06 19:46:33 UTC (rev 2666)
@@ -1,8 +1,8 @@
-Index: xorg-server-1.0.2/hw/xfree86/common/xf86Config.c
+Index: xorg-server-1.1.0/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server-1.0.2.orig/hw/xfree86/common/xf86Config.c 2006-04-22 12:24:18.000000000 -0400
-+++ xorg-server-1.0.2/hw/xfree86/common/xf86Config.c 2006-04-22 12:29:21.000000000 -0400
-@@ -696,7 +696,9 @@
+--- xorg-server-1.1.0.orig/hw/xfree86/common/xf86Config.c 2006-08-06 14:02:44.000000000 +0000
++++ xorg-server-1.1.0/hw/xfree86/common/xf86Config.c 2006-08-06 14:05:33.000000000 +0000
+@@ -725,7 +725,9 @@
if (fileconf) {
if (xf86ModPathFrom != X_CMDLINE && fileconf->file_modulepath) {
Deleted: branches/7.1/xserver/xorg-server/debian/patches/15_security_allocate_local.diff
===================================================================
--- branches/7.1/xserver/xorg-server/debian/patches/15_security_allocate_local.diff 2006-08-06 19:39:13 UTC (rev 2665)
+++ branches/7.1/xserver/xorg-server/debian/patches/15_security_allocate_local.diff 2006-08-06 19:46:33 UTC (rev 2666)
@@ -1,36 +0,0 @@
-Index: xorg-server-1.0.2/ChangeLog
-===================================================================
---- xorg-server-1.0.2.orig/ChangeLog 2006-05-02 21:42:35.000000000 -0400
-+++ xorg-server-1.0.2/ChangeLog 2006-05-02 21:45:05.000000000 -0400
-@@ -1,3 +1,9 @@
-+2006-05-02 Adam Jackson <ajax@freedesktop.org>
-+
-+ * render/mitri.c:
-+ Bug #6642: Fix buffer overflow in Render.
-+ (CVE 2006-1526, patch from Eric Anholt)
-+
- 2006-03-20 Adam Jackson <ajax@freedesktop.org>
-
- * hw/xfree86/common/xf86Init.c:
-Index: xorg-server-1.0.2/render/mitri.c
-===================================================================
---- xorg-server-1.0.2.orig/render/mitri.c 2006-05-02 21:41:33.000000000 -0400
-+++ xorg-server-1.0.2/render/mitri.c 2006-05-02 21:42:23.000000000 -0400
-@@ -145,7 +145,7 @@
- if (npoint < 3)
- return;
- ntri = npoint - 2;
-- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
-+ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
- if (!tris)
- return;
- for (tri = tris; npoint >= 3; npoint--, points++, tri++)
-@@ -177,7 +177,7 @@
- if (npoint < 3)
- return;
- ntri = npoint - 2;
-- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
-+ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
- if (!tris)
- return;
- first = points++;
Modified: 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 19:39:13 UTC (rev 2665)
+++ branches/7.1/xserver/xorg-server/debian/patches/16_SECURITY_setuid.diff 2006-08-06 19:46:33 UTC (rev 2666)
@@ -1,7 +1,7 @@
-Index: xorg-server-1.0.2/hw/xfree86/common/xf86Init.c
+Index: xorg-server-1.1.0/hw/xfree86/common/xf86Init.c
===================================================================
---- xorg-server-1.0.2.orig/hw/xfree86/common/xf86Init.c 2006-04-11 21:13:59.000000000 -0400
-+++ xorg-server-1.0.2/hw/xfree86/common/xf86Init.c 2006-07-01 17:18:50.000000000 -0400
+--- 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;
@@ -15,10 +15,10 @@
/* set stdin, stdout to the consoleFd */
for (i = 0; i < 2; i++) {
if (xf86Info.consoleFd != i) {
-Index: xorg-server-1.0.2/hw/xfree86/os-support/shared/libc_wrapper.c
+Index: xorg-server-1.1.0/hw/xfree86/os-support/shared/libc_wrapper.c
===================================================================
---- xorg-server-1.0.2.orig/hw/xfree86/os-support/shared/libc_wrapper.c 2006-04-11 21:13:34.000000000 -0400
-+++ xorg-server-1.0.2/hw/xfree86/os-support/shared/libc_wrapper.c 2006-07-01 17:18:50.000000000 -0400
+--- 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();
@@ -31,10 +31,10 @@
#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.0.2/hw/xfree86/parser/write.c
+Index: xorg-server-1.1.0/hw/xfree86/parser/write.c
===================================================================
---- xorg-server-1.0.2.orig/hw/xfree86/parser/write.c 2006-04-11 21:14:00.000000000 -0400
-+++ xorg-server-1.0.2/hw/xfree86/parser/write.c 2006-07-01 17:18:50.000000000 -0400
+--- 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;
@@ -47,11 +47,11 @@
ret = doWriteConfigFile(filename, cptr);
exit(ret);
break;
-Index: xorg-server-1.0.2/os/utils.c
+Index: xorg-server-1.1.0/os/utils.c
===================================================================
---- xorg-server-1.0.2.orig/os/utils.c 2006-07-01 17:16:13.000000000 -0400
-+++ xorg-server-1.0.2/os/utils.c 2006-07-01 17:18:50.000000000 -0400
-@@ -1719,8 +1719,10 @@
+--- 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 */
@@ -64,7 +64,7 @@
execl("/bin/sh", "sh", "-c", command, (char *)NULL);
_exit(127);
default: /* parent */
-@@ -1771,8 +1773,10 @@
+@@ -1774,8 +1776,10 @@
xfree(cur);
return NULL;
case 0: /* child */
@@ -77,7 +77,7 @@
if (*type == 'r') {
if (pdes[1] != 1) {
/* stdout */
-@@ -1846,8 +1850,10 @@
+@@ -1849,8 +1853,10 @@
xfree(cur);
return NULL;
case 0: /* child */
Modified: branches/7.1/xserver/xorg-server/debian/patches/series
===================================================================
--- branches/7.1/xserver/xorg-server/debian/patches/series 2006-08-06 19:39:13 UTC (rev 2665)
+++ branches/7.1/xserver/xorg-server/debian/patches/series 2006-08-06 19:46:33 UTC (rev 2666)
@@ -9,8 +9,7 @@
09_debian_xserver_rtff.diff -p0
10_dont_look_in_home_for_config.diff -p0
11_debian_always_use_default_font_path.diff -p1
-12_security_policy_in_etc.diff -p1
+12_security_policy_in_etc.diff
13_debian_add_xkbpath_env_variable.diff
14_debian_always_look_in_our_module_path.diff
-15_security_allocate_local.diff
16_SECURITY_setuid.diff
Reply to: