X Strike Force XFree86 SVN commit: r1190 - in trunk/debian: . patches
Author: branden
Date: 2004-03-26 14:38:14 -0500 (Fri, 26 Mar 2004)
New Revision: 1190
Modified:
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Grab patches from upstream CVS HEAD (not under X-Oz or XFree86 1.1
license) that fix loud chatter from Linux 2.6 such as:
"atkbd.c: This is an XFree86 bug. It shouldn't access hardware directly.".
+ Do the Linux KDKBDREP ioctl on the correct fd. This prevents the
fallback that tries to directly program the keyboard repeat rate,
and the related warning messages that recent Linux kernels generate
(David Dawes).
(Closes: #230204)
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-03-25 23:11:06 UTC (rev 1189)
+++ trunk/debian/TODO 2004-03-26 19:38:14 UTC (rev 1190)
@@ -71,7 +71,6 @@
* Add FAQ items:
+ How do I debug crashes in X clients?
+ How do I debug crashes in the XFree86 X server?
-* #224909: patches to lnx_{io,kbd}.c to shut up noise from Linux 2.6
* #238407: XFree86 crashes on PPC in 0x1072260c in AccessXCancelRepeatKey
(xkbi=0x0, key=64 '@') at xkbAccessX.c:387; possible fix exits upstream --
see bug report
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-03-25 23:11:06 UTC (rev 1189)
+++ trunk/debian/changelog 2004-03-26 19:38:14 UTC (rev 1190)
@@ -58,8 +58,17 @@
packages' config scripts, invoke the discover command such that an
abnormal exit on its part does not crash the script.
- -- Branden Robinson <branden@debian.org> Thu, 25 Mar 2004 18:05:50 -0500
+ * Grab patches from upstream CVS HEAD (not under X-Oz or XFree86 1.1
+ license) that fix loud chatter from Linux 2.6 such as:
+ "atkbd.c: This is an XFree86 bug. It shouldn't access hardware directly.".
+ + Do the Linux KDKBDREP ioctl on the correct fd. This prevents the
+ fallback that tries to directly program the keyboard repeat rate,
+ and the related warning messages that recent Linux kernels generate
+ (David Dawes).
+ (Closes: #230204)
+ -- Branden Robinson <branden@debian.org> Fri, 26 Mar 2004 14:34:14 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-03-25 23:11:06 UTC (rev 1189)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-03-26 19:38:14 UTC (rev 1190)
@@ -76,6 +76,13 @@
751. Fix some rules in en_US.UTF-8 Compose file (Bugzilla #1071,
Matthew Fischer).
+xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c @ 3.27
+xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c @ 1.6
+ 6. Do the Linux KDKBDREP ioctl on the correct fd. This prevents the
+ fallback that tries to directly program the keyboard repeat rate,
+ and the related warning messages that recent Linux kernels generate
+ (David Dawes).
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100
+++ xc/config/imake/imake.c 2003-04-09 01:58:14.000000000 +1000
@@ -710,9 +717,8 @@
}
if (versions[version_index].major_version > Dont_Check)
-diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
---- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2003-11-12 18:00:24.000000000 +1100
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2003-11-12 18:01:33.000000000 +1100
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c~ 2004-03-26 14:02:57.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-03-26 14:03:22.000000000 -0500
@@ -67,6 +67,7 @@
* from util-linux-2.9t package */
@@ -721,10 +727,45 @@
#ifdef __sparc__
#include <asm/param.h>
#include <asm/kbio.h>
-diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
---- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2003-11-12 18:00:24.000000000 +1100
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2003-11-12 18:01:33.000000000 +1100
-@@ -93,12 +93,20 @@
+@@ -80,7 +81,7 @@
+ #endif
+
+ static int
+-KDKBDREP_ioctl_ok(int rate, int delay) {
++KDKBDREP_ioctl_ok(int fd, int rate, int delay) {
+ #if defined(KDKBDREP) && !defined(__sparc__)
+ /* This ioctl is defined in <linux/kd.h> but is not
+ implemented anywhere - must be in some m68k patches. */
+@@ -89,7 +90,7 @@
+ /* don't change, just test */
+ kbdrep_s.rate = -1;
+ kbdrep_s.delay = -1;
+- if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
++ if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
+ return 0;
+ }
+
+@@ -104,7 +105,7 @@
+ if (kbdrep_s.delay < 1)
+ kbdrep_s.delay = 1;
+
+- if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
++ if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
+ return 0;
+ }
+
+@@ -178,7 +179,7 @@
+ delay = xf86Info.kbdDelay;
+
+
+- if(KDKBDREP_ioctl_ok(rate, delay)) /* m68k? */
++ if(KDKBDREP_ioctl_ok(xf86Info.consoleFd, rate, delay)) /* m68k? */
+ return;
+
+ if(KIOCSRATE_ioctl_ok(rate, delay)) /* sparc? */
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c~ 2004-03-26 14:03:00.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-03-26 14:03:22.000000000 -0500
+@@ -93,14 +93,22 @@
/* kbd rate stuff based on kbdrate.c from Rik Faith <faith@cs.unc.edu> et.al.
* from util-linux-2.9t package */
@@ -744,8 +785,29 @@
+#endif
+
static int
- KDKBDREP_ioctl_ok(int rate, int delay) {
+-KDKBDREP_ioctl_ok(int rate, int delay) {
++KDKBDREP_ioctl_ok(int fd, int rate, int delay) {
#if defined(KDKBDREP) && !defined(__sparc__)
+ /* This ioctl is defined in <linux/kd.h> but is not
+ implemented anywhere - must be in some m68k patches. */
+@@ -109,7 +117,7 @@
+ /* don't change, just test */
+ kbdrep_s.rate = -1;
+ kbdrep_s.delay = -1;
+- if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
++ if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
+ return 0;
+ }
+
+@@ -124,7 +132,7 @@
+ if (kbdrep_s.delay < 1)
+ kbdrep_s.delay = 1;
+
+- if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
++ if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
+ return 0;
+ }
+
@@ -160,6 +168,8 @@
#endif /* KIOCSRATE */
}
@@ -755,6 +817,15 @@
static void
SetKbdRepeat(InputInfoPtr pInfo, char rad)
{
+@@ -190,7 +200,7 @@
+ if (pKbd->delay >= 0)
+ delay = pKbd->delay;
+
+- if(KDKBDREP_ioctl_ok(rate, delay)) /* m68k? */
++ if(KDKBDREP_ioctl_ok(pInfo->fd, rate, delay)) /* m68k? */
+ return;
+
+ if(KIOCSRATE_ioctl_ok(rate, delay)) /* sparc? */
--- xc/nls/locale.alias 18 Dec 2003 04:14:22 -0000 1.64
+++ xc/nls/locale.alias 3 Jan 2004 03:31:00 -0000 1.65
@@ -419,6 +419,7 @@
Reply to: