xorg-server: Changes to 'debian-experimental'
debian/changelog | 6 +-
debian/patches/24_hurd_ioperm_fix.diff | 64 ----------------------
debian/patches/46_export-ramdac-symbols.diff | 78 ---------------------------
debian/patches/series | 2
hw/xfree86/common/xf86Events.c | 28 ---------
hw/xfree86/loader/xf86sym.c | 51 +++++++++++++++++
hw/xfree86/os-support/bsd/bsd_bell.c | 4 -
hw/xfree86/os-support/hurd/hurd_video.c | 44 ++++-----------
8 files changed, 69 insertions(+), 208 deletions(-)
New commits:
commit c80eddef8286b84bc566c9218fa0b5f448c139b5
Author: David Nusinow <dnusinow@debian.org>
Date: Tue May 29 22:11:21 2007 -0400
Update upstream pull and remove more pushed patches
Remove 24_hurd_ioperm_fix.diff and 46_export-ramdac-symbols.diff which
were pushed upstream
diff --git a/debian/changelog b/debian/changelog
index b6ebf5e..a500328 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.3.99.0~git20070528-1) UNRELEASED; urgency=low
+xorg-server (2:1.3.99.0~git20070529-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* New upstream snapshot.
@@ -36,8 +36,10 @@ xorg-server (2:1.3.99.0~git20070528-1) UNRELEASED; urgency=low
+ 12_security_policy_in_etc.diff
+ 16_s390_fix.diff
+ 23_kfreebsd_support.diff
+ + 24_hurd_ioperm_fix.diff
+ + 46_export-ramdac-symbols.diff
- -- David Nusinow <dnusinow@debian.org> Mon, 28 May 2007 22:09:07 -0400
+ -- David Nusinow <dnusinow@debian.org> Tue, 29 May 2007 22:09:55 -0400
xorg-server (2:1.3.0.0.dfsg-5) unstable; urgency=low
diff --git a/debian/patches/24_hurd_ioperm_fix.diff b/debian/patches/24_hurd_ioperm_fix.diff
deleted file mode 100644
index d2ff452..0000000
--- a/debian/patches/24_hurd_ioperm_fix.diff
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/hw/xfree86/os-support/hurd/hurd_video.c.orig 2007-05-08 18:28:21.000842117 +0000
-+++ b/hw/xfree86/os-support/hurd/hurd_video.c 2007-05-08 18:27:37.000381314 +0000
-@@ -117,49 +117,29 @@
- /**************************************************************************
- * I/O Permissions section
- ***************************************************************************/
--mach_port_t io_port;
-+
-+/*
-+ * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
-+ * this.
-+ */
-+extern int ioperm(unsigned long __from, unsigned long __num, int __turn_on);
-
- Bool
- xf86EnableIO()
- {
-- mach_port_t device;
-- kern_return_t err;
--
-- err = get_privileged_ports(NULL, &device);
-- if( err )
-- {
-- errno = err;
-- FatalError("xf86EnableIO() can't get_privileged_ports. (%s)\n",strerror(errno));
-- }
-- err = device_open(device,D_READ|D_WRITE,"io",&io_port);
-- mach_port_deallocate(mach_task_self(), device);
-- if( err )
-- {
-- errno = err;
-- FatalError("xf86EnableIO() can't device_open. (%s)\n",strerror(errno));
-- }
--
-- err = i386_io_port_add(mach_thread_self (), io_port);
-- if( err )
-- {
-- errno = err;
-- FatalError("xf86EnableIO() can't i386_io_port_add.(io_port) (%s)\n",strerror(errno));
-+ if (ioperm(0, 0xffff, 1)) {
-+ FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno));
-+ return FALSE;
- }
-+ ioperm(0x40,4,0); /* trap access to the timer chip */
-+ ioperm(0x60,4,0); /* trap access to the keyboard controller */
- return TRUE;
- }
-
- void
- xf86DisableIO()
- {
-- kern_return_t err;
--
-- err = i386_io_port_remove(mach_thread_self (), io_port);
-- if( err )
-- {
-- errno = err;
-- FatalError("xf86DisableIO() can't i386_io_port_remove.(io_port) (%s)\n",strerror(errno));
-- }
-- mach_port_deallocate(mach_task_self(), io_port);
-+ ioperm(0,0xffff,0);
- return;
- }
-
diff --git a/debian/patches/46_export-ramdac-symbols.diff b/debian/patches/46_export-ramdac-symbols.diff
deleted file mode 100644
index 2afabbd..0000000
--- a/debian/patches/46_export-ramdac-symbols.diff
+++ /dev/null
@@ -1,78 +0,0 @@
-From bccecf97f180966accbc979c28d648f7d1145b36 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Thu, 10 May 2007 17:26:49 +0200
-Subject: [PATCH] Export ramdac symbols
-
-The former ramdac module is now built into the server, so its symbols need to
-be explicitly exported to drivers (Debian #423129).
----
- hw/xfree86/loader/xf86sym.c | 49 +++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 49 insertions(+), 0 deletions(-)
-
-Index: xorg-server/hw/xfree86/loader/xf86sym.c
-===================================================================
---- xorg-server.orig/hw/xfree86/loader/xf86sym.c 2007-05-23 17:22:18.000000000 +0200
-+++ xorg-server/hw/xfree86/loader/xf86sym.c 2007-05-23 18:15:23.000000000 +0200
-@@ -96,6 +96,11 @@
- #endif
- #include "xf86DDC.h"
- #include "edid.h"
-+#include "xf86Cursor.h"
-+#include "xf86RamDac.h"
-+#include "BT.h"
-+#include "IBM.h"
-+#include "TI.h"
-
- #ifndef HAS_GLIBC_SIGSETJMP
- #if defined(setjmp) && defined(__GNU_LIBRARY__) && \
-@@ -1255,4 +1260,50 @@
- SYMFUNC(xf86I2CWriteRead)
- SYMFUNC(xf86I2CWriteVec)
- SYMFUNC(xf86I2CWriteWord)
-+
-+ /* ramdac/xf86RamDac.c */
-+ SYMFUNC(RamDacCreateInfoRec)
-+ SYMFUNC(RamDacHelperCreateInfoRec)
-+ SYMFUNC(RamDacDestroyInfoRec)
-+ SYMFUNC(RamDacHelperDestroyInfoRec)
-+ SYMFUNC(RamDacInit)
-+ SYMFUNC(RamDacHandleColormaps)
-+ SYMFUNC(RamDacFreeRec)
-+ SYMFUNC(RamDacGetHWIndex)
-+ SYMVAR(RamDacHWPrivateIndex)
-+ SYMVAR(RamDacScreenPrivateIndex)
-+
-+ /* ramdac/xf86Cursor.c */
-+ SYMFUNC(xf86InitCursor)
-+ SYMFUNC(xf86CreateCursorInfoRec)
-+ SYMFUNC(xf86DestroyCursorInfoRec)
-+ SYMFUNC(xf86ForceHWCursor)
-+
-+ /* ramdac/BT.c */
-+ SYMFUNC(BTramdacProbe)
-+ SYMFUNC(BTramdacSave)
-+ SYMFUNC(BTramdacRestore)
-+ SYMFUNC(BTramdacSetBpp)
-+
-+ /* ramdac/IBM.c */
-+ SYMFUNC(IBMramdacProbe)
-+ SYMFUNC(IBMramdacSave)
-+ SYMFUNC(IBMramdacRestore)
-+ SYMFUNC(IBMramdac526SetBpp)
-+ SYMFUNC(IBMramdac640SetBpp)
-+ SYMFUNC(IBMramdac526CalculateMNPCForClock)
-+ SYMFUNC(IBMramdac640CalculateMNPCForClock)
-+ SYMFUNC(IBMramdac526HWCursorInit)
-+ SYMFUNC(IBMramdac640HWCursorInit)
-+ SYMFUNC(IBMramdac526SetBppWeak)
-+
-+ /* ramdac/TI.c */
-+ SYMFUNC(TIramdacCalculateMNPForClock)
-+ SYMFUNC(TIramdacProbe)
-+ SYMFUNC(TIramdacSave)
-+ SYMFUNC(TIramdacRestore)
-+ SYMFUNC(TIramdac3026SetBpp)
-+ SYMFUNC(TIramdac3030SetBpp)
-+ SYMFUNC(TIramdacHWCursorInit)
-+ SYMFUNC(TIramdacLoadPalette)
- };
diff --git a/debian/patches/series b/debian/patches/series
index 58c728b..3465073 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,8 +4,6 @@
10_dont_look_in_home_for_config.diff -p0
13_debian_add_xkbpath_env_variable.diff
21_glx_align_fixes.patch
-24_hurd_ioperm_fix.diff
-46_export-ramdac-symbols.diff
91_ttf2pt1
91_ttf2pt1_updates
92_xprint-security-holes-fix.patch
commit 99eae8bea6724a24477375ad5b2d31cc4883cf6b
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue May 29 22:04:36 2007 -0400
I/O enable/disable update for the Hurd
diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
index 45e9a09..b889283 100644
--- a/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/hw/xfree86/os-support/hurd/hurd_video.c
@@ -117,49 +117,29 @@ xf86LinearVidMem()
/**************************************************************************
* I/O Permissions section
***************************************************************************/
-mach_port_t io_port;
+
+/*
+ * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
+ * this.
+ */
+extern int ioperm(unsigned long __from, unsigned long __num, int __turn_on);
Bool
xf86EnableIO()
{
- mach_port_t device;
- kern_return_t err;
-
- err = get_privileged_ports(NULL, &device);
- if( err )
- {
- errno = err;
- FatalError("xf86EnableIO() can't get_privileged_ports. (%s)\n",strerror(errno));
- }
- err = device_open(device,D_READ|D_WRITE,"io",&io_port);
- mach_port_deallocate(mach_task_self(), device);
- if( err )
- {
- errno = err;
- FatalError("xf86EnableIO() can't device_open. (%s)\n",strerror(errno));
- }
-
- err = i386_io_port_add(mach_thread_self (), io_port);
- if( err )
- {
- errno = err;
- FatalError("xf86EnableIO() can't i386_io_port_add.(io_port) (%s)\n",strerror(errno));
+ if (ioperm(0, 0xffff, 1)) {
+ FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno));
+ return FALSE;
}
+ ioperm(0x40,4,0); /* trap access to the timer chip */
+ ioperm(0x60,4,0); /* trap access to the keyboard controller */
return TRUE;
}
void
xf86DisableIO()
{
- kern_return_t err;
-
- err = i386_io_port_remove(mach_thread_self (), io_port);
- if( err )
- {
- errno = err;
- FatalError("xf86DisableIO() can't i386_io_port_remove.(io_port) (%s)\n",strerror(errno));
- }
- mach_port_deallocate(mach_task_self(), io_port);
+ ioperm(0,0xffff,0);
return;
}
commit 3c6f1428489c1f71acd41066ea73ef4ae7c60f17
Author: Julien Cristau <jcristau@debian.org>
Date: Tue May 29 22:01:30 2007 -0400
Make sure that the ramdac symbols are present in the server
The former ramdac module is now built into the server, so its symbols need to
be explicitly exported to drivers (Debian #423129).
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index 5175f01..6535e4c 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -96,6 +96,11 @@
#endif
#include "xf86DDC.h"
#include "edid.h"
+#include "xf86Cursor.h"
+#include "xf86RamDac.h"
+#include "BT.h"
+#include "IBM.h"
+#include "TI.h"
#ifndef HAS_GLIBC_SIGSETJMP
#if defined(setjmp) && defined(__GNU_LIBRARY__) && \
@@ -1255,4 +1260,50 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86I2CWriteRead)
SYMFUNC(xf86I2CWriteVec)
SYMFUNC(xf86I2CWriteWord)
+
+ /* ramdac/xf86RamDac.c */
+ SYMFUNC(RamDacCreateInfoRec)
+ SYMFUNC(RamDacHelperCreateInfoRec)
+ SYMFUNC(RamDacDestroyInfoRec)
+ SYMFUNC(RamDacHelperDestroyInfoRec)
+ SYMFUNC(RamDacInit)
+ SYMFUNC(RamDacHandleColormaps)
+ SYMFUNC(RamDacFreeRec)
+ SYMFUNC(RamDacGetHWIndex)
+ SYMVAR(RamDacHWPrivateIndex)
+ SYMVAR(RamDacScreenPrivateIndex)
+
+ /* ramdac/xf86Cursor.c */
+ SYMFUNC(xf86InitCursor)
+ SYMFUNC(xf86CreateCursorInfoRec)
+ SYMFUNC(xf86DestroyCursorInfoRec)
+ SYMFUNC(xf86ForceHWCursor)
+
+ /* ramdac/BT.c */
+ SYMFUNC(BTramdacProbe)
+ SYMFUNC(BTramdacSave)
+ SYMFUNC(BTramdacRestore)
+ SYMFUNC(BTramdacSetBpp)
+
+ /* ramdac/IBM.c */
+ SYMFUNC(IBMramdacProbe)
+ SYMFUNC(IBMramdacSave)
+ SYMFUNC(IBMramdacRestore)
+ SYMFUNC(IBMramdac526SetBpp)
+ SYMFUNC(IBMramdac640SetBpp)
+ SYMFUNC(IBMramdac526CalculateMNPCForClock)
+ SYMFUNC(IBMramdac640CalculateMNPCForClock)
+ SYMFUNC(IBMramdac526HWCursorInit)
+ SYMFUNC(IBMramdac640HWCursorInit)
+ SYMFUNC(IBMramdac526SetBppWeak)
+
+ /* ramdac/TI.c */
+ SYMFUNC(TIramdacCalculateMNPForClock)
+ SYMFUNC(TIramdacProbe)
+ SYMFUNC(TIramdacSave)
+ SYMFUNC(TIramdacRestore)
+ SYMFUNC(TIramdac3026SetBpp)
+ SYMFUNC(TIramdac3030SetBpp)
+ SYMFUNC(TIramdacHWCursorInit)
+ SYMFUNC(TIramdacLoadPalette)
};
commit ee20c481eede0954f4a8bef5113979b101863c32
Author: Matthieu Herrb <matthieu@deville.herrb.com>
Date: Tue May 29 14:54:27 2007 -0600
Remove wscons keyboard handling stuff that doesn't belong there anymore.
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 3610c17..4da74e5 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -1208,31 +1208,3 @@ _X_EXPORT void
DDXRingBell(int volume, int pitch, int duration) {
xf86OSRingBell(volume, pitch, duration);
}
-
-#ifdef WSCONS_SUPPORT
-
-/* XXX Currently XKB is mandatory. */
-
-extern int WSKbdToKeycode(int);
-
-void
-xf86PostWSKbdEvent(struct wscons_event *event)
-{
- int type = event->type;
- int value = event->value;
- unsigned int keycode;
- int blocked;
-
- if (type == WSCONS_EVENT_KEY_UP || type == WSCONS_EVENT_KEY_DOWN) {
- Bool down = (type == WSCONS_EVENT_KEY_DOWN ? TRUE : FALSE);
-
- /* map the scancodes to standard XFree86 scancode */
- keycode = WSKbdToKeycode(value);
- if (!down) keycode |= 0x80;
- /* It seems better to block SIGIO there */
- blocked = xf86BlockSIGIO();
- xf86PostKbdEvent(keycode);
- xf86UnblockSIGIO(blocked);
- }
-}
-#endif /* WSCONS_SUPPORT */
commit 3a6549a163aba26bf4ac58b050c493fba0df14c6
Author: Matthieu Herrb <matthieu@deville.herrb.com>
Date: Tue May 29 12:14:23 2007 -0600
Make this build on OpenBSD
diff --git a/hw/xfree86/os-support/bsd/bsd_bell.c b/hw/xfree86/os-support/bsd/bsd_bell.c
index b7a0c48..0d24201 100644
--- a/hw/xfree86/os-support/bsd/bsd_bell.c
+++ b/hw/xfree86/os-support/bsd/bsd_bell.c
@@ -27,7 +27,7 @@
#include <xorg-config.h>
#endif
-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+#if defined (SYSCONS_SUPPORT)
#include <sys/kbio.h>
#endif
@@ -77,7 +77,7 @@ xf86OSRingBell(int loudness, int pitch, int duration)
wsb.pitch = pitch;
wsb.period = duration;
wsb.volume = loudness;
- ioctl(KBD_FD(xf86Info), WSKBDIO_COMPLEXBELL,
+ ioctl(xf86Info.consoleFd, WSKBDIO_COMPLEXBELL,
&wsb);
break;
#endif
commit 2f13b7c113c17239e382dd3640e9c29201d8ab1f
Author: Drew Parsons <dparsons@debian.org>
Date: Wed May 30 02:13:36 2007 +1000
Update Xprint build for pixman.
Xprt links libfb, which now uses pixman. Update configure.ac to
require module $PIXMAN for XPRINT.
Also, use $(top_builddir) to reference libfb.la and other local
libraries, rather than using the relative reference ../..
diff --git a/configure.ac b/configure.ac
index 7ff712f..350245e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1600,7 +1600,7 @@ AC_MSG_CHECKING([whether to build Xprint DDX])
AC_MSG_RESULT([$XPRINT])
if test "x$XPRINT" = xyes; then
- PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau])
+ PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau $PIXMAN])
XPRINT_EXTENSIONS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS"
XPRINT_LIBS="$DIX_LIB $CONFIG_LIB $XKB_LIB $XKB_STUB_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB $CWRAP_LIB $OS_LIB $LIBS $XPRINT_LIBS"
AC_SUBST([XPRINT_CFLAGS])
diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am
index 45168b1..dc8764a 100644
--- a/hw/xprint/Makefile.am
+++ b/hw/xprint/Makefile.am
@@ -10,9 +10,9 @@ Xprt_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
Xprt_LDFLAGS = -L$(top_srcdir)
Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \
- pcl/libpcl.la pcl-mono/libpcl.la ../../fb/libfb.la \
- ../../render/librender.la ../../mi/libmi.la ../../Xext/libXext.la \
- @FREETYPE_LIBS@
+ pcl/libpcl.la pcl-mono/libpcl.la $(top_builddir)/fb/libfb.la \
+ $(top_builddir)/render/librender.la $(top_builddir)/mi/libmi.la \
+ $(top_builddir)/Xext/libXext.la @FREETYPE_LIBS@
miinitext-wrapper.c:
echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
Reply to: