X Strike Force XFree86 SVN commit: r1844 - in trunk/debian: . po
Author: branden Date: 2004-09-22 01:40:09 -0500 (Wed, 22 Sep 2004) New Revision: 1844 Modified: trunk/debian/CHANGESETS trunk/debian/po/ca.po trunk/debian/po/cs.po trunk/debian/po/da.po trunk/debian/po/de.po trunk/debian/po/el.po trunk/debian/po/es.po trunk/debian/po/fr.po trunk/debian/po/gl.po trunk/debian/po/it.po trunk/debian/po/ja.po trunk/debian/po/nl.po trunk/debian/po/pl.po trunk/debian/po/pt_BR.po trunk/debian/po/ru.po trunk/debian/po/sv.po trunk/debian/po/templates.pot trunk/debian/po/tr.po Log: Re-run debian/rules's updatepo target, fixing some line wrapping and other cosmetic issues in recent translation updates. Modified: trunk/debian/CHANGESETS === --- trunk/debian/CHANGESETS 2004-09-22 01:22:37 UTC (rev 1843) +++ trunk/debian/CHANGESETS 2004-09-22 06:40:09 UTC (rev 1844) @@ -62,4 +62,8 @@ Update Japanese debconf template translations (thanks, Kenshi Muto). 1843 +Re-run debian/rules's updatepo target, fixing some line wrapping and other +cosmetic issues in recent translation updates. +1844 + vim:set ai et sts=4 sw=4 tw=80: Modified: trunk/debian/po/ca.po === --- trunk/debian/po/ca.po 2004-09-22 01:22:37 UTC (rev 1843) +++ trunk/debian/po/ca.po 2004-09-22 06:40:09 UTC (rev 1844) @@ -26,7 +26,7 @@ msgstr Project-Id-Version: xfree86 4.3.0.dfsg.1-5\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2004-08-30 07:42+\n +POT-Creation-Date: 2004-09-22 01:37:39-0500\n PO-Revision-Date: 2004-06-09 20:08+0200\n Last-Translator: Ivan Vilata i Balaguer [EMAIL PROTECTED]\n Language-Team: Catalan debian-l10n-catalan@lists.debian.org\n Modified: trunk/debian/po/cs.po === --- trunk/debian/po/cs.po 2004-09-22 01:22:37 UTC (rev 1843) +++ trunk/debian/po/cs.po 2004-09-22 06:40:09 UTC (rev 1844) @@ -26,7 +26,7 @@ msgstr Project-Id-Version: xfree86\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2004-08-30 07:42+\n +POT-Creation-Date: 2004-09-22 01:37:39-0500\n PO-Revision-Date: 2004-05-29 17:03+0200\n Last-Translator: Miroslav Kure [EMAIL PROTECTED]\n Language-Team: Czech [EMAIL PROTECTED]\n Modified: trunk/debian/po/da.po === --- trunk/debian/po/da.po 2004-09-22 01:22:37 UTC (rev 1843) +++ trunk/debian/po/da.po 2004-09-22 06:40:09 UTC (rev 1844) @@ -28,7 +28,7 @@ msgstr Project-Id-Version: xfree86_4.3.0-3_da\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2004-08-30 07:42+\n +POT-Creation-Date: 2004-09-22 01:37:39-0500\n PO-Revision-Date: 2004-09-07 19:22+0200\n Last-Translator: Claus Hindsgaul [EMAIL PROTECTED]\n Language-Team: Danish [EMAIL PROTECTED]\n Modified: trunk/debian/po/de.po === --- trunk/debian/po/de.po 2004-09-22 01:22:37 UTC (rev 1843) +++ trunk/debian/po/de.po 2004-09-22 06:40:09 UTC (rev 1844) @@ -34,7 +34,7 @@ msgstr Project-Id-Version: de\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2004-08-30 07:42+\n +POT-Creation-Date: 2004-09-22 01:37:39-0500\n PO-Revision-Date: 2004-07-24 15:03+0200\n Last-Translator: Alwin Meschede [EMAIL PROTECTED]\n Language-Team: gnome-de@gnome.org\n Modified: trunk/debian/po/el.po === --- trunk/debian/po/el.po 2004-09-22 01:22:37 UTC (rev 1843) +++ trunk/debian/po/el.po 2004-09-22 06:40:09 UTC (rev 1844) @@ -26,7 +26,7 @@ msgstr Project-Id-Version: el\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2004-08-30 07:42+\n +POT-Creation-Date: 2004-09-22 01:37:39-0500\n PO-Revision-Date: 2004-05-27 21:10EEST\n Last-Translator: Konstantinos Margaritis [EMAIL PROTECTED]\n Language-Team: Greek debian-l10n-greek@lists.debian.org\n Modified: trunk/debian/po/es.po === --- trunk/debian/po/es.po 2004-09-22 01:22:37 UTC (rev 1843) +++ trunk/debian/po/es.po 2004-09-22 06:40:09 UTC (rev 1844) @@ -28,7 +28,7 @@ msgstr Project-Id-Version: xfree86 4.2.1-6\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2004-08-30 07:42+\n +POT-Creation-Date: 2004-09-22 01:37:39-0500\n PO-Revision-Date: 2003-03-24 20:21+0100\n Last-Translator: Javier Fernandez-Sanguino Pe�a [EMAIL PROTECTED]\n Language-Team: ES debian-l10n-spanish@lists.debian.org\n Modified: trunk/debian/po/fr.po === --- trunk/debian/po/fr.po 2004-09-22 01:22:37 UTC (rev 1843) +++ trunk/debian/po/fr.po 2004-09-22 06:40:09 UTC (rev 1844) @@ -31,7 +31,7 @@ msgstr Project-Id-Version: xfree86 4.2.1-10\n
X Strike Force XFree86 SVN commit: r1845 - branches/debconf-overhaul/debian
Author: branden Date: 2004-09-22 01:44:15 -0500 (Wed, 22 Sep 2004) New Revision: 1845 Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in Log: When figuring out whether the reported fbcon type supports the UseFBDev interface, use a word-delimited match (grep -w). Improve comments documenting UseFBDev logic. Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in === --- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 06:40:09 UTC (rev 1844) +++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 06:44:15 UTC (rev 1845) @@ -934,6 +934,9 @@ xserver-xfree86/config/device/video_ram # Use fbcon kernel interface? + + # For architectures that can use VGA BIOS-equipped video cards on the primary + # head, we initially assume fbcon is not in use (but see below). set_db_priority high case $ARCH in alpha|hurd-i386|i386|amd64) @@ -944,19 +947,24 @@ ;; esac - # XXX: is this a good test for /proc being mounted? + # Next, check for evidence of fbcon actually being in use by the Linux kernel, + # potentially changing the default we just set. + # XXX: Is this a good test for /proc being mounted? if [ -e /proc/self ]; then if [ -e /proc/fb ]; then fb_type=$(grep '^0 ' /proc/fb | sed 's/[^[:space:]] //') trace $func(): /proc/fb reports framebuffer type \$fb_type\ - # did we actually get back anything? + # Did we actually get back anything? if [ -n $fb_type ]; then +# We know that fbcon is being used, so we can set a reasonable default. set_db_priority medium -if echo $fb_type | grep -Eiq '(OFfb|VESA)'; then +if echo $fb_type | grep -Eiqw '(OFfb|VESA)'; then + # The OpenFirmware and VESA fbcon drivers can't be externally + # manipulated (i.e., no UseFBDev). trace $func(): this framebuffer type does not support UseFBDev default_use_fbdev=false -else - # other framebuffers do support UseFBDev +else + # Other framebuffers do support UseFBDev. default_use_fbdev=true fi fi
X Strike Force XFree86 SVN property change: propchange - r1794 svn:log
Author: branden Revision: 1794 Property Name: svn:log New Property Value: (cosmetic) Indulge my OCD by tidying up trace message output.
X Strike Force XFree86 SVN property change: propchange - r1792 svn:log
Author: branden Revision: 1792 Property Name: svn:log New Property Value: Add required when date format includes whitespace.
X Strike Force XFree86 SVN property change: propchange - r1780 svn:log
Author: branden Revision: 1780 Property Name: svn:log New Property Value: Add several video modes supported by XFree86 4.3.0 to the available options in xserver-xfree86/config/monitor/mode-list: - 832x624 @ 75Hz - 1152x864 @ 75Hz (Closes: #130274) - 1400x1050 @ 60Hz - 1400x1050 @ 75Hz (Closes: #144040) - 1600x1024 @ 60Hz - 1920x1440 @ 85Hz - 2048x1536 @ 60Hz - 2048x1536 @ 75Hz - 2048x1536 @ 85Hz Make the new template default for this question 1152x864 @ 75Hz.
X Strike Force XFree86 SVN commit: r1846 - trunk/debian
Author: branden Date: 2004-09-22 02:19:20 -0500 (Wed, 22 Sep 2004) New Revision: 1846 Modified: trunk/debian/CHANGESETS trunk/debian/changelog Log: (cosmetic) Whitespace police. Modified: trunk/debian/CHANGESETS === --- trunk/debian/CHANGESETS 2004-09-22 06:44:15 UTC (rev 1845) +++ trunk/debian/CHANGESETS 2004-09-22 07:19:20 UTC (rev 1846) @@ -9,7 +9,7 @@ files anywhere.) Miscellaneous cosmetic fixes. -1811, 1812, 1815, 1816, 1828, 1829, 1830, 1842 +1811, 1812, 1815, 1816, 1828, 1829, 1830, 1842, 1846 Update Danish debconf template translations (thanks, Claus Hindsgaul). 1806 Modified: trunk/debian/changelog === --- trunk/debian/changelog 2004-09-22 06:44:15 UTC (rev 1845) +++ trunk/debian/changelog 2004-09-22 07:19:20 UTC (rev 1846) @@ -45,11 +45,11 @@ * Create debian/tmp/usr/X11R6/lib/X11/doc when NOT_BUILDING_XFREE86_X_SERVER is defined. Fixes FTBFS on s390. - + Changes by ISHIKAWA Mutsumi: * Update Japanese debconf template translations (thanks, Kenshi Muto). - + -- Branden Robinson [EMAIL PROTECTED] Tue, 21 Sep 2004 15:49:27 -0500 xfree86 (4.3.0.dfsg.1-7) unstable; urgency=high
To Flowers's Shop Customers!
Dear customer! We updated our software catalogue and added new popular products! Now you can get any software item at 90% discount rate! For more information visit us here: http://www.bestoem.info/?baird With best regards, Product Manager Gilberto Bermudez
X Strike Force XFree86 SVN commit: r1848 - branches/debconf-overhaul/debian
Author: branden
Date: 2004-09-22 02:36:32 -0500 (Wed, 22 Sep 2004)
New Revision: 1848
Modified:
branches/debconf-overhaul/debian/TODO
Log:
Restrict TODO list to the items to be done on this branch.
Modified: branches/debconf-overhaul/debian/TODO
===
--- branches/debconf-overhaul/debian/TODO 2004-09-22 07:30:59 UTC (rev
1847)
+++ branches/debconf-overhaul/debian/TODO 2004-09-22 07:36:32 UTC (rev
1848)
@@ -14,15 +14,8 @@
scheduled. However, the package release manager can put an explicit freeze on
those by marking the package version section accordingly.
-4.3.0.dfsg.1-8
---
-
-* Fix Xpm library stack and integer overflow vulnerabilities. (#272493; woody
- security update already in progress)
-* Fix for the nv driver breakage, consider backporting the driver from
- x.org.
- See: #269025, #268759, #271235, #270228, #271071
-* Add FAQ entry describing what has become of the XFree86 3.x packages.
+debconf-overhaul branch
+---
* Rewrite xserver-xfree86 debconfage. Joey Hess, Eduard Bloch, and David
Nusinow have provided good input.
+ udev users will have /dev/input/mousen -- configure that as only mouse
@@ -38,261 +31,5 @@
done about this [BR]
+ Use /proc/hardware on m68k architecture to set a reasonable default mouse
port. See URL: http://lists.debian.org/debian-68k/2004/08/msg00392.html.
-* Add FAQ entry describing Debian's plans in the X department.
-4.3.0.dfsg.1-9
---
-
-* #245541: Evaluate Sven Luther's driver DDK package patch:
- http://lists.debian.org/debian-x/2003/debian-x-200311/msg2.html
-* #253480: xdm: XDM fails if the user is over disk quota, but empty files can
- be created
-* update XTerm to #193
-* #261163: xlibs: KPDL mapping wrong in Polish layouts [patch available]
-* #255011: add macintosh/ca symbols file; awaiting keyboard photograph and test
- cycle with [EMAIL PROTECTED]
-
-Post 4.3.0-1
-
-* Should xc/include/{Xw32defs.h,Xwinsock.h} be installed (and shipped) for
- the benefit of cross-compilers? Check upstream Imakeage.
-* Why doesn't xc/include/extensions/xtestext1.h do something like this?:
- #ifndef _XTESTEXT1_H_
- #define _XTESTEXT1_H_
- [...]
- #endif
-* patch Xft1 manpage to turn it into XftConfig(5x) and ship it in libxft1
-* make install should not install X render headers (render.h,
- renderproto.h) if the Xrender library itself is not being installed
-* move docs from xspecs to -dev packages as appropriate
-* Ensure the lists of programs in the xbase-clients and xutils package
- descriptions are up-to-date.
-* Ensure all patches in debian/patches are properly annotated.
-* Add FAQ items:
- + How do I debug crashes in X clients?
- + How do I debug crashes in the XFree86 X server?
- + #251449: add instructions on configuring multiple displays
-* Document RenderColormapMode for XF86Config.man per keithp's mail.
- Message-Id: [EMAIL PROTECTED]
-* #243288: xfree86-common: DebianRed should be in rgb.txt [STALLED awaiting
- more info]
-* #245065: xbase-clients: add an option to let setxkbmap ignore current server
- settings
-* Fix xc/lib/X11/XlcDL.c to not use confusing symbol name _MACH64_NAME, which
- has to do with 64-bit machines, not ATI Mach64 video chipsets. Also the
- corresponding kludge to if defined(_LP64) defined(__sparcv9), as
- suggested by Christoph Hellwig.
-* Grab patch from upstream:
- + C-style comments were being stripped by preprocessing.
-Message-Id: [EMAIL PROTECTED]
-* Fix upstream install rule that prevents Xcursor themes from being
- installed on s390. As I understand it, this is client-side stuff and
- there's not really any reason it shouldn't be made available on the s390
- architecture.
-* Fix other gratuitous differences between s390 debehlper files and the
- generic ones by fixing upstream Imakeage to not turn extra stuff off when
- the XFree86 X server is not being built (like xmodmap.std). It ships
- libXxf86vm.a but not the corresponding manpages.
-* Scan all -dev packages' *.h files for undeclared dependencies due to
- #includes.
-* #233551: add SELinux support to xdm
-* Backport s3 driver from sanitized XFree86 4.4.0-pre-RC3 tree; fairly small
- changes, but fixes bugs and adds support for Trio64UV+ and Trio64V2/DX/GX
- chipsets. Note that the same REGION_EQUAL and REGION_NULL hacks used for the
- ATI driver backport will also need to be applied here. There may also be
some
- XVideo stuff to cope with: new symbols xf86XVClipVideoHelper(),
- xf86XVCopyYUV12ToPacked(), xf86XVCopyPacked(), and xf86XVFillKeyHelper() are
- used. Closes: #192365, likely among others.
-* Examine Marc Haber's Xsession suggestions:
- + #252585: xfree86-common: Xsession.options parsing fragile
- + #252592: xfree86-common: please consider adding a local hook for Xsession
-handling
-* Investigate updated VIA/Unichrome driver patch
Re: mouse for x
On Sun, Aug 22, 2004 at 02:46:31PM +0200, Christian T. Steigies wrote: On Sun, Aug 22, 2004 at 02:26:46PM +0200, Wouter Verhelst wrote: Better use /proc/hardware [EMAIL PROTECTED]:~$ cat /proc/hardware Model: Motorola MVME167 [...] [EMAIL PROTECTED]:~$ cat /proc/hardware Model: Macintosh Quadra 840AV [...] cat /proc/hardware Model: Amiga A2000 [...] We have Q40 kernels since 2.4.26 IIRC, Oh, we do? they should run on Q40 and Q60. Roman Zippel should be able to say how /proc/hardware looks like for those machines. Reading the kernel source, I think that'll always be Q40, even on Q60. That's what I'm using for debian-installer archdetect. Okay. Please comment on the following. m68k) # A good default for m68k depends on which sub-architecure this is. if [ -r /proc/hardware ]; then subarch=$(grep -w Model: | sed 's/Model:[[:space:]]+//') case $subarch in Amiga*) mouse_port_choices=/dev/amigamouse, /dev/gpmdata default_port=/dev/amigamouse ;; Atari*) mouse_port_choices=/dev/atarimouse, /dev/gpmdata default_port=/dev/atarimouse ;; Macintosh*) mouse_port_choices=/dev/adbmouse, /dev/gpmdata default_port=/dev/adbmouse ;; Motorola*) # BVME/MVME trace $func(): no good defaults known for VME mouse configuration ;; Q40*) # Q40/Q60 trace $func(): no good defaults known for Q40/Q60 mouse configuration ;; esac I'd appreciate knowing: 1) If the available and default choices for Amiga, Atari, and Mac are sane; 2) If anyone has anything to regarding VME or Q40/Q60 machines. Without an answer to 2), VME and Q40 boxen will get the architecture-neutral choices and defaults: if [ -n $using_devfs ]; then trace $func(): devfs appears to be in use; using devfs names for mouse \ port choices mouse_port_choices=/dev/misc/psaux, /dev/tts/0, /dev/tts/1, /dev/tts/2, /dev/tts/3, /dev/input/mice, /dev/misc/atixl, /dev/gpmdata else trace $func(): devfs does not appear to be in use mouse_port_choices=/dev/psaux, /dev/ttyS0, /dev/ttyS1, /dev/ttyS2, /dev/ttyS3, /dev/input/mice, /dev/atibm, /dev/sunmouse, /dev/gpmdata fi -- G. Branden Robinson|Of two competing theories or Debian GNU/Linux |explanations, all other things [EMAIL PROTECTED] |being equal, the simpler one is to http://people.debian.org/~branden/ |be preferred. -- Occam's Razor signature.asc Description: Digital signature
X Strike Force XFree86 SVN commit: r1849 - branches/debconf-overhaul/debian
Author: branden Date: 2004-09-22 03:50:51 -0500 (Wed, 22 Sep 2004) New Revision: 1849 Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in Log: Add support for ADB, Amiga, and Atari mice. Set more reasonable hardware-specific mouse port default even in the absence of mdetect. Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in === --- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 07:36:32 UTC (rev 1848) +++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 08:50:51 UTC (rev 1849) @@ -1075,7 +1075,8 @@ # section (using the mouse driver) of the XF86Config-4 file. local autodetected_port autodetected_protocol default_port default_protocol \ -func mdetect_output mouse_port_choices mouse_protocol_choices using_devfs +func mdetect_output mouse_port_choices mouse_protocol_choices subarch \ +using_devfs func=configure_mouse @@ -1099,14 +1100,110 @@ if [ -n $using_devfs ]; then trace $func(): devfs appears to be in use; using devfs names for mouse \ port choices -mouse_port_choices=/dev/misc/psaux, /dev/tts/0, /dev/tts/1, /dev/tts/2, /dev/tts/3, /dev/input/mice, /dev/misc/atixl, /dev/gpmdata -default_port=/dev/misc/psaux +mouse_port_choices=/dev/misc/psaux, /dev/tts/0, /dev/tts/1, /dev/tts/2, /dev/tts/3, /dev/input/mice, /dev/adbmouse, /dev/amigamouse, /dev/atarimouse, /dev/misc/atixl, /dev/sunmouse, /dev/gpmdata else trace $func(): devfs does not appear to be in use -mouse_port_choices=/dev/psaux, /dev/ttyS0, /dev/ttyS1, /dev/ttyS2, /dev/ttyS3, /dev/input/mice, /dev/atibm, /dev/sunmouse, /dev/gpmdata -default_port=/dev/psaux +mouse_port_choices=/dev/psaux, /dev/ttyS0, /dev/ttyS1, /dev/ttyS2, /dev/ttyS3, /dev/input/mice, /dev/adbmouse, /dev/amigamouse, /dev/atarimouse, /dev/atibm, /dev/sunmouse, /dev/gpmdata fi + # Attempt to set a reasonable default for the mouse port in the event + # autodetection doesn't work. + case $ARCH in +alpha) + # Assume Alpha machines use PS/2 mice. + if [ -n $using_devfs ]; then +default_port=/dev/misc/psaux + else +default_port=/dev/psaux + fi + ;; +amd64) + # Assume AMD64 machines use USB mice. + default_port=/dev/input/mice + ;; +arm) + trace $func(): no good defaults known for ARM mouse configuration + ;; +hppa) + trace $func(): no good defaults known for PA-RISC mouse configuration + ;; +hurd-i386) + ;; +i386) + # Assume Linux x86 machines use USB mice. + # TODO: We could attempt some parsing of /proc/cpuinfo to default to PS/2 + # for older x86 machines. + default_port=/dev/input/mice + ;; +ia64) + # Assume IA-64 machines use USB mice. + default_port=/dev/input/mice + ;; +m68k) + # A good default for m68k depends on which sub-architecure this is. + if [ -r /proc/hardware ]; then +subarch=$(grep -w Model: | sed 's/Model:[[:space:]]+//') +case $subarch in + Amiga*) +default_port=/dev/amigamouse +;; + Atari*) +default_port=/dev/atarimouse +;; + Macintosh*) +default_port=/dev/adbmouse +;; + Motorola*) # BVME/MVME +trace $func(): no good defaults known for VME mouse + configuration +;; + Q40*) # Q40/Q60 +trace $func(): no good defaults known for Q40/Q60 mouse + configuration +;; +esac + else +trace $func(): cannot autodetect m68k sub-architecture; \ + /proc/hardware does not exist or is not readable + fi + ;; +mips|mipsel) + trace $func(): no good defaults known for MIPS mouse configuration + ;; +powerpc) + # A good default for PowerPC depends on which sub-architecure this is. + if [ -r /proc/cpuinfo ]; then +subarch=$(grep ^machine | sed 's/machine[[:space:]]+:[[:space:]]+//') +case $subarch in + PowerMac*) +# Old World Macs use ADB mice, and New World Macs use USB mice. +if grep -q 'pmac-generation.*OldWorld'; then + default_port=/dev/adbmouse +elif grep -q 'pmac-generation.*NewWorld'; then + default_port=/dev/input/mice +else + trace $func(): cannot autodetect whether Power Macintosh is \ +OldWorld or NewWorld; something amiss with /proc/cpuinfo? +fi +;; + *) +trace $func(): no good defaults known for non-PowerMac PowerPC \ + mouse configuration +;; +esac + else +trace $func(): cannot autodetect PowerPC sub-architecture; \ + /proc/cpuinfo does not exist or is not
X Strike Force XFree86 SVN commit: r1850 - in people/fabbione/nv-driver-backport/debian: . local patches po
Author: fabbione
Date: 2004-09-22 03:52:22 -0500 (Wed, 22 Sep 2004)
New Revision: 1850
Added:
people/fabbione/nv-driver-backport/debian/patches/099z_xkb_fix_rules_xfree86.diff
Removed:
people/fabbione/nv-driver-backport/debian/patches/087_xkb_fix_altwin.diff
people/fabbione/nv-driver-backport/debian/patches/098_nv_xvideo_fullscreen_fix.diff
Modified:
people/fabbione/nv-driver-backport/debian/CHANGESETS
people/fabbione/nv-driver-backport/debian/TODO
people/fabbione/nv-driver-backport/debian/changelog
people/fabbione/nv-driver-backport/debian/local/FAQ.xhtml
people/fabbione/nv-driver-backport/debian/patches/000_stolen_from_HEAD_xkb_data.diff
people/fabbione/nv-driver-backport/debian/po/ca.po
people/fabbione/nv-driver-backport/debian/po/cs.po
people/fabbione/nv-driver-backport/debian/po/da.po
people/fabbione/nv-driver-backport/debian/po/de.po
people/fabbione/nv-driver-backport/debian/po/el.po
people/fabbione/nv-driver-backport/debian/po/es.po
people/fabbione/nv-driver-backport/debian/po/fr.po
people/fabbione/nv-driver-backport/debian/po/gl.po
people/fabbione/nv-driver-backport/debian/po/it.po
people/fabbione/nv-driver-backport/debian/po/ja.po
people/fabbione/nv-driver-backport/debian/po/nl.po
people/fabbione/nv-driver-backport/debian/po/pl.po
people/fabbione/nv-driver-backport/debian/po/pt_BR.po
people/fabbione/nv-driver-backport/debian/po/ru.po
people/fabbione/nv-driver-backport/debian/po/sv.po
people/fabbione/nv-driver-backport/debian/po/templates.pot
people/fabbione/nv-driver-backport/debian/po/tr.po
Log:
Resync from trunk at r1848
Modified: people/fabbione/nv-driver-backport/debian/CHANGESETS
===
--- people/fabbione/nv-driver-backport/debian/CHANGESETS2004-09-22
08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/CHANGESETS2004-09-22
08:52:22 UTC (rev 1850)
@@ -9,9 +9,9 @@
files anywhere.)
Miscellaneous cosmetic fixes.
-1811, 1812, 1815, 1816
+1811, 1812, 1815, 1816, 1828, 1829, 1830, 1842, 1846
-Update Danish debconf template translations (thanks, Claus Hindsgaul)
+Update Danish debconf template translations (thanks, Claus Hindsgaul).
1806
In the Xsession script, attempt to create a file of non-zero length in
@@ -22,4 +22,48 @@
is defined. Fixes FTBFS on s390.
1814
+Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04). This
+makes us_intl multi-layout aware, and binds the right Meta key to
+Mode_Switch. (Closes: #271326, #234085)
+1820, 1824
+
+Revert upstream change to altwin behavior applied in 4.3.0.dfsg.1-1.
+The Meta_* keysyms must be removed from the shift level of Alt keys when
+altwin:meta_win or altwin:left_meta_win are used; otherwise, XKB-unaware
+applications (like GNU Emacs) may believe that mod1 and mod4 are bound to
+Meta keys.
+1821
+
+Fix inconsistencies in rules/xfree86* files:
++ rules/xfree86: List in $oldlayouts all layouts which are currently not
+ multi-layout aware in the Debian xlibs package, including hu_US (thanks,
+ Veres Lajos). (Closes: #247463, #270810)
++ rules/xfree86: Support the lv3:ralt_switch option, which exists in
+ xfree86.lst but was forgotten in this file.
++ rules/xfree86: Remove special case that causes PC keyboard models with
+ the us_intl layout to load the us layout and add the us_intl layout to
+ it. (Closes: #234085)
++ rules/xfree86.{lst,xml}: Replace the options altwin:meta_super and
+ altwin:meta_hyper with the correct names altwin:super_win and
+ altwin:hyper_win. (Closes: #271259)
++ rules/xfree86.{lst,xml}: Synchronize these files.
+1822, 1825, 1826
+
+Add FAQ entry: My keyboard configuration worked with XFree86 4.2; why is
+it messed up now? (Closes: #259740)
+1823, 1832, 1835, 1836, 1838, 1839
+
+Add FAQ entry: How does the keyboard work in the X Window System?
+1840
+
+Make minor expansions and corrections to the FAQ.
+1841
+
+Update Japanese debconf template translations (thanks, Kenshi Muto).
+1843
+
+Re-run debian/rules's updatepo target, fixing some line wrapping and other
+cosmetic issues in recent translation updates.
+1844
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: people/fabbione/nv-driver-backport/debian/TODO
===
--- people/fabbione/nv-driver-backport/debian/TODO 2004-09-22 08:50:51 UTC
(rev 1849)
+++ people/fabbione/nv-driver-backport/debian/TODO 2004-09-22 08:52:22 UTC
(rev 1850)
@@ -17,6 +17,8 @@
4.3.0.dfsg.1-8
--
+* Fix Xpm library stack and integer overflow vulnerabilities. (#272493; woody
+ security update already in progress)
* Fix for the nv driver breakage, consider backporting the driver from
x.org.
See: #269025, #268759, #271235, #270228, #271071
@@ -53,11 +55,6 @@
+ Use /proc/hardware on m68k architecture to set a reasonable default mouse
port. See
Re: new nv driver that should fix Xv extensions: please test!
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Fabio Massimo Di Nitto wrote: | Hi everybody, | thanks a lot for all the tests you have been done so far. | | I uploaded again a new nv driver that should fix the Xv extension here: | | http://people.no-name-yet.com/~fabbione/nv/i386/ | | same drill as before. | | Please let me know asap how things look like. | | Here i could get Xv working on a RIVA TNT2 where Xv was not even enabled | by the driver. | | Thanks! | Fabio | Hi guys, this is my last desperate attempt to fix this Xv extensions issue. I uploaded a new xserver-xfree86 package (sorry the driver seems not to be enough) here: http://people.no-name-yet.com/~fabbione/xserver-xfree86_4.3.0.dfsg.1-7+SVN_i386.deb Please download it and install it using dpkg -i xserver-xfree86_4.3.0.dfsg.1-7+SVN_i386.deb and restart X. Test in the usual way and let me know.. Thanks a lot Fabio - -- user fajita: step one fajita Whatever the problem, step one is always to look in the error log. user fajita: step two fajita When in danger or in doubt, step two is to scream and shout. -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.4 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFBUU2/hCzbekR3nhgRAm/hAJ9+5qsH7eioe14kNRyC80gOwrpSVACggRUK Eet6hfkeVtIayQNPDbusOZg= =aJ/K -END PGP SIGNATURE-
X Strike Force XFree86 SVN commit: r1851 - in trunk/debian: . patches
Author: fabbione Date: 2004-09-22 10:54:58 -0500 (Wed, 22 Sep 2004) New Revision: 1851 Added: trunk/debian/patches/087_SECURITY_libXpm_vulnerabilities.diff Modified: trunk/debian/CHANGESETS trunk/debian/changelog Log: * Security update. Resolves the following issues: + CAN-2004-0687: stack overflows in libXpm + CAN-2004-0688: integer overflows in libXpm + Add debian/patches/087_SECURITY_libXpm_vulnerabilities.diff Modified: trunk/debian/CHANGESETS === --- trunk/debian/CHANGESETS 2004-09-22 08:52:22 UTC (rev 1850) +++ trunk/debian/CHANGESETS 2004-09-22 15:54:58 UTC (rev 1851) @@ -66,4 +66,9 @@ cosmetic issues in recent translation updates. 1844 +Security update. Resolves the following issues: +CAN-2004-0687: stack overflows in libXpm +CAN-2004-0688: integer overflows in libXpm +1851 + vim:set ai et sts=4 sw=4 tw=80: Modified: trunk/debian/changelog === --- trunk/debian/changelog 2004-09-22 08:52:22 UTC (rev 1850) +++ trunk/debian/changelog 2004-09-22 15:54:58 UTC (rev 1851) @@ -46,6 +46,11 @@ * Create debian/tmp/usr/X11R6/lib/X11/doc when NOT_BUILDING_XFREE86_X_SERVER is defined. Fixes FTBFS on s390. + * Security update. Resolves the following issues: ++ CAN-2004-0687: stack overflows in libXpm ++ CAN-2004-0688: integer overflows in libXpm ++ Add debian/patches/087_SECURITY_libXpm_vulnerabilities.diff + Changes by ISHIKAWA Mutsumi: * Update Japanese debconf template translations (thanks, Kenshi Muto). Added: trunk/debian/patches/087_SECURITY_libXpm_vulnerabilities.diff === --- trunk/debian/patches/087_SECURITY_libXpm_vulnerabilities.diff 2004-09-22 08:52:22 UTC (rev 1850) +++ trunk/debian/patches/087_SECURITY_libXpm_vulnerabilities.diff 2004-09-22 15:54:58 UTC (rev 1851) @@ -0,0 +1,523 @@ +$Id$ + +Fix several security flaws in the Xpm library. Resolves CAN-2004-0687 (libXpm +stack overflows) and CAN-2004-0688 (libXpm integer overflows). + +The following text is by Chris Evans. + +libXpm multiple image parsing flaws +=== + +Programs affected: libXpm, and any programs which use libXpm to decode XPM +files. For example, the GIMP seems to use libXpm. + +Severity: Compromise of account used to browse malicious XPM file. + +This advisory lists code flaws discovered by inspection of the libXpm code. +The specific version of libXpm discussed is the release that comes with the +initial X.ORG X11 system source code release. However, these flaws seem to +exist in older versions. + +Flaw 1. Stack-based overflow in xpmParseColors (parse.c). + +Careless use of strcat() in both the XPMv1 and XPMv2/3 parsing code leads +to a stack based overflow that should be exploitable. There are minor +complications due to stack layout; the buffer being overflowed in fact +typically overflows into another buffer that is used to populate the +overflowed buffer. This should not prevent exploitation, however. + +Flaw 2. Integer overflow allocating colorTable in xpmParseColors (parse.c) +-- probably a crashable but not exploitable offence. Here: + +colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); + +ncolors would seem to come from the (untrusted) XPM file. + +In fact, multiple integer overflow problems seem to exist. Some may well +be exploitable. Note that the following may not be an exhaustive list: + +a) XpmCreateImageFromXpmImage: multiple possible overflow, e.g.: +image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image-ncolors); + (ncolors is user-supplied) + +b) CreateXImage: +*image_return = XCreateImage(display, visual, depth, format, 0, 0, + width, height, bitmap_pad, 0); + (width and height are user-supplied, possibly other variables too) + +c) ParsePixels: +iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height); + (width and height are user-supplied) + +d) ParseAndPutPixels and ParsePixels: +cidx[char1][(unsigned char)colorTable[a].string[1]] = a + 1; +(possibly, char1 might be negative, and access the cidx array out of bounds) + +Flaw 3. Stack overflow reading pixel values in ParseAndPutPixels +(create.c) as well as ParsePixels (parse.c). Should be exploitable. + +A user-supplied number of bytes are stuffed into a fixed-size buffer (typically +8192 bytes). The user gets to choose how many bytes to put into this +buffer via the number of bytes per pixel XPM value. + +This patch by Matthieu Herrb. + +diff -urN xc.orig/extras/Xpm/lib/Attrib.c xc/extras/Xpm/lib/Attrib.c +--- xc.orig/extras/Xpm/lib/Attrib.c1999-01-12 00:23:09.0 +1100 xc/extras/Xpm/lib/Attrib.c
X Strike Force XFree86 SVN commit: r1852 - branches/debconf-overhaul/debian
Author: branden Date: 2004-09-22 13:26:46 -0500 (Wed, 22 Sep 2004) New Revision: 1852 Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in Log: Stop grepping standard input in favor of /proc/cpuinfo. *sigh* Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in === --- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 15:54:58 UTC (rev 1851) +++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 18:26:46 UTC (rev 1852) @@ -1177,9 +1177,9 @@ case $subarch in PowerMac*) # Old World Macs use ADB mice, and New World Macs use USB mice. -if grep -q 'pmac-generation.*OldWorld'; then +if grep -q 'pmac-generation.*OldWorld' /proc/cpuinfo; then default_port=/dev/adbmouse -elif grep -q 'pmac-generation.*NewWorld'; then +elif grep -q 'pmac-generation.*NewWorld' /proc/cpuinfo; then default_port=/dev/input/mice else trace $func(): cannot autodetect whether Power Macintosh is \
Bug#271235: Not better even with XServer binary
Mplayer still does not work with XV extensions... Thanks anyway for your support... -- eric
X Strike Force XFree86 SVN commit: r1853 - branches/debconf-overhaul/debian
Author: branden
Date: 2004-09-22 16:32:32 -0500 (Wed, 22 Sep 2004)
New Revision: 1853
Modified:
branches/debconf-overhaul/debian/CHANGESETS
branches/debconf-overhaul/debian/TODO
branches/debconf-overhaul/debian/xserver-xfree86.config.in
Log:
In configure_mouse(), if an ADB, Amiga, or Atari mouse port is selected,
restrict the available protocol choices to BusMouse and make that the
default protocol.
Modified: branches/debconf-overhaul/debian/CHANGESETS
===
--- branches/debconf-overhaul/debian/CHANGESETS 2004-09-22 18:26:46 UTC (rev
1852)
+++ branches/debconf-overhaul/debian/CHANGESETS 2004-09-22 21:32:32 UTC (rev
1853)
@@ -94,6 +94,11 @@
Class when the -n option is used. Ah, the joys of using
human-readable standard output as an interface. Thanks to Bill
Allombert for pointing out the new -X option.
++ Update configure_mouse() to support /dev/{adb,amiga,atari}mouse, and select
+ appropriate defaults on various m68k sub-architectures based on the contents
+ of /dev/hardware.
++ Update configure_mouse() to default to ADB mice on OldWorld PowerMacs, and
USB
+ mice on NewWorld PowerMacs.
+ Make extensive stylistic cleanups:
- Identify more global variables at top of script.
- Add comment headers to every function (where not already present)
Modified: branches/debconf-overhaul/debian/TODO
===
--- branches/debconf-overhaul/debian/TODO 2004-09-22 18:26:46 UTC (rev
1852)
+++ branches/debconf-overhaul/debian/TODO 2004-09-22 21:32:32 UTC (rev
1853)
@@ -29,7 +29,5 @@
+ #259080: xserver-xfree86: [debconf] specialized mouse defaults for Hurd
[BR]
+ #261777: Problems handling multiple detected video cards; see what can be
done about this [BR]
- + Use /proc/hardware on m68k architecture to set a reasonable default mouse
-port. See URL: http://lists.debian.org/debian-68k/2004/08/msg00392.html.
# vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in
===
--- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22
18:26:46 UTC (rev 1852)
+++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22
21:32:32 UTC (rev 1853)
@@ -1291,7 +1291,7 @@
mouse_protocol_choices=ImPS/2
default_protocol=ImPS/2
;;
-*atibm|*atixl|*sunmouse)
+*adbmouse|*amigamouse|*atarimouse|*atibm|*atixl|*sunmouse)
mouse_protocol_choices=BusMouse
default_protocol=BusMouse
;;
X Strike Force XFree86 SVN commit: r1854 - branches/debconf-overhaul/debian
Author: branden
Date: 2004-09-22 16:36:13 -0500 (Wed, 22 Sep 2004)
New Revision: 1854
Modified:
branches/debconf-overhaul/debian/CHANGESETS
branches/debconf-overhaul/debian/TODO
branches/debconf-overhaul/debian/xserver-xfree86.config.in
Log:
Update configure_mouse() to include defaults appropriate to the Hurd (thanks,
Michael Banck). (Closes: #259080)
Modified: branches/debconf-overhaul/debian/CHANGESETS
===
--- branches/debconf-overhaul/debian/CHANGESETS 2004-09-22 21:32:32 UTC (rev
1853)
+++ branches/debconf-overhaul/debian/CHANGESETS 2004-09-22 21:36:13 UTC (rev
1854)
@@ -99,6 +99,8 @@
of /dev/hardware.
+ Update configure_mouse() to default to ADB mice on OldWorld PowerMacs, and
USB
mice on NewWorld PowerMacs.
++ Update configure_mouse() to include defaults appropriate to the Hurd (thanks,
+ Michael Banck). (Closes: #259080)
+ Make extensive stylistic cleanups:
- Identify more global variables at top of script.
- Add comment headers to every function (where not already present)
Modified: branches/debconf-overhaul/debian/TODO
===
--- branches/debconf-overhaul/debian/TODO 2004-09-22 21:32:32 UTC (rev
1853)
+++ branches/debconf-overhaul/debian/TODO 2004-09-22 21:36:13 UTC (rev
1854)
@@ -26,7 +26,6 @@
+ #229850: xserver-xfree86: [debconf] monitor selection methods need to be
more careful about clobbering autodetected monitor sync ranges; study Jay
Berkenbilt's feedback [BR]
- + #259080: xserver-xfree86: [debconf] specialized mouse defaults for Hurd
[BR]
+ #261777: Problems handling multiple detected video cards; see what can be
done about this [BR]
Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in
===
--- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22
21:32:32 UTC (rev 1853)
+++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22
21:36:13 UTC (rev 1854)
@@ -1128,6 +1128,9 @@
trace $func(): no good defaults known for PA-RISC mouse configuration
;;
hurd-i386)
+ # Override the available choices on the Hurd.
+ mouse_port_choices=/dev/mouse, /dev/gpmdata
+ default_port=/dev/mouse
;;
i386)
# Assume Linux x86 machines use USB mice.
@@ -1299,6 +1302,10 @@
mouse_protocol_choices=IntelliMouse
default_protocol=IntelliMouse
;;
+*/mouse)
+ mouse_protocol_choices=OSMouse
+ default_protocol=OSMouse
+ ;;
esac
db_subst xserver-xfree86/config/inputdevice/mouse/protocol choices \
$mouse_protocol_choices
@@ -1313,6 +1320,13 @@
${autodetected_protocol:-$default_protocol}
fi
+ # The Hurd's mouse device doesn't support button emulation or a Z axis, per
+ # Michael Banck (see Debian Bug #259080).
+ if [ $ARCH = hurd-i386 ]; then
+db_set xserver-xfree86/config/inputdevice/mouse/emulate3buttons false
+db_set xserver-xfree86/config/inputdevice/mouse/zaxismapping false
+ fi
+
set_db_priority low
run db_input $PRIORITY \
xserver-xfree86/config/inputdevice/mouse/emulate3buttons
Processed: Re: Bug#269929: xlibs: please provide Hungarian layouts in new format
Processing commands for [EMAIL PROTECTED]: retitle 269929 xlibs: please provide Hungarian layouts in new format Bug#269929: gnome-applets: gnome keyboard indicator can't switch to any hungarian layout Changed Bug title. thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
X Strike Force XFree86 SVN commit: r1855 - in branches/debconf-overhaul/debian: . local
Author: branden Date: 2004-09-22 17:28:23 -0500 (Wed, 22 Sep 2004) New Revision: 1855 Modified: branches/debconf-overhaul/debian/local/dexconf branches/debconf-overhaul/debian/xserver-xfree86.config.in Log: Update comments regarding /dev/input/mice multiplexing and Linux 2.6; thanks to Jeff Bailey and others for their comments and counsel. Modified: branches/debconf-overhaul/debian/local/dexconf === --- branches/debconf-overhaul/debian/local/dexconf 2004-09-22 21:36:13 UTC (rev 1854) +++ branches/debconf-overhaul/debian/local/dexconf 2004-09-22 22:28:23 UTC (rev 1855) @@ -294,14 +294,27 @@ fi printf EndSection\n 4 -# Only write this stanza -- designed for USB pointers -- if the Configured -# Mouse isn't USB. This isn't a problem even on systems without -# CONFIG_INPUT_MOUSEDEV, because this is not the core pointer, and failure to -# open it is not harmful. +# Set up an additional mouse device which points at the Linux kernel's +# multiplexed input subsystem node. # -# Also don't write this stanza if the Configured Mouse is the GPM repeater. -# We have no way of knowing what device GPM is repeating for, and it might be -# a USB mouse. +# We only write this stanza if the Configured Mouse is *not*: +# Linux 2.4: USB +# Linux 2.6: USB, PS/2, serial +# +# Configuring a mouse device on /dev/input/mice isn't a problem even on systems +# without CONFIG_INPUT_MOUSEDEV (i.e., without that device node), because this +# is not the core pointer, and failure to open it is not harmful. +# +# We also don't write this stanza if the Configured Mouse is the GPM repeater. +# We have no way of knowing what device GPM is repeating for, and it might be a +# device multiplexed into /dev/input/mice. +# +# Finally, we don't write this stanza if this is not Linux. +# +# TODO: Change this if statement to reflect the 2.4 vs. 2.6 logic above; sadly, +# we probably also need an init script to rewrite XF86Config-4 on system boot +# for people who switch back and forth between these kernels, or some people +# will get doubled mouse events. Sigh. if [ $MOUSE_PORT != /dev/input/mice ] \ [ $MOUSE_PORT != /dev/gpmdata ]; then cat 4 SECTION Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in === --- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 21:36:13 UTC (rev 1854) +++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 22:28:23 UTC (rev 1855) @@ -1266,14 +1266,6 @@ trace $func(): not prompting for mouse autodetection; reconfiguring fi - # XXX: commented out until BR knows for sure that this is correct - # If using Linux kernel 2.6, force /dev/input/mice to be the default. - # if dpkg --compare-versions $(uname -r) gt 2.6; then - # trace $func(): Linux 2.6 or later detected; forcing default mouse port \ - # to /dev/input/mice - # default_port=/dev/input/mice - # fi - db_subst xserver-xfree86/config/inputdevice/mouse/port choices \ $mouse_port_choices auto_answer db_input $PRIORITY \
X Strike Force XFree86 SVN commit: r1857 - branches/debconf-overhaul/debian
Author: branden Date: 2004-09-22 17:55:44 -0500 (Wed, 22 Sep 2004) New Revision: 1857 Modified: branches/debconf-overhaul/debian/TODO Log: Remove research item that has now been researched (see r1855). Modified: branches/debconf-overhaul/debian/TODO === --- branches/debconf-overhaul/debian/TODO 2004-09-22 22:53:14 UTC (rev 1856) +++ branches/debconf-overhaul/debian/TODO 2004-09-22 22:55:44 UTC (rev 1857) @@ -18,8 +18,6 @@ --- * Rewrite xserver-xfree86 debconfage. Joey Hess, Eduard Bloch, and David Nusinow have provided good input. - + udev users will have /dev/input/mousen -- configure that as only mouse -device? (see #237574) + #207481: xserver-xfree86: proposed debconf overhaul [BR] + #226180: xserver-xfree86: [debconfage rewrite] not amenable to configuration with readline frontend; lack of defaults
Processed: retitle 264792 to xserver-xfree86: [debconf] information from read-edid not really used for configuration
Processing commands for [EMAIL PROTECTED]: # Automatically generated email from bts, devscripts version 2.8.4 retitle 264792 xserver-xfree86: [debconf] information from read-edid not really used for configuration Bug#264792: read-edid not really used for X config Changed Bug title. End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
X Strike Force XFree86 SVN commit: r1859 - branches/debconf-overhaul/debian
Author: branden Date: 2004-09-22 18:48:09 -0500 (Wed, 22 Sep 2004) New Revision: 1859 Modified: branches/debconf-overhaul/debian/TODO Log: Remove item that has been marked as wontfix due to lack of feedback from bug submitter (after over 1 month). Modified: branches/debconf-overhaul/debian/TODO === --- branches/debconf-overhaul/debian/TODO 2004-09-22 23:18:04 UTC (rev 1858) +++ branches/debconf-overhaul/debian/TODO 2004-09-22 23:48:09 UTC (rev 1859) @@ -21,7 +21,5 @@ + #207481: xserver-xfree86: proposed debconf overhaul [BR] + #226180: xserver-xfree86: [debconfage rewrite] not amenable to configuration with readline frontend; lack of defaults - + #261777: Problems handling multiple detected video cards; see what can be -done about this [BR] # vim:set ai et sts=4 sw=4 tw=80:
Bug#269929: xlibs: please provide Hungarian layouts in new format
retitle 269929 xlibs: please provide Hungarian layouts in new format
thanks
Package: xlibs
Version: 4.3.0.dfsg.1-7
Followup-For: Bug #269929
Dear bug submitter,
can you please save this file into /etc/X11/xkb/symbols/pc/hu and make
intensive testing? It should load fine, but let me know if some
behavior seems broken, for instance when choosing variants.
Thanks.
Denis
// Hungarian keyboard symbols for XKB and PC keyboard
//
// (C) 2002 Peter Soos [EMAIL PROTECTED]
//
// Permission is granted to anyone to use, distribute and modify
// this file in any way, provided that the above copyright notice
// is left intact and the author of the modification summarizes
// the changes in this header.
//
// This file is distributed without any expressed or implied warranty.
//
// It describes the differences between a very simple US/ASCII keyboard
// layout and some widely used Hungarian keyboard layouts.
// Tested on Linux with XFree86 3.3.6
//
// $XFree86: xc/programs/xkbcomp/symbols/hu,v 1.7 2002/12/13 04:18:03 dawes Exp
$
// Converted by Denis Barbier [EMAIL PROTECTED] into the new
// multi-layout format.
// Default layout
default partial
xkb_symbols default {
include pc/hu(uni_102_qwertz_comma)
include level3(ralt_switch_multikey)
};
// Standard layout
partial
xkb_symbols standard {
include pc/hu(uni_102_qwertz_comma)
include level3(ralt_switch_multikey)
};
// Main layouts
// l2_101_qwertz_comma:
// ISO-8859-2 (Latin 2) based 101 key qwertz layout with decimal comma on keypad
// You have to set your locale settings to ISO-8859-1 based settings
// or unset them.
partial
xkb_symbols l2_101_qwertz_comma {
name[Group1] = Hungarian;
include pc/hu(def_l2)
include pc/hu(def_101)
include pc/hu(def_qwertz)
include pc/hu(def_comma)
include pc/hu(def_common)
include level3(ralt_switch_multikey)
};
// l2_101_qwertz_dot:
// ISO-8859-2 (Latin 2) based 101 key qwertz layout with decimal dot on keypad
// You have to set your locale settings to ISO-8859-1 based settings
// or unset them.
partial
xkb_symbols l2_101_qwertz_dot {
name[Group1] = Hungarian;
include pc/hu(def_l2)
include pc/hu(def_101)
include pc/hu(def_qwertz)
include pc/hu(def_dot)
include pc/hu(def_common)
include level3(ralt_switch_multikey)
};
// l2_101_qwerty_comma:
// ISO-8859-2 (Latin 2) based 101 key qwerty layout with decimal comma on keypad
// You have to set your locale settings to ISO-8859-1 based settings
// or unset them.
partial
xkb_symbols l2_101_qwerty_comma {
name[Group1] = Hungarian;
include pc/hu(def_l2)
include pc/hu(def_101)
include pc/hu(def_qwerty)
include pc/hu(def_comma)
include pc/hu(def_common)
include level3(ralt_switch_multikey)
};
// l2_101_qwerty_dot:
// ISO-8859-2 (Latin 2) based 101 key qwerty layout with decimal dot on keypad
// You have to set your locale settings to ISO-8859-1 based settings
// or unset them.
partial
xkb_symbols l2_101_qwerty_dot {
name[Group1] = Hungarian;
include pc/hu(def_l2)
include pc/hu(def_101)
include pc/hu(def_qwerty)
include pc/hu(def_dot)
include pc/hu(def_common)
include level3(ralt_switch_multikey)
};
// l2_102_qwertz_comma:
// ISO-8859-2 (Latin 2) based 102 key qwertz layout with decimal comma on keypad
// You have to set your locale settings to ISO-8859-1 based settings
// or unset them.
partial
xkb_symbols l2_102_qwertz_comma {
name[Group1] = Hungarian;
include pc/hu(def_l2)
include pc/hu(def_102)
include pc/hu(def_qwertz)
include pc/hu(def_comma)
include pc/hu(def_common)
include level3(ralt_switch_multikey)
};
// l2_102_qwertz_dot:
// ISO-8859-2 (Latin 2) based 102 key qwertz layout with decimal dot on keypad
// You have to set your locale settings to ISO-8859-1 based settings
// or unset them.
partial
xkb_symbols l2_102_qwertz_dot {
name[Group1] = Hungarian;
include pc/hu(def_l2)
include pc/hu(def_102)
include pc/hu(def_qwertz)
include pc/hu(def_dot)
include pc/hu(def_common)
include level3(ralt_switch_multikey)
};
// l2_102_qwerty_comma:
// ISO-8859-2 (Latin 2) based 102 key qwerty layout with decimal comma on keypad
// You have to set your locale settings to ISO-8859-1 based settings
// or unset them.
partial
xkb_symbols l2_102_qwerty_comma {
name[Group1] = Hungarian;
include pc/hu(def_l2)
include pc/hu(def_102)
include pc/hu(def_qwerty)
include pc/hu(def_comma)
include pc/hu(def_common)
include level3(ralt_switch_multikey)
};
// l2_102_qwerty_dot:
// ISO-8859-2 (Latin 2) based 102 key qwerty layout with decimal dot on keypad
// You have to set your locale settings to ISO-8859-1 based settings
// or unset them.
partial
xkb_symbols l2_102_qwerty_dot {
name[Group1] = Hungarian;
include pc/hu(def_l2)
include pc/hu(def_102)
include pc/hu(def_qwerty)
include pc/hu(def_dot)
include pc/hu(def_common)
include level3(ralt_switch_multikey)
};
//
Bug#271235: new nv driver that should fix Xv extensions: please test!
Fabio, Thanks for the updated deb. Unfortunately I still get the dreaded grey window in mplayer (xine still works). The nv_drv.o from 1-6 works when I copied it on top of your current 1-7+SVN, if that helps at all. Thanks very much, Dave Fabio Massimo Di Nitto wrote: snip http://people.no-name-yet.com/~fabbione/xserver-xfree86_4.3.0.dfsg.1-7+SVN_i386.deb Please download it and install it using dpkg -i xserver-xfree86_4.3.0.dfsg.1-7+SVN_i386.deb and restart X. Test in the usual way and let me know.. Thanks a lot Fabio
Processed: Re: Bug#261777: xserver-xfree86: [debconf] when multiple video cards detected, choose one as the default instead of using the architecture-specific default
Processing commands for [EMAIL PROTECTED]: tag 261777 + wontfix Bug#261777: xserver-xfree86: [debconf] when multiple video cards detected, choose one as the default instead of using the architecture-specific default Tags were: moreinfo Tags added: wontfix thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Bug#261777: xserver-xfree86: [debconf] when multiple video cards detected, choose one as the default instead of using the architecture-specific default
tag 261777 + wontfix thanks I asked the submitter for feedback on 13 August; I never received any. I'm not willing to move forward on this without a reasonable design proposal, or information on how I can ask the kernel which video card it's using to drive the virtual consoles. -- G. Branden Robinson| The greatest productive force is Debian GNU/Linux | human selfishness. [EMAIL PROTECTED] | -- Robert Heinlein http://people.debian.org/~branden/ | signature.asc Description: Digital signature
Re: mouse for x
On Wed, 22 Sep 2004, Branden Robinson wrote:
On Sun, Aug 22, 2004 at 02:46:31PM +0200, Christian T. Steigies wrote:
On Sun, Aug 22, 2004 at 02:26:46PM +0200, Wouter Verhelst wrote:
Better use /proc/hardware
[EMAIL PROTECTED]:~$ cat /proc/hardware
Model: Motorola MVME167
[...]
[EMAIL PROTECTED]:~$ cat /proc/hardware
Model: Macintosh Quadra 840AV
[...]
cat /proc/hardware
Model: Amiga A2000
[...]
We have Q40 kernels since 2.4.26 IIRC,
Oh, we do?
they should run on Q40 and Q60. Roman Zippel should be able to say how
/proc/hardware looks like for those machines.
Reading the kernel source, I think that'll always be Q40, even on Q60.
That's what I'm using for debian-installer archdetect.
Okay. Please comment on the following.
m68k)
# A good default for m68k depends on which sub-architecure this is.
if [ -r /proc/hardware ]; then
subarch=$(grep -w Model: | sed 's/Model:[[:space:]]+//')
case $subarch in
Amiga*)
mouse_port_choices=/dev/amigamouse, /dev/gpmdata
default_port=/dev/amigamouse
;;
Atari*)
mouse_port_choices=/dev/atarimouse, /dev/gpmdata
default_port=/dev/atarimouse
;;
Macintosh*)
mouse_port_choices=/dev/adbmouse, /dev/gpmdata
default_port=/dev/adbmouse
;;
Motorola*) # BVME/MVME
trace $func(): no good defaults known for VME mouse
configuration
;;
Q40*) # Q40/Q60
trace $func(): no good defaults known for Q40/Q60 mouse
configuration
;;
esac
I'd appreciate knowing:
1) If the available and default choices for Amiga, Atari, and Mac are sane;
I think they are.
Except that Mac uses the new input layer in 2.4 and later.
This is also valid for other subarchs in 2.6.
2) If anyone has anything to regarding VME or Q40/Q60 machines.
Q40/Q60 has PS/2 keyboard, so I guess it has a PS/2 mouse as well. Richard?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [EMAIL PROTECTED]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say programmer or something like that.
-- Linus Torvalds
Tori Amos email auto-response - please read...
Tori Amos email auto-response - please read... Thank you for writing [EMAIL PROTECTED] This is an Auto-Response to your message. Please go to http://www2.fanscape.com/toriamos/autoresponsefaq.html to find out important information that may save you time. DO NOT RE-WRITE YOUR MESSAGE TO US, WE HAVE RECEIVED IT AND WILL HANDLE IT ACCORDINGLY. Sara Tori Amos Online Street Team Leader
Bug#256052: more info
So I spoke with Marc Aurele La France about this, and he pointed me to the fix made in XFree86 xc/programs/Xserver/hw/xfree86/common/xf86xv.c between version 1.37 and 1.38. It's a small fix. The current version of this file in the DSFG X is 1.35, but this file is specifically licensed under the XFree86 1.0 license, and is included in the Xorg X server. So it should be able to be backported here. Here's the URL to see the diff: http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/common/xf86xv.c.diff?r1=1.37r2=1.38 I think that the Backport s3 driver from sanitized XFree86 item in the TODO list would fix this bug as well, because the problem is in xf86XVCopyYUV12ToPacked(). I was told that this bug would affect any driver that used these generic xv routines on a big-endian system. Also, the reason a second video app looks OK is that only one app can have use XV at a time. The second app fails to open XV, and falls back to XSHM. __ Do you Yahoo!? Yahoo! Mail is new and improved - Check it out! http://promotions.yahoo.com/new_mail
Bug#237877: use DisplaySize to set dpi
On Mon, Sep 20, 2004 at 02:35:04PM -0500, Branden Robinson wrote: On Wed, Sep 01, 2004 at 04:39:17PM -0400, Andrew Pimlott wrote: On Wed, Sep 01, 2004 at 04:57:37AM -0500, Branden Robinson wrote: [Are you subscribed to this list?] Do you mean to this bug? No, I haven't learned how to do that yet. No, I mean to the debian-x mailing list no The patch by Gus (if you reverse the second half) looks like an expedient solution, unless you think it will confuse people. That just changes one hard-coded default for another. I think -softdpi would be superior to both. Choosing a specific dpi with no knowledge of the display is (finally) becoming an anachronism, so I don't see the harm in using a hard-coded hack for this purpose. IOW, I think it should be viewed as a last-ditch, can't possibly be right but better than nothing, fallback; and for that, hard-coding is fine. If anyone needs to override it, there is a much better mechanism: the DisplaySize parameter. Besides, I think we're close to being able to do a better job with debconf. I notice you already ask for screen size in some cases, and I'm guessing EDID gives it to you when it works. It seems that all you need to do is have dexconf set DisplaySize, and you can drop -dpi. What is the obstacle to that? (Well, for the sake of upgraders, you might want to change the hard-coded default in the X server, so they still have a fall-back.) Regardless, I'm sure the tide of progress will force you to remove -dpi soon enough. :-) Andrew
X Strike Force XFree86 SVN commit: r1856 - branches/debconf-overhaul/debian
Author: branden Date: 2004-09-22 17:53:14 -0500 (Wed, 22 Sep 2004) New Revision: 1856 Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in Log: In configure_mouse(), standardize the message used when the subarchitecture is not recognized. Spell subarchitecture consistently (without a hyphen). Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in === --- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 22:28:23 UTC (rev 1855) +++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 22:53:14 UTC (rev 1856) @@ -1143,7 +1143,7 @@ default_port=/dev/input/mice ;; m68k) - # A good default for m68k depends on which sub-architecure this is. + # A good default for m68k depends on which subarchitecure this is. if [ -r /proc/hardware ]; then subarch=$(grep -w Model: | sed 's/Model:[[:space:]]+//') case $subarch in @@ -1164,9 +1164,12 @@ trace $func(): no good defaults known for Q40/Q60 mouse configuration ;; + *) +trace $func(): unrecognized m68k subarchitecture \$subarch\ +;; esac else -trace $func(): cannot autodetect m68k sub-architecture; \ +trace $func(): cannot autodetect m68k subarchitecture; \ /proc/hardware does not exist or is not readable fi ;; @@ -1174,7 +1177,7 @@ trace $func(): no good defaults known for MIPS mouse configuration ;; powerpc) - # A good default for PowerPC depends on which sub-architecure this is. + # A good default for PowerPC depends on which subarchitecure this is. if [ -r /proc/cpuinfo ]; then subarch=$(grep ^machine | sed 's/machine[[:space:]]+:[[:space:]]+//') case $subarch in @@ -1190,12 +1193,11 @@ fi ;; *) -trace $func(): no good defaults known for non-PowerMac PowerPC \ - mouse configuration +trace $func(): unrecognized powerpc subarchitecture \$subarch\ ;; esac else -trace $func(): cannot autodetect PowerPC sub-architecture; \ +trace $func(): cannot autodetect PowerPC subarchitecture; \ /proc/cpuinfo does not exist or is not readable fi ;;
Bug#264557: marked as done (xlibs-data: No composition sequences in japanese locale)
Your message dated Thu, 23 Sep 2004 07:33:45 +0900 with message-id [EMAIL PROTECTED] and subject line Bug#264557: xlibs-data: No composition sequences in japanese locale has caused the attached Bug report to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what I am talking about this indicates a serious mail system misconfiguration somewhere. Please contact me immediately.) Debian bug tracking system administrator (administrator, Debian Bugs database) -- Received: (at submit) by bugs.debian.org; 9 Aug 2004 11:40:52 + From [EMAIL PROTECTED] Mon Aug 09 04:40:52 2004 Return-path: [EMAIL PROTECTED] Received: from d151.haichifl12.vectant.ne.jp (glandium.org) [163.139.60.151] by spohr.debian.org with esmtp (Exim 3.35 1 (Debian)) id 1Bu8WK-0004Ny-00; Mon, 09 Aug 2004 04:40:52 -0700 Received: from mh by glandium.org with local (Exim 3.36 #1 (Debian)) id 1Bu8Va-0002Gy-00; Mon, 09 Aug 2004 20:40:06 +0900 Content-Type: text/plain; charset=us-ascii MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Mike Hommey [EMAIL PROTECTED] To: Debian Bug Tracking System [EMAIL PROTECTED] Subject: xlibs-data: No composition sequences in japanese locale X-Mailer: reportbug 2.64 Date: Mon, 09 Aug 2004 20:40:06 +0900 Message-Id: [EMAIL PROTECTED] Delivered-To: [EMAIL PROTECTED] X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 (1.212-2003-09-23-exp) on spohr.debian.org X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE autolearn=no version=2.60-bugs.debian.org_2004_03_25 X-Spam-Level: Package: xlibs-data Version: 4.3.0.dfsg.1-6 Severity: wishlist Hi, First, I'm not quite sure if the bug belongs to xlibs-data, so please reassign if I am wrong. All basic X applications using xlibs (tested with xedit and emacs) fail to get composition sequences when using the ja_JP.UTF-8 locale. Interestingly, I get some strange behaviours as well, which might be related to gnome configurations but I'm not quite sure. Anyway, what I tried is the following (all with a fresh new account ; gnome is the default session if i launch startx ; LANG in /etc/environment is en_US.UTF-8; gnome is configured to have Compose key on Menu (laptops don't have a right windows key)): (ok means composition sequences work properly, ko means the contrary) startx - emacs - ok startx - LANG=ja_JP.UTF-8 - ko LANG=ja_JP.UTF-8 - emacs - ko LANG=ja_JP.UTF-8 - LANG=en_US.UTF-8 emacs - ok The strange behaviour is that with my not fresh account, the one I use in every day life, the latter has a ko result. Anyway, I'd like to be able to type french accents in my japanese environement without having to play with locales ;) Note that copying /usr/X11R6/lib/X11/locale/en_US.UTF-8/Compose into /usr/X11R6/lib/X11/locale/ja_JP.UTF-8/ doesn't do the trick (the absence of the file let me think that would be a solution) Mike -- System Information: Debian Release: 3.1 APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.4.22-mh Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 -- no debconf information --- Received: (at 264557-done) by bugs.debian.org; 22 Sep 2004 22:31:12 + From [EMAIL PROTECTED] Wed Sep 22 15:31:12 2004 Return-path: [EMAIL PROTECTED] Received: from d109.haichifl11.vectant.ne.jp (localhost.localdomain) [220.247.22.109] by spohr.debian.org with esmtp (Exim 3.35 1 (Debian)) id 1CAFdo-000488-00; Wed, 22 Sep 2004 15:31:12 -0700 Received: from mh by localhost.localdomain with local (Exim 4.34) id 1CAFgH-0002B2-1n; Thu, 23 Sep 2004 07:33:45 +0900 Date: Thu, 23 Sep 2004 07:33:45 +0900 From: Mike Hommey [EMAIL PROTECTED] To: Branden Robinson [EMAIL PROTECTED], [EMAIL PROTECTED] Subject: Re: Bug#264557: xlibs-data: No composition sequences in japanese locale Message-ID: [EMAIL PROTECTED] References: [EMAIL PROTECTED] [EMAIL PROTECTED] Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: [EMAIL PROTECTED] User-Agent: Mutt/1.5.6+20040818i Delivered-To: [EMAIL PROTECTED] X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 (1.212-2003-09-23-exp) on spohr.debian.org X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER autolearn=no version=2.60-bugs.debian.org_2004_03_25 X-Spam-Level: On Mon, Sep 20, 2004 at 02:41:37PM -0500, Branden Robinson wrote: tag 264557 + moreinfo upstream thanks Did the following change in 4.3.0.dfsg.1-7 resolve your problem? xfree86 (4.3.0.dfsg.1-7) unstable; urgency=high [...] * Grab from XFree86 CVS (no later than 2003-12-18) fixes to the ja_JP.UTF-8,
