X Strike Force X.Org X11 SVN commit: r3941 - trunk/debian/xorg/debian

2006-11-03 Thread X Strike Force SVN Repository Admin
Author: julien
Date: 2006-11-04 00:31:47 -0500 (Sat, 04 Nov 2006)
New Revision: 3941

Modified:
   trunk/debian/xorg/debian/changelog
   trunk/debian/xorg/debian/control
Log:
* Bump x11-common's conflict on xlbiff to "<< 4.1-4". Thanks to Bill
  Allombert and Steve Langasek (closes: #396279).

Modified: trunk/debian/xorg/debian/changelog
===
--- trunk/debian/xorg/debian/changelog  2006-11-03 19:05:29 UTC (rev 3940)
+++ trunk/debian/xorg/debian/changelog  2006-11-04 05:31:47 UTC (rev 3941)
@@ -19,8 +19,10 @@
   * Delete stampdir in debian/rules clean.
   * Don't load the obsolete Type 1 font backend in the server, as suggested by
 Juliusz Chroboczek (closes: #364965).
+  * Bump x11-common's conflict on xlbiff to "<< 4.1-4". Thanks to Bill
+Allombert and Steve Langasek (closes: #396279).
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Tue, 24 Oct 2006 04:20:15 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]>  Sat,  4 Nov 2006 06:30:41 +0100
 
 xorg (1:7.1.0-5) unstable; urgency=low
 

Modified: trunk/debian/xorg/debian/control
===
--- trunk/debian/xorg/debian/control2006-11-03 19:05:29 UTC (rev 3940)
+++ trunk/debian/xorg/debian/control2006-11-04 05:31:47 UTC (rev 3941)
@@ -10,7 +10,7 @@
 Architecture: any
 Depends: ${misc:Depends}, debianutils (>= 1.13), lsb-base (>= 1.3-9ubuntu2)
 Pre-Depends: debconf | debconf-2.0
-Conflicts: xfree86-common, xorg-common, xserver-common, x-common, xserver-xorg 
(<< 1:7.0.12), xserver-xfree86 (<< 1:7.0), libxft-dev (<= 2.1.8.2-5),  aee (<= 
2.2.15b-1), ascd (<= 0.13.2-3), bibview (<= 2.2-8), fvwm1 (<= 1.24r-46), grace 
(<= 1:5.1.18-1), groff (<= 1.18.1.1-7), hfsutils-tcltk (<= 3.2.6-7), login.app 
(<= 1.2.1-18), oneko (<= 1.2.sakura.6-1), procmeter (<= 2.5.1-11), propsel (<= 
971130-5.3), regexplorer (<= 0.1.6-12), tkseti (<= 3.06-1), wdm (<= 1.28-1), 
wily (<= 0.13.41-6), wmnetselect (<= 0.85-5.5), wmsensors (<= 1.0.4-3.4), wmtv 
(<= 0.6.5-15), xbanner (<= 1.31-23), xcolors (<= 1.5a-2), xcolorsel (<= 
1.1a-11), xezmlm (<= 1.0.3-11), xfs-xtt (<= 1:1.4.1.xf430-6), xgdipc (<= 
1.2-0.3), xgmod (<= 3.1-9), xgraph (<= 12.1-3), xlogmaster (<= 1.6.0-8), 
xmailbox (<= 2.5-9), xmem (<= 1.20-19), xnecview (<= 1.34-2), xodo (<= 
1.2-9.2), xturqstat (<= 2.2.2sarge1), xwit (<= 3.4-6), lbxproxy (<< 7.0), 
proxymngr (<< 7.0), twm (<< 7.0), xbase-clients (<< 1:7.0), xdm (<= 1:1.0.1-6), 
xfs (<< 1:1.0), xfwp (<< 7.0), xutils (<< 1:7.0), xvfb (<< 1:1.0), qcam (<= 
0.91-11.1), twlog (<= 1.3-4), xdmx (<< 1:1.0), bugsx (<= 1.08-8), buici-clock 
(<= 0.4.5+b1), ctwm (<= 3.7-2), emelfm (<= 0.9.2-7), fte-xwindow (<= 
0.50.0-1.3), fvwm95 (<= 2.0.43ba-23+b1), gerstensaft (<= 0.2-5.1), gipsc (<= 
0.4.3-2), gradio (<= 1.0.1-6), hanterm-classic (<= 3.1.6.0-4), hanterm-xf (<= 
1:3.3.1p18-9.2), ibp (<= 0.21-4), isdnutils-xtools (<= 1:3.8.2005-12-06-4), 
ivtools-bin (<= 1.1.3-5), kdrill (<= 6.4-2.1), kinput2-canna (<= 3.1-7), 
kinput2-canna-wnn (<= 3.1-7), kinput2-wnn (<= 3.1-7), kterm (<= 6.2.0-45), 
lm-batmon (<= 0.96-3), lwm (<= 1.2.1-1), mctools-lite (<= 970129-16), mgp (<= 
1.11b-6), olvwm (<= 4.4.3.2p1.4-21), olwm (<= 3.2p1.4-21), pixmap (<= 
2.6pl4-14.1), plotmtv (<= 1.4.4t-8.1), ppxp-x11 (<= 0.2001080415-14), seyon (<= 
2.20c-20), skkinput (<= 1:2.06.4-4), tkdesk (<= 2.0-5), videogen (<= 0.32-1), 
vtwm (<= 5.4.7-2), w9wm (<= 0.4.2-4), wmavgload (<= 0.7.0-6.1), wmcpu (<= 
1.3-4.1), wmdate (<= 0.5-7.1), wmnet (<= 1.05-12), wmscope (<= 3.0-9.1), 
xautolock (<= 1:2.1-6), xbatt (<= 1.2.1-4), xbattbar (<= 1.4.2-3.1), xcal (<= 
4.1-18.2), xcalendar-i18n (<= 4.0.0.i18p1-13.1), xcb (<= 2.4-4), xclip (<= 
0.08-5), xclips (<= 6.21-6), xdkcal (<= 0.9d-2.1), xdu (<= 3.0-14), xengine (<= 
1.11-9), xfaces (<= 3.3-25), xfishtank (<= 2.2-23.1), xfm (<= 1.4.3-8), xinput 
(<= 1.2-5.2), xipmsg (<= 0.8088-1.1), xlbiff (<= 4.1-1.1), xli (<= 1.17.0-21), 
xlockmore (<= 1:5.21-1), xlockmore-gl (<= 1:5.21-1), xmeter (<= 1.15-6), xmix 
(<= 2.1-5), xmon (<= 1.5.6-1.3), xpostit (<= 3.3.1-8.2), xprint (<= 
1:0.1.0.alpha1-13), xrn (<= 9.02-7.1), xsysinfo (<= 1.7-2), xtel (<= 
3.3.0-5.2), xtoolwait (<= 1.3-6), xtrlock (<= 2.0-11), xview-clients (<= 
3.2p1.4-21), xviewg (<= 3.2p1.4-21), xviewg-dev (<= 3.2p1.4-21), xvkbd (<= 
2.6-2.1), xxkb (<= 1.10-2.1), xzoom (<= 0.3-17), pgaccess (<= 
1:0.98.8.20030520-2), xearth (<= 1.1-10.2), libmotif-dev (<= 2.2.3-1.3), 
motif-clients (<= 2.2.3-1.3), xslideshow (<= 3.1-8.1), xtrkcad (<= 3.1.4-1), 
pmud (<= 0.10-9), xnest (<< 1:1.0), xterm (<< 208-1), xmh (<= 6.8.2.dfsg.1-4), 
beaver (<= 0.2.5-2), lsb-core (<= 3.1-4), yank (<=0.2.1-7.2), xpmumon (<= 
1.3.0), ivtools-dev (<= 1.1.3-5), ppxp (<= 0.2001080415-14), guitar (<= 
0.1.4-11), xftp, xext, xpaste, ghostview, xv (<= 3.10a-26), 
xserver-xfree86-dbg, grace6 (<= 5.99.0+final-4)
+Conflicts: xfree86-common, xorg-common, xserver-common, x-common, xserver-xorg 
(<< 1:7.0.12), xserver-xfree86 (<< 1:7.0), libxft-de

Bug#396279: x11-common: sarge to etch upgrade fails if xlbiff is installed.

2006-11-03 Thread Steve Langasek
severity 395927 serious
severity 396279 important
thanks

On Wed, Nov 01, 2006 at 08:29:29PM -0800, Steve Langasek wrote:

> > The Sarge package xlbiff includes the file /usr/X11R6/bin/xlbiff

> The xlbiff package in sarge is at version 4.1-1, and x11-common in etch
> already has a conflicts: with xlbiff (<= 4.1-1.1).  Do you have any idea
> what's missing here?

Ah, apparently the answer is that a new upload of xlbiff was made that
didn't include the fixed path, and the conflicts from x11-common was
insufficient for this case.

This was reported as bug #395927 in xlbiff, and has now been fixed in
unstable in version 4.1-4; and I'm bumping the urgency of that xlbiff
package so that the fix should reach testing tomorrow.

That makes 396279 an issue of insufficiently tight conflicts which will not
affect etch proper, so it should not be RC.  Swapping bug severities
accordingly.

Thanks,
-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
[EMAIL PROTECTED]   http://www.debian.org/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Processed: Re: Bug#396279: x11-common: sarge to etch upgrade fails if xlbiff is installed.

2006-11-03 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

> severity 395927 serious
Bug#395927: xlbiff: Causes upgrade of x11-common to fail with "trying to 
overwrite `/usr/X11R6/bin', which is also in package xlbiff"
Severity set to `serious' from `normal'

> severity 396279 important
Bug#396279: x11-common: sarge to etch upgrade fails if xlbiff is installed.
Severity set to `important' from `serious'

> thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#396827: xserver-xorg: [INTL:th] Thai debconf translation

2006-11-03 Thread Christian Perrier
tags 396827 pending
thanks

Quoting Theppitak Karoonboonyanan ([EMAIL PROTECTED]):
> Package: xserver-xorg
> Version: 1:7.1.0-5
> Severity: wishlist
> 
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
> 
> 
> Please add Thai debconf translation, as attached.


Committed. Thanks, Thep




signature.asc
Description: Digital signature


Processed: Re: Bug#396827: xserver-xorg: [INTL:th] Thai debconf translation

2006-11-03 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

> tags 396827 pending
Bug#396827: xserver-xorg: [INTL:th] Thai debconf translation
There were no tags set.
Tags added: pending

> thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#396958: /usr/bin/X: several off-by-one errors in debian/local/xserver-wrapper.c

2006-11-03 Thread Jochen Voss
Package: x11-common
Version: 1:7.1.0-5
Severity: normal
File: /usr/bin/X

Hello,

recently I discovered the following bits of code in the source file
debian/local/xserver-wrapper.c (function 'main', starting at line
172):

int
main(int argc, char **argv)
{
  ...
  char line[1024];
  char var[64];
  char value[256];
  ...

val = fgets(line, 1024, cf);

while (val != NULL) {
  var[0] = '\0';
  value[0] = '\0';
  if (sscanf(line, " %64[A-Za-z0-9_] = %256[A-Za-z0-9_ -] ",
 var, value) > 0) {

This use of 'sscanf' is unsafe and leads to a buffer overflow if
either the key is >=64 characters long or the value is >=256
characters long (the trailing '\0' spills over).  From the GNU libc
manual:

   * Provide a buffer to store it in.  This is the default.  You should
 provide an argument of type `char *' or `wchar_t *' (the latter of
 the `l' modifier is present).

 *Warning:* To make a robust program, you must make sure that the
 input (plus its terminating null) cannot possibly exceed the size
 of the buffer you provide.  In general, the only way to do this is
 to specify a maximum field width one less than the buffer size. ...

Thus the offending line should read

  if (sscanf(line, " %63[A-Za-z0-9_] = %255[A-Za-z0-9_ -] ",
 var, value) > 0) {

instead.

Some lines later the following bit of code can be found:

  char xserver[1024];
  ...
  i = readlink(X_SERVER_SYMLINK, xserver, 1024);
  ...
  xserver[i] = '\0'; /* readlink() does not null-terminate the string */

Again this is an off-by-one error.  'readlink' will happily return
1024 for long link targets (assuming that the file system allows
this), and the assignment to 'xserver[i]' will overflow the buffer
'xserver' then.

Neither of these issues looks especially exploitable to me but it
might be good to fix them anyway.  (Note that this code is part of an
suid root binary.)

I hope this helps,
Jochen

-- System Information:
Debian Release: 4.0
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18.1
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)

Versions of packages x11-common depends on:
ii  debconf [debconf-2.0] 1.5.8  Debian configuration management sy
ii  debianutils   2.17.3 Miscellaneous utilities specific t
ii  lsb-base  3.1-18 Linux Standard Base 3.1 init scrip

x11-common recommends no packages.

-- debconf information excluded


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#396940: twm: FTBFS on GNU/kFreeBSD (due to manpage suffix)

2006-11-03 Thread Petr Salinger

Package: twm
Severity: important
Version: 1:1.0.1-4
Tags: patch


Hi,

the current version fails to build on GNU/kFreeBSD,
see http://experimental.ftbfs.de/build.php?&pkg=twm&arch=kfreebsd-i386

It needs regenerated aclocal.m4 and configure files
using recent xorg-macros.m4 to unify manpages suffixes.

Please re-run "aclocal-1.7; autoconf" and change suffixes as shown bellow.

Thanks in advance

Petr

diff -u twm-1.0.1/debian/twm.postinst.in twm-1.0.1/debian/twm.postinst.in
--- twm-1.0.1/debian/twm.postinst.in
+++ twm-1.0.1/debian/twm.postinst.in
@@ -29,7 +29,7 @@

 update-alternatives --install /usr/bin/x-window-manager x-window-manager \
   /usr/bin/twm 40 --slave /usr/share/man/man1/x-window-manager.1.gz \
-  x-window-manager.1.gz /usr/share/man/man1/twm.1x.gz
+  x-window-manager.1.gz /usr/share/man/man1/twm.1.gz

 exit 0

diff -u twm-1.0.1/debian/twm.install twm-1.0.1/debian/twm.install
--- twm-1.0.1/debian/twm.install
+++ twm-1.0.1/debian/twm.install
@@ -3 +3 @@
-usr/share/man/man1/twm.1x
+usr/share/man/man1/twm.1



--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Processed: forwarded

2006-11-03 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

> forwarded 358751 https://bugs.freedesktop.org/show_bug.cgi?id=5578
Bug#358751: tilt buttons are inverted with MX 1000 mouse
Noted your statement that Bug has been forwarded to 
https://bugs.freedesktop.org/show_bug.cgi?id=5578.

>
End of message, stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#381025: marked as done (Evdev tries to open PC speaker instead of mouse)

2006-11-03 Thread Debian Bug Tracking System
Your message dated Sat, 04 Nov 2006 00:20:33 +1100
with message-id <[EMAIL PROTECTED]>
and subject line Evdev tries to open PC speaker instead of mouse
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)

--- Begin Message ---
Package: xserver-xorg-input-evdev
Version: 1:1.1.2-1
Severity: important

Using evdev with the following configuration:

> Section "InputDevice"
> Identifier  "Mouse0"
> Driver  "evdev"
> Option  "Dev Name"  "Logitech USB RECEIVER" # cat 
> /proc/bus/input/devices
> EndSection

Produces the following error on my system:

> (II) evdev brain: Rescanning devices (1).
> (**) Option "CorePointer"
> (**) Mouse0-isa0061/input0: Core Pointer
> (EE) Mouse0-isa0061/input0: Don't know how to use device.

X promptly dies for lack of a mouse.

> [EMAIL PROTECTED]:~$ uname -a
> Linux agaeris 2.6.17.6 #1 PREEMPT Sun Jul 16 01:13:27 MDT 2006 i686 GNU/Linux

/proc/bus/input/devices:

> I: Bus=0010 Vendor=001f Product=0001 Version=0100
> N: Name="PC Speaker"
> P: Phys=isa0061/input0
> S: Sysfs=/class/input/input0
> H: Handlers=kbd event0
> B: EV=40001
> B: SND=6
> 
> I: Bus=0003 Vendor=046d Product=c50e Version=2510
> N: Name="Logitech USB RECEIVER"
> P: Phys=usb-:00:07.2-1.3/input0
> S: Sysfs=/class/input/input1
> H: Handlers=mouse0 event1
> B: EV=7
> B: KEY= 0 0 0 0 0 0 0 0
> B: REL=143
> 
> I: Bus=0003 Vendor=046d Product=c30a Version=1500
> N: Name="Logitech Logitech USB Keyboard"
> P: Phys=usb-:00:07.2-1.4/input0
> S: Sysfs=/class/input/input2
> H: Handlers=kbd event2
> B: EV=120003
> B: KEY=1 7 ff80 7ff febeffdf ffef  fffe
> B: LED=1f
> 
> I: Bus=0003 Vendor=046d Product=c30a Version=1500
> N: Name="Logitech Logitech USB Keyboard"
> P: Phys=usb-:00:07.2-1.4/input1
> S: Sysfs=/class/input/input3
> H: Handlers=kbd mouse1 event3
> B: EV=7
> B: KEY=  f80 4 601878 d801d108 1e 0 0 0
> B: REL=103
> 
> I: Bus=0003 Vendor=047d Product=102a Version=0100
> N: Name="Kensington  Kensington USB/PS2 Wheel Mouse"
> P: Phys=usb-:00:0d.0-2/input0
> S: Sysfs=/class/input/input4
> H: Handlers=mouse2 event4
> B: EV=7
> B: KEY=7 0 0 0 0 0 0 0 0
> B: REL=103


-- System Information:
Debian Release: testing/unstable
  APT prefers experimental
  APT policy: (1000, 'experimental'), (500, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17.6
Locale: LANG=eo.UTF-8, LC_CTYPE=eo.UTF-8 (charmap=UTF-8)

Versions of packages xserver-xorg-input-evdev depends on:
hi  libc6 2.3.6-16   GNU C Library: Shared libraries
ii  xserver-xorg-core 1:1.0.2-9  X.Org X server -- core server

xserver-xorg-input-evdev recommends no packages.

-- no debconf information

--- End Message ---
--- Begin Message ---
As per the referenced upstream bug report, you want to use Option
"Name", not "Dev Name".  Closing this bug then, following upstream's
resolution.

Drew
--- End Message ---


Bug#370710: xserver-xorg-input-evdev: fails to use mouse

2006-11-03 Thread Drew Parsons

> it seems removing
> any mention of 'corepointer' from the input and layout sections startup
> continues normally with a symlink of any name to the event device, if not, 
> the same error of the type "(EE) PreInit returned NULL for" appears.
> 
> now the mouse needs to have xmodmap run in
> order to have proper use of its keys.

Hi Michael, it might be helpful if you could post your
/etc/X11/xorg.conf, or at least the parts of it referring to evdev and
to any other pointers (mouses).

Thanks,
Drew


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#396871: libx11-data: Please recover the fontset order in XLC_LOCALE for zh_TW.UTF-8 locale

2006-11-03 Thread Tetralet
Package: libx11-data
Version: 2:1.0.3-2
Severity: normal


Please take a look at http://bugzilla.xfree86.org/show_bug.cgi?id=544
and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=296719.

Since there are a lot of free almost-full supported ISO10646 fonts in Linux,
like unifont, xfonts-efont-unicode and xfonts-wqy.
So I think that all of XLC_LOCALE for UTF-8 should be prior to use ISO-10646
earlier than ISO8859-1.
(AFAIK, at least ja_JP.UTF-8 and zh_TW.UTF-8 are broken.)
Please consider to recover it. Thanks.

This bug had been report at https://bugs.freedesktop.org/show_bug.cgi?id=8762.

-- System Information:
Debian Release: testing/unstable
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'unstable'), (500, 'testing'), (1, 
'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17-1-vserver-k7
Locale: LANG=POSIX, LC_CTYPE=zh_TW.UTF-8 (charmap=UTF-8)

Versions of packages libx11-data depends on:
ii  x11-common1:7.1.0-2  X Window System (X.Org) infrastruc

libx11-data recommends no packages.

-- no debconf information


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: X Strike Force X.Org X11 SVN commit: r3939 - git-migration/xserver/xorg-server/branches

2006-11-03 Thread Drew Parsons

> Author: beatle
> Date: 2006-11-02 22:18:29 -0500 (Thu, 02 Nov 2006)
> New Revision: 3939
> 
> Added:
>git-migration/xserver/xorg-server/branches/7.1/
> Log:
> Copy 7.1 branch of the xorg-server module.
> 
> 
> Copied: git-migration/xserver/xorg-server/branches/7.1 (from rev 3938, 
> branches/7.1/xserver/xorg-server)

Hi beatle, thanks for working with git.  Be careful with the svn
branches, they were the equivalent of experimental, and I'm not sure if
we really want branches/7.1 now, it's been deprecated?

Drew


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]