Re: Bug#238189: XKB Options Configuration not working ?
On Wed, Mar 17, 2004 at 01:02:57AM +0200, Riku Voipio wrote: [...] > > If this is still not clear, type > > $ setxkbmap -option caps:shift > > [Press CapsLock, followed by '' then Shift+'' and CapsLock again] > > > > $ setxkbmap -option caps:shift_nocancel > > [Press CapsLock, followed by '' then Shift+'' and CapsLock again] > > > > Actually, this is what I see: > > setxkbmap -option caps:shift > [Press CapsLock, followed by '' then Shift+'' and CapsLock again] > > > setxkbmap -option caps:shift_nocancel > [Press CapsLock, followed by '' then Shift+'' and CapsLock again] > > > setxkbmap -option caps:shift > [Press CapsLock, followed by '' then Shift+'' and CapsLock again] > > > So if shift_nocancel has been set ever before, it will not return with > caps:shift This was only a trivial example. If you want to understand what happens, you will have to read setxkbmap(1). Hey you see, despite kcontrol, this program has a nice manpage: -option name Specifies the name of an option to determine the components which make up the keyboard description; multiple options may be specified, one per -option flag. Note that setxkbmap summa- rize options specified in the command line with options was set before (saved in root window properties). If you want only specified options will be set use the -option flag with an empty argument first. > > BTW I was unable to find these settings with kcontrol 3.2.1-1. > > so you reassigned the bug WITHOUT EVEN TESTING IT ON THE PACKAGE YOU > REASSIGNED IT TO? sheez... Yeah, and I will continue to do so. Denis
Bug#236780: No need to Conflict with xlib6
On Tue, 2004-03-16 at 11:10, Branden Robinson wrote: > You've convinced me, and I've committed a reversion of this decision as > r1151. The change should appear in XFree86 4.3.0-6. Thank you kindly. -- Thomas Hood <[EMAIL PROTECTED]>
Bug#238407: XFree86 crashes on PPC in 0x1072260c in AccessXCancelRepeatKey (xkbi=0x0, key=64 '@') at xkbAccessX.c:387
Package: xserver-xfree86
Severity: important
Version: 4.3.0-5
Backtrace at http://rzlab.ucr.edu/debian/xfree86_core_20040316
corefile at http://rzlab.ucr.edu/debian/xfree86_core_20040316 [for ppc]
14:14:54 yeah, I"m running 2.6.3 right now...
14:15:12 H
14:15:15 dondelelcaro:
http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/dix/events.c.diff?r1=3.51&r2=3.52&f=h
14:15:56 Overfiend: heh.
14:16:25 dondelelcaro: please followup to the bug with that URL
14:16:31 say "Branden thinks it's this"
14:16:46 whew
Current directory is /usr/bin/X11/
GNU gdb 6.0
Copyright 2003 Free Software Foundation, Inc.
GDB is free software, covered by the GNU General Public License, and you are
welcome to change it and/or distribute copies of it under certain conditions.
Type "show copying" to see the conditions.
There is absolutely no warranty for GDB. Type "show warranty" for details.
This GDB was configured as "powerpc-linux"...
Core was generated by `/usr/bin/X11/XFree86-debug :0 vt9 -auth
/var/lib/gdm/:0.Xauth'.
Program terminated with signal 6, Aborted.
Reading symbols from /usr/lib/libfreetype.so.6...done.
Loaded symbols for /usr/lib/libfreetype.so.6
Reading symbols from /usr/lib/libz.so.1...done.
Loaded symbols for /usr/lib/libz.so.1
Reading symbols from /lib/libm.so.6...done.
Loaded symbols for /lib/libm.so.6
Reading symbols from /lib/libc.so.6...done.
Loaded symbols for /lib/libc.so.6
Reading symbols from /lib/ld.so.1...done.
Loaded symbols for /lib/ld.so.1
#0 0x0fd73a74 in kill () from /lib/libc.so.6
(gdb) bt full
#0 0x0fd73a74 in kill () from /lib/libc.so.6
No symbol table info available.
#1 0x0fd7383c in raise () from /lib/libc.so.6
No symbol table info available.
#2 0x0fd74f74 in abort () from /lib/libc.so.6
No symbol table info available.
#3 0x103da674 in ddxGiveUp () at xf86Init.c:1173
i = 1
#4 0x103da7b4 in AbortDDX () at xf86Init.c:1224
i = 1
#5 0x104ee1d4 in AbortServer () at utils.c:436
No locals.
#6 0x104f05e0 in FatalError (f=0x10bd9cdc "Caught signal %d. Server
aborting\n") at utils.c:1421
args = {{gpr = 2 '\002', fpr = 0 '\0', overflow_arg_area = 0x7fffeb18,
reg_save_area = 0x7fffea78}}
beenhere = 1
#7 0x103ffdac in xf86SigHandler (signo=11) at xf86Events.c:1198
No locals.
#8
No symbol table info available.
#9 0x1072260c in AccessXCancelRepeatKey (xkbi=0x0, key=64 '@') at
xkbAccessX.c:387
No locals.
#10 0x104ab000 in EnqueueEvent (xE=0x70d0, device=0x10d46f38, count=1) at
events.c:995
tail = 0x0
qe = 0x10cd
qxE = (xEvent *) 0x104fa01c
#11 0x1041d724 in xf86eqProcessInputEvents () at xf86Xinput.c:774
e = (EventRec *) 0x10ccfcb0
x = 0
y = 0
xe = {event = {u = {u = {type = 3 '\003', detail = 64 '@',
sequenceNumber = 55800}, keyButtonPointer = {pad00 = 54581752, time = 46395131,
root = 287237496, event = 287239400, child = 283199960, rootX = 4382,
rootY = -10984, eventX = 4382, eventY = -10504, state = 4382,
sameScreen = 238 '\x{00EE}', pad1 = 176 '\x{00B0}'}, enterLeave =
{pad00 = 54581752, time = 46395131, root = 287237496, event = 287239400, child
= 283199960,
rootX = 4382, rootY = -10984, eventX = 4382, eventY = -10504, state =
4382, mode = 238 '\x{00EE}', flags = 176 '\x{00B0}'}, focus = {pad00 =
54581752,
window = 46395131, mode = 17 '\021', pad1 = 30 '\036', pad2 = 229
'\x{00E5}', pad3 = 120 'x'}, expose = {pad00 = 54581752, window = 46395131, x =
4382,
y = 58744, width = 4382, height = 60648, count = 4321, pad2 = 18904},
graphicsExposure = {pad00 = 54581752, drawable = 46395131, x = 4382,
y = 58744, width = 4382, height = 60648, minorEvent = 4321, count =
18904, majorEvent = 17 '\021', pad1 = 30 '\036', pad2 = 213 '\x{00D5}',
pad3 = 24 '\030'}, noExposure = {pad00 = 54581752, drawable = 46395131,
minorEvent = 4382, majorEvent = 229 '\x{00E5}', bpad = 120 'x'}, visibility = {
pad00 = 54581752, window = 46395131, state = 17 '\021', pad1 = 30
'\036', pad2 = 229 '\x{00E5}', pad3 = 120 'x'}, createNotify = {pad00 =
54581752,
parent = 46395131, window = 287237496, x = 4382, y = -4888, width =
4321, height = 18904, borderWidth = 4382, override = 213 '\x{00D5}',
bpad = 24 '\030'}, destroyNotify = {pad00 = 54581752, event = 46395131,
window = 287237496}, unmapNotify = {pad00 = 54581752, event = 46395131,
window = 287237496, fromConfigure = 17 '\021', pad1 = 30 '\036', pad2 =
236 '\x{00EC}', pad3 = 232 '\x{00E8}'}, mapNotify = {pad00 = 54581752,
event = 46395131, window = 287237496, override = 17 '\021', pad1 = 30
'\036', pad2 = 236 '\x{00EC}', pad3 = 232 '\x{00E8}'}, mapRequest = {pad00 =
54581752,
parent = 46395131, window = 287237496}, reparent = {pad00 = 54581752,
event = 46395131, window = 287237496, parent = 287239400, x = 4321,
y = 18904, override = 17 '\021', pad1 = 30 '\036', pad2 = 213
'\x{00D5}', pad3 = 24 '\030'}, config
Re: Bug#238189: XKB Options Configuration not working ?
On Tue, Mar 16, 2004 at 06:56:50PM +0200, Riku Voipio wrote: [...] > > I do not know what kcontrol is supposed to do, but AFAICT CapsLock can > > not be emulated as on typewriters. The 'Shift cancels Caps' idiom means > > that Shift+Caps prints lowercase letters (roughly); when Shift is > > released, CapsLock is still locked. > > So if those options arent working for you, it is a problem with > setxkbmap or your keyboard setup. Please re-read my statement above. These options work as expected, the problem is that the bug submiter misunderstood what 'Shift cancels CapsLock' means. > Remember that kcontrol uses setxkbmap, and if setxkbmap fails > silently, it can't really know that the specific options wont work. Again, setxkbmap does what it is supposed to do, this is why I reassigned this bug to kcontrol. If this is still not clear, type $ setxkbmap -option caps:shift [Press CapsLock, followed by '' then Shift+'' and CapsLock again] $ setxkbmap -option caps:shift_nocancel [Press CapsLock, followed by '' then Shift+'' and CapsLock again] BTW I was unable to find these settings with kcontrol 3.2.1-1. Denis
Bug#238400: xfree86: breaks different applications with badvalue error
-BEGIN PGP SIGNED MESSAGE- Package: xfree86 Severity: critical Tags: sid Justification: breaks unrelated software I had to search for long to adress this problem to the X. When I start on my system vmware (locales dosn't mater) or audacity (only with non US locales) the applications do not start and give a error like: Gdk-ERROR **: BadValue (integer parameter out of range for operation) serial 881 error_code 2 request_code 45 minor_code 0 (The serial might be different.) When I start such a application from a remote system everythink works. The problem starts when I updated from the inoficial 4.3.0-0ds4 to the new official packages. The problem might be conected to fonts, ttfonts or something this kind. See also Bug #234994 of the libgtk1.2 package. This seems to be the same problem. - -- System Information: Debian Release: testing/unstable APT prefers unstable APT policy: (800, 'unstable'), (700, 'testing') Architecture: i386 (i686) Kernel: Linux 2.4.25 Locale: LANG=de_DE, LC_CTYPE=de_DE (ignored: LC_ALL set to de_DE) - -- Klaus Ethgenhttp://www.ethgen.de/ pub 2048R/D1A4EDE5 2000-02-26 Klaus Ethgen <[EMAIL PROTECTED]> Fingerprint: D7 67 71 C4 99 A6 D4 FE EA 40 30 57 3C 88 26 2B -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.4 (GNU/Linux) iQEVAwUBQFdxjJ+OKpjRpO3lAQEUHAgAsrOR1gFcyrMn3a1cNIVQVoYfvJ3uF/wB l8Y9qoByAIBAicpybdWOQTCIBagZObCh6P9SvGRcliw6Mqpg48abiBjSzAyqvXh3 vy7zI78bVBCprAP1dzQb7+dDkmd4NcGw9H7bXiadWyxnubSTvyBH095k1vfjAZFZ 9sj4eeHqUrE7C+ONtlF1jq6K4rw9t7wzNG+y97qY3sAaNSgoj9oGsN65RQXsCYHj Fhn+t+A/gVBk6i/Ue1Oge4cHqownkXqsu65lTws7ZV24E4j0pPb++699kbuwcnMT lzTmCKpkzi4uoylEGhOBbz8V7uFtqJ2q9HjAoh2HEvPKum8Ss5fvkw== =ygsO -END PGP SIGNATURE-
Bug#234496: xserver-xfree86: xserver freeze all input devices randomely
-BEGIN PGP SIGNED MESSAGE- The bug is gone with the -5 version of xfree86. Regard Klaus - -- Klaus Ethgenhttp://www.ethgen.de/ pub 2048R/D1A4EDE5 2000-02-26 Klaus Ethgen <[EMAIL PROTECTED]> Fingerprint: D7 67 71 C4 99 A6 D4 FE EA 40 30 57 3C 88 26 2B -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.4 (GNU/Linux) iQEVAwUBQFdyGp+OKpjRpO3lAQHu4Qf/cyUgFSVVyTlmLe5nicuIO/yVylT/6a32 przOsOfb7hvify5Y8iKT8sMVWawLDplfumX9aASy+NADh7vW9bzFWpoX4DQTsYa9 spfr2vM9ynNIDRrdg+QZ8hiAUkmVkURnmftxLMagCj99bRMikYPy/UUGdhyg6KVB Lz/aj+0wCK5bbLPyspoLcHanGhIRgmffyfZMYUjM9dPLRLcMqKq5QUUbICqIQayI ZRrXBKRdMLmDdKDHBp0QeOx2FFjXc9iY9rwhMhFr++GZJzkjYo/q5lS7IGbFTVrM fe0jRnnWvsI7P3PXYdHChxOYa6zp2L1DwYSXcyB1Ff5UZhxJI8bWUg== =T9Sf -END PGP SIGNATURE-
Processed: tagging 236705
Processing commands for [EMAIL PROTECTED]: > # Automatically generated email from bts, devscripts version 2.7.95.1 > # fixed in Debian X Strike Force XFree86 repository; to view, run "svn diff > -r 1152:1153 svn://necrotic.deadbeast.net/xfree86" > tags 236705 + pending Bug#236705: xfree86: FTBFS on sparc; 073_sunffb_xaa_render_fb_support.diff broken Tags were: moreinfo Tags added: pending > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Processed: tagging 238080
Processing commands for [EMAIL PROTECTED]: > # Automatically generated email from bts, devscripts version 2.7.95.1 > # fixed in Debian X Strike Force XFree86 repository; to view, run "svn diff > -r 1153:1154 svn://necrotic.deadbeast.net/xfree86" > tags 238080 + pending Bug#238080: xfree86: IGNORE_MANIFEST_CHANGES doesn't work There were no tags set. Tags added: pending > 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: r1154 - trunk/debian
Author: branden
Date: 2004-03-16 15:46:39 -0500 (Tue, 16 Mar 2004)
New Revision: 1154
Modified:
trunk/debian/changelog
trunk/debian/rules
Log:
Fix IGNORE_MANFIEST_CHANGES logic to properly distinguish diff's exit
codes, and work as intended. Thanks to Daniel Schepler for bringing this
problem to my attention. (Closes: #238080)
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2004-03-16 20:37:47 UTC (rev 1153)
+++ trunk/debian/changelog 2004-03-16 20:46:39 UTC (rev 1154)
@@ -41,8 +41,13 @@
the sunffb driver.
- debian/patches/073_sunffb_xaa_render_fb_support.diff: deleted
- -- Branden Robinson <[EMAIL PROTECTED]> Tue, 16 Mar 2004 15:19:02 -0500
+ * Fix IGNORE_MANFIEST_CHANGES logic to properly distinguish diff's exit
+codes, and work as intended. Thanks to Daniel Schepler for bringing this
+problem to my attention. (Closes: #238080)
+- debian/rules
+ -- Branden Robinson <[EMAIL PROTECTED]> Tue, 16 Mar 2004 15:44:17 -0500
+
xfree86 (4.3.0-5) unstable; urgency=medium
* Urgency due to fix for FTBFS on some architectures.
Modified: trunk/debian/rules
===
--- trunk/debian/rules 2004-03-16 20:37:47 UTC (rev 1153)
+++ trunk/debian/rules 2004-03-16 20:46:39 UTC (rev 1154)
@@ -334,15 +334,22 @@
# confirm that the installed file list has not changed
if [ -e debian/MANIFEST.$(ARCH) ]; then \
if ! cmp -s debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; then
\
- diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; \
- if [ -n "$$IGNORE_MANIFEST_CHANGES" ]; then \
- echo 'MANIFEST check failed; ignoring problem because
\$$IGNORE_MANIFEST_CHANGES set' >&2; \
- echo 'Please ensure that the package maintainer has an up-to-date
version of the' >&2; \
- echo 'MANIFEST.$(ARCH) file.' >&2; \
- $(ELSE) \
- echo 'MANIFEST check failed; please see debian/README' >&2; \
- exit 1; \
- fi; \
+ diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new ||
DIFFSTATUS=$$?; \
+ case $${DIFFSTATUS:-0} in \
+ 0) ;; \
+ 1) if [ -n "$$IGNORE_MANIFEST_CHANGES" ]; then \
+ echo 'MANIFEST check failed; ignoring problem because
\$$IGNORE_MANIFEST_CHANGES set' >&2; \
+ echo 'Please ensure that the package maintainer has an
up-to-date version of the' >&2; \
+ echo 'MANIFEST.$(ARCH) file.' >&2; \
+$(ELSE) \
+ echo 'MANIFEST check failed; please see debian/README' >&2; \
+ exit 1; \
+fi; \
+;; \
+ *) echo "diff reported unexpected exit status $$DIFFSTATUS when
performing MANIFEST check" >&2; \
+exit 1; \
+;; \
+ esac; \
fi; \
fi;
else
X Strike Force XFree86 SVN commit: r1153 - in trunk/debian: . patches
Author: branden
Date: 2004-03-16 15:37:47 -0500 (Tue, 16 Mar 2004)
New Revision: 1153
Added:
trunk/debian/patches/072_Xserver_fb_convert_RGB_to_BGR.diff
Removed:
trunk/debian/patches/072_Xserver_fb_convert_RGB_to_BGR.diff
trunk/debian/patches/073_sunffb_xaa_render_fb_support.diff
Modified:
trunk/debian/changelog
Log:
Revert patch applied in 4.3.0-3 to enhance the sunffb driver;
unfortunately, it does not build. (Closes: #236705)
+ Apply patch by David S. Miller to implement XAA and Render support in
the sunffb driver.
Reverts r1079, except for debian/changelog.
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2004-03-16 10:13:46 UTC (rev 1152)
+++ trunk/debian/changelog 2004-03-16 20:37:47 UTC (rev 1153)
@@ -1,5 +1,7 @@
-xfree86 (4.3.0-6) unstable; urgency=low
+xfree86 (4.3.0-6) unstable; urgency=medium
+ * Urgency due to fix for FTBFS on SPARC.
+
* Fix build-server rule to copy a hardlinked source tree for the debugging
server build exactly as the normal build rule does; the clever tricks
undertaken to conserve inodes did not work properly (thanks, Daniel
@@ -33,8 +35,14 @@
system. However, that's the user's decision. (Closes: #236780)
- debian/control
- -- Branden Robinson <[EMAIL PROTECTED]> Tue, 16 Mar 2004 05:01:45 -0500
+ * Revert patch applied in 4.3.0-3 to enhance the sunffb driver;
+unfortunately, it does not build. (Closes: #236705)
++ Apply patch by David S. Miller to implement XAA and Render support in
+ the sunffb driver.
+- debian/patches/073_sunffb_xaa_render_fb_support.diff: deleted
+ -- Branden Robinson <[EMAIL PROTECTED]> Tue, 16 Mar 2004 15:19:02 -0500
+
xfree86 (4.3.0-5) unstable; urgency=medium
* Urgency due to fix for FTBFS on some architectures.
Deleted: trunk/debian/patches/072_Xserver_fb_convert_RGB_to_BGR.diff
===
--- trunk/debian/patches/072_Xserver_fb_convert_RGB_to_BGR.diff 2004-03-16
10:13:46 UTC (rev 1152)
+++ trunk/debian/patches/072_Xserver_fb_convert_RGB_to_BGR.diff 2004-03-16
20:37:47 UTC (rev 1153)
@@ -1,96 +0,0 @@
-$Id$
-
-Fix up case where we need to convert RGB->BGR (fixes SDL under sunffb, for
-example).
-
-This patch by David S. Miller via Ben Collins.
-
-Not submitted to XFree86.
-
xc.orig/programs/Xserver/fb/fbpict.c 2002-12-13 20:46:02.0
-0500
-+++ xc/programs/Xserver/fb/fbpict.c2004-02-17 10:44:46.0 -0500
-@@ -99,7 +99,7 @@
- return m|n|o|p;
- }
-
--#define fbComposeGetSolid(pict, bits) { \
-+#define fbComposeGetSolid(pict, bits, fmt) { \
- FbBits*__bits__; \
- FbStride __stride__; \
- int __bpp__; \
-@@ -120,6 +120,14 @@
- default: \
- return; \
- } \
-+/* If necessary, convert RGB <--> BGR. */ \
-+if (PICT_FORMAT_TYPE((pict)->format) != PICT_FORMAT_TYPE(fmt)) \
-+{ \
-+(bits) = (((bits) & 0xff00) | \
-+ (((bits) & 0x00ff) >> 16) | \
-+ (((bits) & 0xff00) >> 0) | \
-+ (((bits) & 0x00ff) << 16)); \
-+} \
- /* manage missing src alpha */ \
- if ((pict)->pFormat->direct.alphaMask == 0) \
- (bits) |= 0xff00; \
-@@ -162,13 +170,13 @@
- FbStride dstStride, maskStride;
- CARD16w;
-
--fbComposeGetSolid(pSrc, src);
-+fbComposeGetSolid(pSrc, src, pDst->format);
-
- dstMask = FbFullMask (pDst->pDrawable->depth);
- srca = src >> 24;
- if (src == 0)
- return;
--
-+
- fbComposeGetStart (pDst, xDst, yDst, CARD32, dstStride, dstLine, 1);
- fbComposeGetStart (pMask, xMask, yMask, CARD8, maskStride, maskLine, 1);
-
-@@ -221,7 +229,7 @@
- CARD16w;
- CARD32m, n, o, p;
-
--fbComposeGetSolid(pSrc, src);
-+fbComposeGetSolid(pSrc, src, pDst->format);
-
- dstMask = FbFullMask (pDst->pDrawable->depth);
- srca = src >> 24;
-@@ -294,7 +302,7 @@
- FbStride dstStride, maskStride;
- CARD16w;
-
--fbComposeGetSolid(pSrc, src);
-+fbComposeGetSolid(pSrc, src, pDst->format);
-
- srca = src >> 24;
- if (src == 0)
-@@ -356,7 +364,7 @@
- FbStride dstStride, maskStride;
- CARD16w;
-
--fbComposeGetSolid(pSrc, src);
-+fbComposeGetSolid(pSrc, src, pDst->format);
-
- srca = src >> 24;
- if (src == 0)
-@@ -421,7 +429,7 @@
- CARD16w;
- CARD32m, n, o;
-
--fbComposeGetSolid(pSrc, src);
-+fbComposeGetSolid(pSrc, src, pDst->format);
-
- srca = src >> 24;
- if (src == 0)
-@@ -826,7 +834,7 @@
- int maskXoff, maskYoff;
- FbBitssrc;
-
--fbComposeGetSolid(pSrc, src);
-+fbComposeGetSolid(pSrc, src, pDst->format);
-
- if ((src & 0xff00) != 0xff00)
- {
Copied: trunk/debian/patches/072_Xserver_fb_convert_RGB_to_BGR.diff (from rev
1078, trun
Bug#238375: xutils: lndir bug
Package: xutils
Version: 4.1.0-16woody3
Severity: normal
Tags: patch
(xutils seems to own lndir; why is that?)
I discovered a flaw in lndir.
First, please observe the following, correct, behaviour.
[EMAIL PROTECTED]:~$ mkdir sourcedir; cd sourcedir
[EMAIL PROTECTED]:~/sourcedir$ mkdir dir1 dir2; touch file1
[EMAIL PROTECTED]:~/sourcedir$ ln -s file1 linktofile1
[EMAIL PROTECTED]:~/sourcedir$ ln -s dir1 linktodir1
[EMAIL PROTECTED]:~/sourcedir$ ls -lG
total 8
drwxr-xr-x2 clown 4096 Mar 16 20:05 dir1
drwxr-xr-x2 clown 4096 Mar 16 20:05 dir2
-rw-r--r--1 clown 0 Mar 16 20:05 file1
lrwxrwxrwx1 clown 4 Mar 16 20:05 linktodir1 -> dir1
lrwxrwxrwx1 clown 5 Mar 16 20:05 linktofile1 -> file1
[EMAIL PROTECTED]:~/sourcedir$ cd ..; mkdir targetdir; cd targetdir
[EMAIL PROTECTED]:~/targetdir$ lndir ../sourcedir
../sourcedir/dir1:
../sourcedir/dir2:
[EMAIL PROTECTED]:~/targetdir$ ls -lG; cd ..
total 8
drwxr-xr-x2 clown 4096 Mar 16 20:06 dir1
drwxr-xr-x2 clown 4096 Mar 16 20:06 dir2
lrwxrwxrwx1 clown 18 Mar 16 20:06 file1 ->
../sourcedir/file1
lrwxrwxrwx1 clown 4 Mar 16 20:06 linktodir1 -> dir1
lrwxrwxrwx1 clown 5 Mar 16 20:06 linktofile1 -> file1
This is the correct behaviour of lndir.
However, things will go wrong when the sequence of creation is a bit
changed:
[EMAIL PROTECTED]:~$ mkdir sourcedir2; cd sourcedir2
[EMAIL PROTECTED]:~/sourcedir2$ mkdir dir1; touch file1
[EMAIL PROTECTED]:~/sourcedir2$ ln -s file1 linktofile1
[EMAIL PROTECTED]:~/sourcedir2$ ln -s dir1 linktodir1
[EMAIL PROTECTED]:~/sourcedir2$ mkdir dir2
[EMAIL PROTECTED]:~/sourcedir2$ ls -lG
total 8
drwxr-xr-x2 clown 4096 Mar 16 20:13 dir1
drwxr-xr-x2 clown 4096 Mar 16 20:13 dir2
-rw-r--r--1 clown 0 Mar 16 20:13 file1
lrwxrwxrwx1 clown 4 Mar 16 20:13 linktodir1 -> dir1
lrwxrwxrwx1 clown 5 Mar 16 20:13 linktofile1 -> file1
[EMAIL PROTECTED]:~/sourcedir2$ cd ..; mkdir targetdir2; cd targetdir2
[EMAIL PROTECTED]:~/targetdir2$ lndir ../sourcedir2
../sourcedir2/dir1:
../sourcedir2/linktodir1:
[EMAIL PROTECTED]:~/targetdir2$ ls -lG
total 8
drwxr-xr-x2 clown 4096 Mar 16 20:15 dir1
lrwxrwxrwx1 clown 18 Mar 16 20:15 dir2 ->
../sourcedir2/dir2
lrwxrwxrwx1 clown 19 Mar 16 20:15 file1 ->
../sourcedir2/file1
drwxr-xr-x2 clown 4096 Mar 16 20:15 linktodir1
lrwxrwxrwx1 clown 5 Mar 16 20:15 linktofile1 -> file1
[EMAIL PROTECTED]:~/targetdir2$
This is totally wrong!
- dir2 now falsely is a symlink to ../sourcedir2/dir2
- linktodir1 now falsely has become a directory
I have attached a patch for lndir.c which solves the problem (for me).
It all bowls does to the fact that the stat() function behaves in a way
that if the mentioned filename is a link, stat() will dereference it.
lstat() won't dereference it; the link itself is stat-ed (man 2 stat).
If not sure if this is good for upstream as will since lstat() might not
be available everywhere. Furthermore, there already seems to be some
sort of check later on (lines 235-239) but IMHO this is way too late.
I guess it needs further investigation.
--- lndir.c.orig2004-03-16 20:21:33.0 +0100
+++ lndir.c 2004-03-16 20:55:21.0 +0100
@@ -192,9 +192,11 @@
strcpy (p, dp->d_name);
if (n_dirs > 0) {
- if (stat (buf, &sb) < 0) {
- mperror (buf);
- continue;
+ if (lstat (buf, &sb) < 0) {
+ if (stat (buf, &sb) < 0) {
+ mperror (buf);
+ continue;
+ }
}
#ifdef S_ISDIR
Note that this problem might also not occur when the filesystem 'below'
the readdir() on line 183 _first_ returns all directories, followed by
files/symlinks. I am not aware of these filesystems but I'm sure they
exist; I ran these examples on ext3.
I checked 4.2.1 as well and it is flawed also.
Regards,
Marc.
-- System Information
Debian Release: 3.0
Architecture: i386
Kernel: Linux frodo 2.4.24meaculpa #1 Mon Jan 19 21:16:54 CET 2004 i686
Locale: LANG=C, LC_CTYPE=C
Versions of packages xutils depends on:
ii libc6 2.2.5-11.5GNU C Library: Shared libraries an
ii libncurses55.2.20020112a-7 Shared libraries for terminal hand
ii xfree86-common 4.1.0-16woody3X Window System (XFree86) infrastr
ii zlib1g 1:1.1.4-1.0woody0 compression library - runtime
Bug#237509: libxft-dev: upgrade to 2.1.2-6 fails
On Friday 12 March 2004 20:49, Christian Guggenberger wrote: [snip] > > in the meantime, do a: > > $ apt-get -f install > $ dpkg -r --force-depends libxft-dev > $ apt-get -f install > > and probably a: > $ apt-get install libxft-dev > > - Christian "apt-get -f install" will uninstall any packages which depended on libxft-dev, which is probably not desireable. I used the following: $ dpkg -r --force-depends libxft-dev $ apt-get -f install libxft-dev=2.1.2-6 This forces dpkg to remove the pkg in spite of dependencies, then it asks apt-get to try to fix the broken dependencies by using libxft-dev version 2.1.2-6. Note that this will only work if the only problems that apt knows of are dependencies on missing libxft-dev (i.e. the package system was in a consistent state before trying to upgrade libxft-dev). ...Marvin
Bug#236705: xfree86: FTBFS on sparc; 073_sunffb_xaa_render_fb_support.diff broken
On Tue, Mar 16, 2004 at 07:02:55PM +, Colin Watson wrote: > On Tue, Mar 09, 2004 at 02:30:50AM -0500, Branden Robinson wrote: > > On Sun, Mar 07, 2004 at 03:45:45PM -0500, Ben Collins wrote: > > > Colin Watson wrote: > > > > The problem appears to be that the sunffb patch added in 4.3.0-3 > > > > declares and uses FFBDPMSSet, but doesn't actually provide a new > > > > function definition. This suggests that there may have been other > > > > problems in the patch as added to the package, too, so it should be > > > > replaced or reverted. > > > > > > > > Ben, ccing you because Branden says you submitted the patch. > > > > > > I might have missed a file that was needed. > > > > Can you get me the missing file(s) ASAP? > > > > Otherwise I'll have to back the patch out. > > Is it time now to back this out for the time being? KDE 3.2 builds are > waiting for this, not to mention that XFree86 4.3 in sarge soon would be > a Really Good Thing for our release timeline. Yeah, please do. I'll get you new patches asap. -- Debian - http://www.debian.org/ Linux 1394 - http://www.linux1394.org/ Subversion - http://subversion.tigris.org/ WatchGuard - http://www.watchguard.com/
Bug#236705: xfree86: FTBFS on sparc; 073_sunffb_xaa_render_fb_support.diff broken
On Tue, Mar 09, 2004 at 02:30:50AM -0500, Branden Robinson wrote: > On Sun, Mar 07, 2004 at 03:45:45PM -0500, Ben Collins wrote: > > Colin Watson wrote: > > > The problem appears to be that the sunffb patch added in 4.3.0-3 > > > declares and uses FFBDPMSSet, but doesn't actually provide a new > > > function definition. This suggests that there may have been other > > > problems in the patch as added to the package, too, so it should be > > > replaced or reverted. > > > > > > Ben, ccing you because Branden says you submitted the patch. > > > > I might have missed a file that was needed. > > Can you get me the missing file(s) ASAP? > > Otherwise I'll have to back the patch out. Is it time now to back this out for the time being? KDE 3.2 builds are waiting for this, not to mention that XFree86 4.3 in sarge soon would be a Really Good Thing for our release timeline. Thanks, -- Colin Watson [EMAIL PROTECTED]
Bug#238342: xserver-xfree86: "< >" key not available even with "pc105"
On Tue, 2004-03-16 at 18:08, Jens Nachtigall wrote: > Package: xserver-xfree86 > Version: 4.3.0-5 > Severity: normal > Tags: sid > > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > Since upgrading to the xserver my "< >" key is not available any more. > I read the bugreports with all the people having wrongly pc104 instead > of pc105. I belonged to them, so I changed as I was said to pc05 by > using dpkg-reconfigure as described on top of XF86Config-4. However, > the key is still not usable, i.e. unavailable. > by any chance - do you use kde ? if so, set your keyboard up properly in KDE's controlcenter. hth - Christian
Bug#170396: bug can be closed on the Xfree 4.3
This bug no longer applies to the Xfree 4.3. Thanks, Rafael Ávila de Espíndola
Bug#234066: xserver-xfree86: XF86Config-4 file not being used correctly
my ati radeon Mobility M6 LY rev 0 card hooked up to a single Gateway EV500 did not pay attention to the horizontal and vertical sync rates specified in the XF86Config-4 file resulting in its defaulting to a very low resolution. This appears to have happened because it defaulted to thinking there were two monitors. The solution was to add the line Option "MonitorLayout" "CRT,NONE" in the "Device" Section of your XF86Config-4 file to tell the driver to force it to expect only one monitor and react accordingly. On Tue, Mar 16, 2004 at 04:59:40AM -0500, Branden Robinson wrote: > On Mon, Mar 15, 2004 at 07:29:58PM +0100, Michel D?nzer wrote: > > On Mon, 2004-03-15 at 06:18, Luke Schierer wrote: > > > yay! you rock! that works. thank you very much :-) > > > > Glad it's working. I defer to yours and Branden's judgement on how to > > proceed with this bug. > > I think it can probably be closed, but I'd like to do so with a coherent > summary of what the problem was, because I've gotten a bit lost in all > the discussion and with the various blind alleys we've been down with > this bug. > > I'd like to see something of the form: > > PROBLEM: My hooked up to a didn't . > > SOLUTION: The radeon driver . The default is to , so you > have to put the line > Option "MonitorLayout" "CRT,NONE" > in the "Device" Section of your XF86Config-4 file to tell the driver to > instead of . > > Can you guys fill in the blanks, please? I'm thinking Mr. Schierer can > better fill in the problem statement, and Mr. D?nzer the solution. > > -- > G. Branden Robinson|I've made up my mind. Don't try to > Debian GNU/Linux |confuse me with the facts. > [EMAIL PROTECTED] |-- Indiana Senator Earl Landgrebe > http://people.debian.org/~branden/ | -- -This email is made of 100% recycled electrons.
Bug#238342: xserver-xfree86: "< >" key not available even with "pc105"
Package: xserver-xfree86 Version: 4.3.0-5 Severity: normal Tags: sid -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Since upgrading to the xserver my "< >" key is not available any more. I read the bugreports with all the people having wrongly pc104 instead of pc105. I belonged to them, so I changed as I was said to pc05 by using dpkg-reconfigure as described on top of XF86Config-4. However, the key is still not usable, i.e. unavailable. What is strange is that when configuring XFree86 manually with kxconfig, the selected keyboard model is "Generic 104-key PC" and layout is "U.S. English". So obviously, XFree86 seems to ignore the settings in XF86Config-4. After changing the model to "Generic 105-key PC" and the layout to "German" in kxconfig and saving it (to XF86Config-4) , the < and > key are available. However, after the next bootup the < and > are gone again. Compared to the original dpkg-reconfigure derived XF86Config-4 all kxconfig does is to add: Section "InputDevice" Identifier "Keyboard" Option "XkbModel" "pc105" Option "XkbLayout" "de" Driver "keyboard" EndSection However as I said after rebooting everything is gone, even with this kxconfig- changed XF86Config-4. One other remarkable thing (dont know if important) is: When kxconfig tells that it thinks that I have a "Generic 104-key PC" and layout "U.S. English", in this very moment my keyboard also behaves even like one, i.e. all the ä,ü,ö can't be use any more. Jens - -- Package-specific info: Contents of /var/lib/xfree86/X.roster: xserver-xfree86 X server symlink status: lrwxrwxrwx1 root root 20 2003-06-20 00:57 /etc/X11/X -> /usr/bin/X11/XFree86 - -rwxr-xr-x1 root root 1743308 2004-03-05 06:35 /usr/bin/X11/XFree86 /etc/X11/X target unchanged from checksum in /var/lib/xfree86/X.md5sum. Contents of /var/lib/xfree86/XF86Config-4.roster: xserver-xfree86 VGA-compatible devices on PCI bus: 01:00.0 VGA compatible controller: ATI Technologies Inc Rage 128 RF/SG AGP 01:00.0 Class 0300: 1002:5246 XFree86 X server configuration file status: - -rw-r--r--1 root root 3199 2004-03-16 17:11 /etc/X11/XF86Config-4 Contents of /etc/X11/XF86Config-4: # XF86Config-4 (XFree86 X Window System server configuration file) # # This file was generated by dexconf, the Debian X Configuration tool, using # values from the debconf database. # # Edit this file with caution, and see the XF86Config-4 manual page. # (Type "man XF86Config-4" at the shell prompt.) # # This file is automatically updated on xserver-xfree86 package upgrades *only* # if it has not been modified since the last upgrade of the xserver-xfree86 # package. # # If you have edited this file but would like it to be automatically updated # again, run the following commands as root: # # cp /etc/X11/XF86Config-4 /etc/X11/XF86Config-4.custom # md5sum /etc/X11/XF86Config-4 > /var/lib/xfree86/XF86Config-4.md5sum # dpkg-reconfigure xserver-xfree86 Section "Files" FontPath"unix/:7100"# local font server # if the local font server has problems, we can fall back on these FontPath"/usr/lib/X11/fonts/misc" FontPath"/usr/lib/X11/fonts/cyrillic" FontPath"/usr/lib/X11/fonts/100dpi/:unscaled" FontPath"/usr/lib/X11/fonts/75dpi/:unscaled" FontPath"/usr/lib/X11/fonts/Type1" FontPath"/usr/lib/X11/fonts/CID" FontPath"/usr/lib/X11/fonts/Speedo" FontPath"/usr/lib/X11/fonts/100dpi" FontPath"/usr/lib/X11/fonts/75dpi" EndSection Section "Module" Load"GLcore" Load"bitmap" Load"dbe" Load"ddc" Load"dri" Load"extmod" Load"freetype" Load"glx" Load"int10" Load"record" Load"speedo" Load"type1" Load"vbe" EndSection Section "InputDevice" Identifier "Generic Keyboard" Driver "keyboard" Option "CoreKeyboard" Option "XkbRules" "xfree86" Option "XkbModel" "pc105" Option "XkbLayout" "de" EndSection Section "InputDevice" Identifier "Configured Mouse" Driver "mouse" Option "CorePointer" Option "Device""/dev/psaux" Option "Protocol" "ImPS/2" Option "Emulate3Buttons" "true" Option "ZAxisMapping" "4 5" EndSection Section "InputDevice" Identifier "Generic Mouse" Driver "mouse" Option "SendCoreEvents""true" Option "Device""/dev/input/mice" Option "Protocol" "ImPS/2" Option "Emulate3Buttons" "true"
Re: Bug#238189: XKB Options Configuration not working ?
On Tue, Mar 16, 2004 at 01:45:26AM +0100, Denis Barbier wrote: > reassign 238189 kcontrol > thanks Please do not play pingpong with bugs. Branden, do you have an opionion about this bug? should we split the setxkbmap stuff and kcontrol having keyboard options that do nothing? > > kcontrol uses it, so if setxkbmap has no effect either, it is clearly > > not a kcnotrol problem > If setxkbmap has no effect, kcontrol should not display those buttons, > or provide better explanations on what they do. How could kcontrol know that those options don't work, if setxkbmap doesnt tell so? The option texts are from a part of kxbd source prefixed by: // please don't change/fix messages below // they're taken from XFree86 as is and should stay the same (now there is some extra cannon fodder for the xfree86 licence change sucks) It is entirely possible, that command line kcontrol generates, setxkbmap -option caps:shift Is incorrect or wrong syntax, but without better manpage of setxkbmap, I can't really know. > I do not know what kcontrol is supposed to do, but AFAICT CapsLock can > not be emulated as on typewriters. The 'Shift cancels Caps' idiom means > that Shift+Caps prints lowercase letters (roughly); when Shift is > released, CapsLock is still locked. So if those options arent working for you, it is a problem with setxkbmap or your keyboard setup. Remember that kcontrol uses setxkbmap, and if setxkbmap fails silently, it can't really know that the specific options wont work. -- Riku Voipio|[EMAIL PROTECTED] | kirkkonummentie 33 |+358 40 8476974 --+-- 02140 Espoo| | dark> A bad analogy is like leaky screwdriver |
Bug#238340: xserver-xfree86: bad VideoRam value on i810
Package: xserver-xfree86 Version: 4.3.0-5 Severity: normal The xserver-xfree86.config file tests if the driver is a i810, and if it is, sets the default VideoRam to 8192. This will prevent dri from working since it needs more ram. I think the VideoRam option should not be set by default when the driver is the i810. According to http://www.xfree86.org/~dawes/845driver.html, in the absence of this option the driver "defaults to 32MB of VideoRam when the DRI is enabled (and 8MB when DRI is not enabled)" -- Package-specific info: Contents of /var/lib/xfree86/X.roster: xserver-xfree86 X server symlink status: lrwxrwxrwx1 root root 20 Mar 11 15:33 /etc/X11/X -> /usr/bin/X11/XFree86 -rwxr-xr-x1 root root 1743308 Mar 5 02:35 /usr/bin/X11/XFree86 /etc/X11/X target unchanged from checksum in /var/lib/xfree86/X.md5sum. Contents of /var/lib/xfree86/XF86Config-4.roster: xserver-xfree86 VGA-compatible devices on PCI bus: 00:02.0 VGA compatible controller: Intel Corp. 82865G Integrated Graphics Device (rev 02) 00:02.0 Class 0300: 8086:2572 (rev 02) XFree86 X server configuration file status: -rw-r--r--1 root root 2963 Mar 12 09:20 /etc/X11/XF86Config-4 Contents of /etc/X11/XF86Config-4: # XF86Config-4 (XFree86 X Window System server configuration file) # # This file was generated by dexconf, the Debian X Configuration tool, using # values from the debconf database. # # Edit this file with caution, and see the XF86Config-4 manual page. # (Type "man XF86Config-4" at the shell prompt.) # # This file is automatically updated on xserver-xfree86 package upgrades *only* # if it has not been modified since the last upgrade of the xserver-xfree86 # package. # # If you have edited this file but would like it to be automatically updated # again, run the following commands as root: # # cp /etc/X11/XF86Config-4 /etc/X11/XF86Config-4.custom # md5sum /etc/X11/XF86Config-4 > /var/lib/xfree86/XF86Config-4.md5sum # dpkg-reconfigure xserver-xfree86 Section "Files" FontPath"unix/:7100"# local font server # if the local font server has problems, we can fall back on these FontPath"/usr/lib/X11/fonts/misc" FontPath"/usr/lib/X11/fonts/cyrillic" FontPath"/usr/lib/X11/fonts/100dpi/:unscaled" FontPath"/usr/lib/X11/fonts/75dpi/:unscaled" FontPath"/usr/lib/X11/fonts/Type1" FontPath"/usr/lib/X11/fonts/CID" FontPath"/usr/lib/X11/fonts/Speedo" FontPath"/usr/lib/X11/fonts/100dpi" FontPath"/usr/lib/X11/fonts/75dpi" EndSection Section "Module" Load"GLcore" Load"bitmap" Load"dbe" Load"ddc" Load"dri" Load"extmod" Load"freetype" Load"glx" Load"int10" Load"record" Load"speedo" Load"type1" Load"vbe" EndSection Section "InputDevice" Identifier "Generic Keyboard" Driver "keyboard" Option "CoreKeyboard" Option "XkbRules" "xfree86" Option "XkbModel" "abnt2" Option "XkbLayout" "br" EndSection Section "InputDevice" Identifier "Configured Mouse" Driver "mouse" Option "CorePointer" Option "Device""/dev/input/mice" Option "Protocol" "ImPS/2" Option "ZAxisMapping" "4 5" EndSection Section "Device" Identifier "Intel Corporation 82865G Integrated Graphics Device" Driver "i810" EndSection Section "Monitor" Identifier "IBM E50" HorizSync 30-54 VertRefresh 50-120 Option "DPMS" EndSection Section "Screen" Identifier "Default Screen" Device "Intel Corporation 82865G Integrated Graphics Device" Monitor "IBM E50" DefaultDepth24 SubSection "Display" Depth 1 Modes "1024x768" "800x600" "640x480" EndSubSection SubSection "Display" Depth 4 Modes "1024x768" "800x600" "640x480" EndSubSection SubSection "Display" Depth 8 Modes "1024x768" "800x600" "640x480" EndSubSection SubSection "Display" Depth 15 Modes "1024x768" "800x600" "640x480" EndSubSection SubSection "Display" Depth 16 Modes "1024x768" "800x600" "640x480" EndSubSection SubSection "Display" Depth 24 Modes "1024x768" "800x600" "640x480"
Re: i830 driver still not reserving memory (4.3.0-5)
On 16.03.2004 17:15 Mark Zimmerman wrote: On Mon, Mar 15, 2004 at 11:59:05PM +0100, Christian Guggenberger wrote: > On Mon, 2004-03-15 at 16:44, Mark Zimmerman wrote: > > Greetings: > > > > I am running a mixed testing/unstable setup on a Dell system with the > > Intel 865G onboard graphics device. I installed the latest Xfree86 > > packages 4.3.0-5 and everything works fine with one exception: I still > > need to run the 865patch program to reserve video memory prior to > > starting the X server. The changelog comments in xserver-xfree86 > > incicate that this should no longer be the case. > > > I'm not sure, if even XFree86 4.4 can work around all broken Dell > Bioses... > > Well you could give it try: > Basically, it should be sufficient to replace the following files > (make a backup of the old ones) > /usr/X11R6/bin/XFree86 > /usr/X11R6/lib/modules/libpcidata.a > /usr/X11R6/lib/modules/libscanpci.a > /usr/X11R6/lib/modules/drivers/i810_drv.o > > with those found at http://www.xfree86.org/~alanh/drivers/x86/ > > See, if it works better then... > - Christian Good news and bad news: It looks like it is reserving memory properly. The old log showed this: (--) I810(0): Maximum space available for video modes: 832 kByte and the new log shows this: (--) I810(0): Maximum space available for video modes: 32576 kByte However, the X server fails to start. Here is what I see on the console: giving up. xinit: No such file or directory (errno 2): unable to connect to X server xinit: No such process (errno 3): Server error. I'm busy right now, but I could check (actually not check, just merge into 4.3.0-5) all changes from HEAD's i810 driver within a week, or so, and build some homebrew debian packages. I'll drop you a note, when I'm finished - maybe it would work then. - Christian
Re: i830 driver still not reserving memory (4.3.0-5)
On Mon, Mar 15, 2004 at 11:59:05PM +0100, Christian Guggenberger wrote: > On Mon, 2004-03-15 at 16:44, Mark Zimmerman wrote: > > Greetings: > > > > I am running a mixed testing/unstable setup on a Dell system with the > > Intel 865G onboard graphics device. I installed the latest Xfree86 > > packages 4.3.0-5 and everything works fine with one exception: I still > > need to run the 865patch program to reserve video memory prior to > > starting the X server. The changelog comments in xserver-xfree86 > > incicate that this should no longer be the case. > > > I'm not sure, if even XFree86 4.4 can work around all broken Dell > Bioses... > > Well you could give it try: > Basically, it should be sufficient to replace the following files > (make a backup of the old ones) > /usr/X11R6/bin/XFree86 > /usr/X11R6/lib/modules/libpcidata.a > /usr/X11R6/lib/modules/libscanpci.a > /usr/X11R6/lib/modules/drivers/i810_drv.o > > with those found at http://www.xfree86.org/~alanh/drivers/x86/ > > See, if it works better then... > - Christian Good news and bad news: It looks like it is reserving memory properly. The old log showed this: (--) I810(0): Maximum space available for video modes: 832 kByte and the new log shows this: (--) I810(0): Maximum space available for video modes: 32576 kByte However, the X server fails to start. Here is what I see on the console: giving up. xinit: No such file or directory (errno 2): unable to connect to X server xinit: No such process (errno 3): Server error. There is no indication in the log about the reason for the failure. There may be something wrong with the XFree86 file I downloaded (re-downloading made no difference). I was looking for missing library dependencies but ldd fails: alien$ ldd ./XFree86 ldd: /lib/ld-linux.so.2 exited with unknown exit code (135) ldd works fine on the original XFree86: alien$ ldd /usr/X11R6/bin/XFree86 libz.so.1 => /usr/lib/libz.so.1 (0x4001f000) libm.so.6 => /lib/tls/libm.so.6 (0x4003) libdl.so.2 => /lib/tls/libdl.so.2 (0x40054000) libc.so.6 => /lib/tls/libc.so.6 (0x40057000) /lib/ld-linux.so.2 => /lib/ld-linux.so.2 (0x4000) -- Mark
Bug#237509: Followup for #237509
On 16.03.2004 14:15 Hamish Moffatt wrote: It's not as simple as "dpkg -r libxft-dev" because a heap of GNOME -dev libraries depend on that package directly or indirectly. you can avoid this by: $ dpkg - r --force-depends libxft-dev $ apt-get -f install and probably a : $ apt-get install libxft-dev - Christian
Bug#237509: Followup for #237509
It's not as simple as "dpkg -r libxft-dev" because a heap of GNOME -dev libraries depend on that package directly or indirectly. Is it necessary to divert a file to a name used by a previous version of the package? Hamish -- Hamish Moffatt VK3SB <[EMAIL PROTECTED]> <[EMAIL PROTECTED]>
Bug#234066: xserver-xfree86: XF86Config-4 file not being used correctly
On Tue, 2004-03-16 at 10:59, Branden Robinson wrote: > On Mon, Mar 15, 2004 at 07:29:58PM +0100, Michel Dänzer wrote: > > On Mon, 2004-03-15 at 06:18, Luke Schierer wrote: > > > yay! you rock! that works. thank you very much :-) > > > > Glad it's working. I defer to yours and Branden's judgement on how to > > proceed with this bug. > > I think it can probably be closed, but I'd like to do so with a coherent > summary of what the problem was, because I've gotten a bit lost in all > the discussion and with the various blind alleys we've been down with > this bug. The radeon driver incorrectly detected two monitors, so the Monitor Section didn't apply to the single connected monitor as expected. The workaround is to override the monitor detection with Option "MonitorLayout". -- Earthling Michel Dänzer | Debian (powerpc), X and DRI developer Libre software enthusiast| http://svcs.affero.net/rm.php?r=daenzer
Bug#237393: screen blanking works as expected here with an i865G
On 16.03.2004 12:18 Christian Guggenberger wrote: Just FYI, I don't see any problems with screen blanking here on my i865G. xset s 10 10 xset s blank works as expected. (and does with other video cards as well: radeon-7000, r128-ultra, i845G) I should add, that I'm using the i810 driver on both i845G and i865G (not vesa, like the bug submitter does). - Christian
Bug#237393: screen blanking works as expected here with an i865G
Just FYI, I don't see any problems with screen blanking here on my i865G. xset s 10 10 xset s blank works as expected. (and does with other video cards as well: radeon-7000, r128-ultra, i845G) - Christian
Re: Bug#237393: xserver-xfree86: Screen blanking seems to have stopped working
On 16.03.2004 11:22 Branden Robinson wrote: On Thu, Mar 11, 2004 at 05:06:21PM +0100, Moritz Muehlenhoff wrote: > Christian Guggenberger wrote: > > Just for your info - starting with 4.3.0, the i810 driver supports the i865G > > as well. > > See, if things work better with the i810 instead of vesa driver. > > This probably fixes #158900 as well. IMO, that's not a fix per se. The vesa driver and i810 driver are separate things. Using the i810 driver instead of the vesa driver to resolve the issue (hang on VT switch) is a workaround, not a fix. never said anything else. But I think, it's good to "educate" people to use drivers specific to their video card instead of the generic vesa driver - at least for the onboard intels. - Christian
Processed: Re: Bug#238100: xserver-xfree86: Xvideo seems broken since upgrade to 4.3.0
Processing commands for [EMAIL PROTECTED]: > retitle 238100 xserver-xfree86: [sis] XVideo doesn't work on 86C326 5598/6326 > rev 11 Bug#238100: xserver-xfree86: Xvideo seems broken since upgrade to 4.3.0 Changed Bug title. > tag 238100 + upstream Bug#238100: xserver-xfree86: [sis] XVideo doesn't work on 86C326 5598/6326 rev 11 Tags were: sid Tags added: upstream > thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Bug#238100: xserver-xfree86: Xvideo seems broken since upgrade to 4.3.0
retitle 238100 xserver-xfree86: [sis] XVideo doesn't work on 86C326 5598/6326 rev 11 tag 238100 + upstream thanks On Mon, Mar 15, 2004 at 11:11:28AM +0100, Emmanuel Charpentier wrote: > Package: xserver-xfree86 > Version: 4.3.0-5 > Severity: normal > Tags: sid > > I use a few applications using XVideo (e. g. xawtv, mjpegtools, etc ...). > Since my recent update of my sid machine, (specifically, going from 4.2.x to > 4.3.x), xvideo support seems broken. [...] > Perusing the xfree86-xserver bug list, I saw that a similar problem has been > reported for a number of different video cards in the same or similar > circumstances (i.e. upgading to 4.3.x). I haven't been unable to find a > workaround for this problem in theses reports and associated messages. Well, XVideo works for me on my Blue&White PowerMac G3 with an ATI Rage 128 RE/SG rev 0. So I do not think it is the case that 4.3 breaks XVideo for everyone. -- 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
Bug#238080: xfree86: IGNORE_MANIFEST_CHANGES doesn't work
On Mon, Mar 15, 2004 at 12:04:07AM -0800, Daniel Schepler wrote:
> Package: xfree86
> Severity: minor
> Version: 4.3.0-5
>
> When I was trying to build a custom version of xfree86 using
> IGNORE_MANIFEST_CHANGES, it didn't work. The problem appears to be
> that the diff command is returning an exit code of 1 when it finds
> changes, and since dbs sets SHELL to "/bin/sh -e", the rest of the
> command never gets reached. In fact, adding "|| true" after the diff
> command fixed the problem. So might adding `|| test "$$?" = 1'
> instead, but I haven't tested that one.
Thanks for the report!
I am testing the following patch:
Index: debian/rules
===
--- debian/rules(revision 1144)
+++ debian/rules(working copy)
@@ -334,15 +334,22 @@
# confirm that the installed file list has not changed
if [ -e debian/MANIFEST.$(ARCH) ]; then \
if ! cmp -s debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; then
\
- diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; \
- if [ -n "$$IGNORE_MANIFEST_CHANGES" ]; then \
- echo 'MANIFEST check failed; ignoring problem because
\$$IGNORE_MANIFEST_CHANGES set' >&2; \
- echo 'Please ensure that the package maintainer has an up-to-date
version of the' >&2; \
- echo 'MANIFEST.$(ARCH) file.' >&2; \
- $(ELSE) \
- echo 'MANIFEST check failed; please see debian/README' >&2; \
- exit 1; \
- fi; \
+ diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new ||
DIFFSTATUS=$$?; \
+ case $${DIFFSTATUS:-0} in \
+ 0) ;; \
+ 1) if [ -n "$$IGNORE_MANIFEST_CHANGES" ]; then \
+ echo 'MANIFEST check failed; ignoring problem because
\$$IGNORE_MANIFEST_CHANGES set' >&2; \
+ echo 'Please ensure that the package maintainer has an
up-to-date version of the' >&2; \
+ echo 'MANIFEST.$(ARCH) file.' >&2; \
+$(ELSE) \
+ echo 'MANIFEST check failed; please see debian/README' >&2; \
+ exit 1; \
+fi; \
+;; \
+ *) echo "diff reported unexpected exit status $$DIFFSTATUS when
performing MANIFEST check" >&2; \
+exit 1; \
+;; \
+ esac; \
fi; \
fi;
else
--
G. Branden Robinson| Psychology is really biology.
Debian GNU/Linux | Biology is really chemistry.
[EMAIL PROTECTED] | Chemistry is really physics.
http://people.debian.org/~branden/ | Physics is really math.
signature.asc
Description: Digital signature
Processed: Re: Processed: Re: Bug#234058: gdm: Capslock warning on sparc warns for numlock, not capslock
Processing commands for [EMAIL PROTECTED]: > tag 234058 + moreinfo Bug#234058: gdm: Capslock warning on sparc warns for numlock, not capslock There were no tags set. Tags added: moreinfo > thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Bug#234058: Processed: Re: Bug#234058: gdm: Capslock warning on sparc warns for numlock, not capslock
tag 234058 + moreinfo thanks On Sun, Mar 14, 2004 at 11:18:11PM -0800, Debian Bug Tracking System wrote: > Processing commands for [EMAIL PROTECTED]: > > > reassign 234058 xserver-xfree86 > Bug#234058: gdm: Capslock warning on sparc warns for numlock, not capslock > Bug reassigned from package `gdm' to `xserver-xfree86'. [The following is a form letter.] Dear bug submitter, Since the XFree86 X server is a large and complex piece of software, some more informtion is required of you before this bug can be handled. Please run the following commands from a shell prompt to gather and deliver this information to us: $ /usr/share/bug/xserver-xfree86 > /tmp/output 3>&1 $ mailx -s "Re: Bug#237717" [EMAIL PROTECTED] < /tmp/output If you do not have a "mailx" command on your system, you can get by installing the "mailx" Debian package; for example, with the "aptitude install mailx" or "apt-get install mailx" commands as root. Alternatively, you can also use a mail command that is compatible with mailx's command-line syntax, such as "mutt". Thank you! -- G. Branden Robinson| Debian GNU/Linux | kernel panic -- causal failure [EMAIL PROTECTED] | universe will now reboot http://people.debian.org/~branden/ | signature.asc Description: Digital signature
Processed: severity of 237939 is normal ..., tagging 237939
Processing commands for [EMAIL PROTECTED]: > # Automatically generated email from bts, devscripts version 2.7.95.1 > severity 237939 normal Bug#237939: xbase-clients: xf86cfg does not restore numeric keypad Severity set to `normal'. > retitle 237939 xbase-clients: [xf86cfg] does not switch off MouseKeys when > it's done Bug#237939: xbase-clients: xf86cfg does not restore numeric keypad Changed Bug title. > tags 237939 + upstream Bug#237939: xbase-clients: [xf86cfg] does not switch off MouseKeys when it's done There were no tags set. Tags added: upstream > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Processed: retitle 237393 to xserver-xfree86: [vga] screen blanking (e.g. with 'xset s blank') doesn't work on Intel Corp. 865G Chipset Graphics Controller rev 2 ... ...
Processing commands for [EMAIL PROTECTED]: > # Automatically generated email from bts, devscripts version 2.7.95.1 > retitle 237393 xserver-xfree86: [vga] screen blanking (e.g. with 'xset s > blank') doesn't work on Intel Corp. 865G Chipset Graphics Controller rev 2 Bug#237393: xserver-xfree86: Screen blanking seems to have stopped working Changed Bug title. > tags 237393 + upstream Bug#237393: xserver-xfree86: [vga] screen blanking (e.g. with 'xset s blank') doesn't work on Intel Corp. 865G Chipset Graphics Controller rev 2 There were no tags set. Tags added: upstream > severity 237393 normal Bug#237393: xserver-xfree86: [vga] screen blanking (e.g. with 'xset s blank') doesn't work on Intel Corp. 865G Chipset Graphics Controller rev 2 Severity set to `normal'. > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Processed: Re: Bug#237371: xfree86-common: The touchpad click not works
Processing commands for [EMAIL PROTECTED]: > retitle 237371 xserver-xfree86: touchpad tap-to-click feature nonfunctional Bug#237371: xfree86-common: The touchpad click not works Changed Bug title. > reassign 237371 xserver-xfree86 Bug#237371: xserver-xfree86: touchpad tap-to-click feature nonfunctional Bug reassigned from package `xfree86-common' to `xserver-xfree86'. > tag 237371 + moreinfo upstream Bug#237371: xserver-xfree86: touchpad tap-to-click feature nonfunctional Tags were: sid Tags added: moreinfo, upstream > thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Bug#237371: xfree86-common: The touchpad click not works
retitle 237371 xserver-xfree86: touchpad tap-to-click feature nonfunctional reassign 237371 xserver-xfree86 tag 237371 + moreinfo upstream thanks On Thu, Mar 11, 2004 at 10:46:10AM +0100, Angel Abad (Indio) wrote: > Package: xfree86-common > Version: 4.3.0-5 > Severity: normal > Tags: sid > > The making click feature in touchpad doesn't work with > the Xfree86 upgrade. The touchpad and buttons work > perfectly, except click or double click in touchpad. [The following is a form letter.] Dear bug submitter, Since the XFree86 X server is a large and complex piece of software, some more informtion is required of you before this bug can be handled. Please run the following commands from a shell prompt to gather and deliver this information to us: $ /usr/share/bug/xserver-xfree86 > /tmp/output 3>&1 $ mailx -s "Re: Bug#237717" [EMAIL PROTECTED] < /tmp/output If you do not have a "mailx" command on your system, you can get by installing the "mailx" Debian package; for example, with the "aptitude install mailx" or "apt-get install mailx" commands as root. Alternatively, you can also use a mail command that is compatible with mailx's command-line syntax, such as "mutt". Thank you! -- G. Branden Robinson| I suspect Linus wrote that in a Debian GNU/Linux | complicated way only to be able to [EMAIL PROTECTED] | have that comment in there. http://people.debian.org/~branden/ | -- Lars Wirzenius signature.asc Description: Digital signature
Bug#235241: bug resolved
On Mon, Mar 15, 2004 at 12:03:25PM +0100, Christian Guggenberger wrote: > Anyway, now we do a least know, that the VBERestore Option (set to false) > really prevents X server crashes, while switching VT's. > Branden you might want do undo "SVN commit: r1147 - trunk/debian"( the bug > closer), as the change to the i830 part of the i810 driver has nothing to > do with this Bug (IMHO). On Mon, Mar 15, 2004 at 11:32:47AM -0800, Oliver Johns wrote: > Just for the record, in case someone out there has similar problems, > here is what happened in my case: > > (1) The initial update 4.2.1-->4.3.0 caused my C-A-F1 combo to stop > working. > (2) After some futzing around, I filed a bug against xserver-xfree86. > (3) Sometime later, an incremental update of 4.3.0 was made. But, on > the same day, the update of kde-3.1 to kde-3.2 was made. The result > was that my C-A-F1 started working again. > (4) I was delighted, and filed a bug-fixed comment to my earlier bug. > (5) Then I notice that my remapping of the keyboard to make the > diamond keys act as forward-delete was now not working. > (6) I found that the kde-3.2 no longer had lines > in /etc/kde3/kdm/Xsetup to call xmodmap and remap the keyboard. So, > I added those lines back. > (7) Now I found that my diamond keys were working, but that C-A-F1 was > broken again. > (8) Finally the light dawned. I backed out the lines to call > xmodmap. Then I did xmodmap -pke > xmodmap-new. Then I made the > modifications about the diamond keys in the file xmodmap-new > and moved it to /etc/X11/Xmodmap. Then I put back the lines in > /etc/kde3/kdm/Xsetup to call xmodmap and use /etc/X11/Xmodmap as the > new xmodmap. > (9) Now everything works OK. Thanks, guys. I have reverted the bogus annotation of the changelog in SVN r1152. -- G. Branden Robinson|One man's theology is another man's Debian GNU/Linux |belly laugh. [EMAIL PROTECTED] |-- Robert Heinlein http://people.debian.org/~branden/ | signature.asc Description: Digital signature
Bug#237939: xbase-clients: xf86cfg does not restore numeric keypad
On Sun, Mar 14, 2004 at 03:01:08PM +0100, Eric Valette wrote: > Package: xbase-clients > Version: 4.3.0-5 > Severity: important > > After using xf86cfg, the numeric keypad behavior (used to move > the mouse in case it is not correctly configurated), the normal > usage is not restored... As a workaround, Shift+NumLock will turn this feature off, which is called "MouseKeys". -- G. Branden Robinson|Somebody once asked me if I thought Debian GNU/Linux |sex was dirty. I said, "It is if [EMAIL PROTECTED] |you're doing it right." http://people.debian.org/~branden/ |-- Woody Allen signature.asc Description: Digital signature
Processed: tagging 236780
Processing commands for [EMAIL PROTECTED]: > # Automatically generated email from bts, devscripts version 2.7.95.1 > # fixed in Debian X Strike Force XFree86 repository; to view, run "svn diff > -r 1150:1151 svn://necrotic.deadbeast.net/xfree86" > tags 236780 + pending Bug#236780: No need to Conflict with xlib6 Tags were: sid Tags added: pending > 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: r1152 - trunk/debian
Author: branden Date: 2004-03-16 05:13:46 -0500 (Tue, 16 Mar 2004) New Revision: 1152 Modified: trunk/debian/changelog Log: Revert r1147. The VT switching problem observed in the referenced bug report was the result of bad interaction between KDE and xmodmap, and not a video driver issue. See http://bugs.debian.org/235241 >. Modified: trunk/debian/changelog === --- trunk/debian/changelog 2004-03-16 10:06:36 UTC (rev 1151) +++ trunk/debian/changelog 2004-03-16 10:13:46 UTC (rev 1152) @@ -106,7 +106,7 @@ + Add a "VBERestore" option for the i830 part of the i810 driver, to allow the VBE restore bug workaround to be disabled. This is needed for correct text mode restoration on some 830M-based machines -(David Dawes, reported by Martin van Es). (Closes: #235241) +(David Dawes, reported by Martin van Es). + Turn off the GetDisplayInfo BIOS call by default and add an option to turn it back on in the i810 driver. This fixes some lockup problems found with some Dell BIOS' (Alan Hourihane, Alain Poirier).
Re: Driver for nvidia geforce2 mx 100/200
On Sun, Mar 14, 2004 at 04:53:00PM +0100, Ivan Dodig wrote: > Where can i find it on the internet for free??? Please help!!! [The following is a form letter.] Hello, You recently sent an off-charter message to the debian-x mailing list. First, I will offer an explanation of what this mailing list's purpose is; I will then suggest some alternative forums for your message or concern. The full charter of the mailing list follows. This list is for the discussion and support of the X Window System within Debian. Issues of maintenance and porting of Debian's XFree86 packages are germane here, as are discussions of possible Debian policy mechanisms for ensuring the smooth interoperation of packages that use the X Window System, particularly widget sets, desktop environments, window managers, display managers, and packages that provide fonts for the X Window System. In particular, individuals involved with building official Debian XFree86 packages for any architecture are invited to join, as are those with various graphics hardware who seek to reproduce and/or fix bugs in the X server. This is not a user support list; this list is intended for those who deal with the source code of any of the X Window System components mentioned above. If you are experiencing a problem, the first thing to check is the Debian X FAQ. This FAQ is available on the World Wide Web: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/FAQ The FAQ is also available on any Debian system that has the "xfree86-common" package installed. You can use the command "dpkg --status xfree86-common" at a shell prompt to determine whether you have the xfree86-common package installed (this technique works with any other package name as well). For instance, when I run this command I see the following: $ dpkg --status xfree86-common Package: xfree86-common Status: install ok installed (followed by additional information about the package) If xfree86-common is installed, you can view the Debian X FAQ in a variety of ways, since it is a gzipped (compressed) text file. The path to the FAQ is /usr/share/doc/xfree86-common/FAQ.gz. Here's one method for viewing it: $ zmore /usr/share/doc/xfree86-common/FAQ.gz Debian X Window System Frequently Asked Questions (FAQ) List Copyright 1998-2002 Branden Robinson. This document is licensed under the GNU General Public License, version 2 (see /usr/share/common-licenses/GPL). By its nature, this document is not complete. If your question is not answered here, try /usr/share/doc//README.Debian (and other files in the package's doc directory), manual pages, and the debian-user mailing list. See http://www.debian.org/ for more information about the Debian mailing lists. (followed by the rest of the FAQ) If the FAQ does not satisfactorily answer your question, the primary Debian users' support forum is the debian-user mailing list. You can learn more about this list at: http://lists.debian.org/debian-user/ If you have already tried that mailing list, and/or your machine does *NOT* use an Intel-x86 compatible CPU (such as a Pentium or AMD Athlon chip), you may also want to peruse one of Debian's architecture-specific mailing lists: http://lists.debian.org/debian-alpha/ http://lists.debian.org/debian-arm/ http://lists.debian.org/debian-hppa/ http://lists.debian.org/debian-ia64/ http://lists.debian.org/debian-m68k/ http://lists.debian.org/debian-mips/ http://lists.debian.org/debian-powerpc/ http://lists.debian.org/debian-sparc/ http://lists.debian.org/debian-superh/ Before sending a message to one of the mailing lists, it's wise to try using the search interface; in many cases, your problem has been experienced before by other people, and a solution, workaround, or explanation may already be available! http://lists.debian.org/search.html If the search engine turns up nothing, you should know whether or not you're subscribed to a mailing list before sending a message to it. If you are not subscribed, make *certain* that you ask for private copies of replies to your message. Debian's standard practice is to reply only to mailing lists (this cuts down on Internet traffic and annoying bounce messages). If you want people to deviate from this standard practice you should ask them to do so. (Advanced mail users should set a Mail-Followup-To header that includes both the list address and their own address.) Finally, if you have found a problem in Debian's XFree86 packages (and especially if Debian experts on one or more of the above mailing lists agree), you should file a bug report with the Debian Bug Tracking System. One of the best ways to do this is with the "reportbug" package and command of the same name. One way to install reportbug is with "apt-get"; for example: # apt-get install reportbug The "reportbug" command has a few different modes that cater to different levels of user expertise. If this messag
Bug#236780: No need to Conflict with xlib6
On Mon, Mar 08, 2004 at 11:20:38AM +0100, Thomas Hood wrote: > I mentioned this in #233818 already but I now suspect that the cases of xlib6 > and xlib6g may differ in important respects so I am filing a separate report. > > WordPerfect 8 works with xlib6, xpm4.7 and libc5. Until release 4.3 of > xfree86 I had these installed and marked "hold" and I had no problem. > Now I have installed xlibs 4.3.0 which Conflicts with xlib6 and forces it > off my system. I don't see the reason for this. xlib6 installs files in > /usr/i486-linuxlibc1/ so there is no pathname collision with anything in > current xfree86 packages. When I remove (but don't purge) xlibs and > install xlib6 then everything including WP8 works fine again. > > It may be objected that WP8 is not free software, etc., but I need to keep > the program around so that I can convert old files in WP formats to formats > readable by OOo. So, unless there is some good reason why xlib6 should be > forced off the system, I would like xlibs to refrain from Conflicting with it. xlib6 has known security holes. (Review the past few years' worth of DSAs for xfree86.) However, apart from that, you're right -- there's no particular reason to force it off the system. And diligent users can protect themselves from malicious libc5 X clients, or not -- at their choice. You've convinced me, and I've committed a reversion of this decision as r1151. The change should appear in XFree86 4.3.0-6. -- G. Branden Robinson| The Bible is probably the most Debian GNU/Linux | genocidal book ever written. [EMAIL PROTECTED] | -- Noam Chomsky http://people.debian.org/~branden/ | signature.asc Description: Digital signature
X Strike Force XFree86 SVN commit: r1151 - trunk/debian
Author: branden
Date: 2004-03-16 05:06:36 -0500 (Tue, 16 Mar 2004)
New Revision: 1151
Modified:
trunk/debian/changelog
trunk/debian/control
Log:
Drop xlibs's conflicts/replaces relationship with xlib6 (the old,
no-longer-maintained, security-hole-ridden libc5 version of the X
libraries from XFree86 3.3.6), because it is spurious. There is no file
overlap and no particular reason to force xlib6 off the system, apart from
the sheer insanity of keeping libraries with known security holes on the
system. However, that's the user's decision. (Closes: #236780)
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2004-03-16 07:30:32 UTC (rev 1150)
+++ trunk/debian/changelog 2004-03-16 10:06:36 UTC (rev 1151)
@@ -25,8 +25,16 @@
become. (Closes: #237878)
- debian/patches/905_debian_xdm.diff
- -- Branden Robinson <[EMAIL PROTECTED]> Mon, 15 Mar 2004 13:29:17 -0500
+ * Drop xlibs's conflicts/replaces relationship with xlib6 (the old,
+no-longer-maintained, security-hole-ridden libc5 version of the X
+libraries from XFree86 3.3.6), because it is spurious. There is no file
+overlap and no particular reason to force xlib6 off the system, apart from
+the sheer insanity of keeping libraries with known security holes on the
+system. However, that's the user's decision. (Closes: #236780)
+- debian/control
+ -- Branden Robinson <[EMAIL PROTECTED]> Tue, 16 Mar 2004 05:01:45 -0500
+
xfree86 (4.3.0-5) unstable; urgency=medium
* Urgency due to fix for FTBFS on some architectures.
Modified: trunk/debian/control
===
--- trunk/debian/control2004-03-16 07:30:32 UTC (rev 1150)
+++ trunk/debian/control2004-03-16 10:06:36 UTC (rev 1151)
@@ -1417,8 +1417,8 @@
Section: libs
Architecture: all
Depends: libice6, libsm6, libx11-6, libxext6, libxft1, libxi6, libxmu6,
libxmuu1, libxp6, libxpm4, libxrandr2, libxt6, libxtrap6, libxtst6, xlibs-data,
${misc:Depends}
-Conflicts: xbase, xlib, xlib6, xlib6g, xlib6g-dev, xpm4g, fvwm-common, qcad
(<< 1.4.6-1), xbase-clients (<< 4.0), xcontrib (<< 4.0), xsm (<< 4.0)
-Replaces: xbase, xlib, xlib6, xlib6g, xlib6g-dev, xpm4g, fvwm-common, qcad (<<
1.4.6-1), xbase-clients (<< 4.0), xcontrib (<< 4.0), xsm (<< 4.0)
+Conflicts: xbase, xlib, xlib6g, xlib6g-dev, xpm4g, fvwm-common, qcad (<<
1.4.6-1), xbase-clients (<< 4.0), xcontrib (<< 4.0), xsm (<< 4.0)
+Replaces: xbase, xlib, xlib6g, xlib6g-dev, xpm4g, fvwm-common, qcad (<<
1.4.6-1), xbase-clients (<< 4.0), xcontrib (<< 4.0), xsm (<< 4.0)
Description: X Window System client libraries metapackage and XKB data
This package smooths upgrades from Debian 3.0 by depending on the individual
library packages into which each shared object formerly contained in this
Re: Bug#237393: xserver-xfree86: Screen blanking seems to have stopped working
On Thu, Mar 11, 2004 at 05:06:21PM +0100, Moritz Muehlenhoff wrote: > Christian Guggenberger wrote: > > Just for your info - starting with 4.3.0, the i810 driver supports the > > i865G > > as well. > > See, if things work better with the i810 instead of vesa driver. > > This probably fixes #158900 as well. IMO, that's not a fix per se. The vesa driver and i810 driver are separate things. Using the i810 driver instead of the vesa driver to resolve the issue (hang on VT switch) is a workaround, not a fix. -- G. Branden Robinson| There's no trick to being a Debian GNU/Linux | humorist when you have the whole [EMAIL PROTECTED] | government working for you. http://people.debian.org/~branden/ | -- Will Rogers signature.asc Description: Digital signature
Bug#234066: xserver-xfree86: XF86Config-4 file not being used correctly
On Mon, Mar 15, 2004 at 07:29:58PM +0100, Michel Dänzer wrote: > On Mon, 2004-03-15 at 06:18, Luke Schierer wrote: > > yay! you rock! that works. thank you very much :-) > > Glad it's working. I defer to yours and Branden's judgement on how to > proceed with this bug. I think it can probably be closed, but I'd like to do so with a coherent summary of what the problem was, because I've gotten a bit lost in all the discussion and with the various blind alleys we've been down with this bug. I'd like to see something of the form: PROBLEM: My hooked up to a didn't . SOLUTION: The radeon driver . The default is to , so you have to put the line Option "MonitorLayout" "CRT,NONE" in the "Device" Section of your XF86Config-4 file to tell the driver to instead of . Can you guys fill in the blanks, please? I'm thinking Mr. Schierer can better fill in the problem statement, and Mr. Dänzer the solution. -- G. Branden Robinson|I've made up my mind. Don't try to Debian GNU/Linux |confuse me with the facts. [EMAIL PROTECTED] |-- Indiana Senator Earl Landgrebe http://people.debian.org/~branden/ | signature.asc Description: Digital signature
Processed: owner 238276, tagging 238276
Processing commands for [EMAIL PROTECTED]: > # Automatically generated email from bts, devscripts version 2.7.95.1 > owner 238276 David Mosberger <[EMAIL PROTECTED]> Bug#238276: xserver-xfree86: IA64 zx1 PCI support Owner recorded as David Mosberger <[EMAIL PROTECTED]>. > # don't forget the license stuff > tags 238276 + moreinfo Bug#238276: xserver-xfree86: IA64 zx1 PCI support Tags were: patch upstream Tags added: moreinfo > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Processed: Re: are packages with diversions not downgradeable?
Processing commands for [EMAIL PROTECTED]: > tag 237509 + wontfix Bug#237509: libxft-dev: upgrading from libxft-dev 2.1.2-[1-5] doesn't work due to dpkg-divert being run before unpack Tags were: sid Bug#237511: libxft-dev: upgrading from libxft-dev 2.1.2-[1-5] doesn't work due to dpkg-divert being run before unpack Tags added: wontfix > thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Re: Debian-Packages - announcement and questions
On Mon, Mar 15, 2004 at 03:48:05PM +0100, [EMAIL PROTECTED] wrote: > Hello, > > during the last few months I have created some debian-packages. > > 1. xfree86 (4.3.99pre10) - powerpc-only [...] > All packages are designed to run on Debian sarge (xfree also runs on sid). > > XFree86 was needed for running on my PowerBook 17" rev1 > (NVidia GeForce 440GO64M). [...] > All packages can be found at www.debian-desktop.org. I'd like to invite you to join the Debian X Strike Force; please subscribe to debian-x if you haven't already. Your experience with packaging an XFree86 4.4 pre-release could be quite valuable. -- G. Branden Robinson| Mob rule isn't any prettier just Debian GNU/Linux | because you call your mob a [EMAIL PROTECTED] | government. http://people.debian.org/~branden/ | signature.asc Description: Digital signature
Re: are packages with diversions not downgradeable?
tag 237509 + wontfix thanks (There is no "cantfix" tag.) On Thu, Mar 11, 2004 at 02:44:35AM -0500, Branden Robinson wrote: > [I am not subscribed to debian-dpkg; please reply to -devel as well.] > > Here's a transcript of me testing xft 2.1.2-6, which gets rid of some > diversions. > > As you can see, I ran into some problems when upgrading libxft-dev > 2.1.2-5 (which used dpkg-divert) to libxft-dev 2.1.2-6 (which removes > them), then downgrading to 2.1.2-5 and trying to re-upgrade to 2.1.2-6. > > Am I using diversions wrong? Is this a bug in dpkg-divert? I tried making libxft-dev declare a version Conflicts with itself (<< 2.1.2-6), to see if that would persuade dpkg to remove the previous version before running the current libxft-dev's preinst script. dpkg ignored the declared relationship. I tried moving the diversion removals to the postinst script insted of the preinst script; that made no difference. There appears to be no clean fix for this at the package level. It's impossible for a package to undivert renamed files without declaring a conflict with all other packages that provide it. If your package makes diversions, I guess you're supposed to unconditionally remove all of them in your prerm script. Andrew Suffield suggested on IRC that diversions might be better handled with a special binary package control file (a la DEBIAN/conffiles), and diversion handling moved into dpkg itself. Given that this bug only affects upgrades from libxft-dev 2.1.2-[1-5] (which weren't in woody), I am going to let it go unfixed. If it affects you, the workaround is to "dpkg -r libxft-dev" before installing libxft-dev >= 2.1.2-6. -- G. Branden Robinson|The best place to hide something is Debian GNU/Linux |in documentation. [EMAIL PROTECTED] |-- Ethan Benson http://people.debian.org/~branden/ | signature.asc Description: Digital signature
Bug#238276: xserver-xfree86: IA64 zx1 PCI support
Package: xserver-xfree86
Version: 4.3.0-5
Severity: wishlist
Tags: patch upstream
Notes to self:
Once a bug number is allocated, set submitter to "David Mosberger
<[EMAIL PROTECTED]>".
Don't forget to check upstream CVS to see if X-Oz/XFree86 1.1 license
has been placed on these files.
Try to get this in for sarge.
--
G. Branden Robinson| Men are born ignorant, not stupid.
Debian GNU/Linux | They are made stupid by education.
[EMAIL PROTECTED] | -- Bertrand Russell
http://people.debian.org/~branden/ |
--- Begin Message ---
The attached patch has been in the CVS tree for some time (not sure
when it was added, but it definitely has made into XFree86 v4.4.0) and
I was hoping that it could be applied to the Debian/{unstable,testing}
package as well. It shouldn't have any negative effect (in case it
isn't obvious: zx1 is HP's chipset for Itanium workstations, so the
patch definitely won't affect anything outside of ia64).
Thanks,
--david
diff -x '*.o' -urN
xfree86-4.3.0/build-tree/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
xfree86-4.3.0-davidm/build-tree/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
---
xfree86-4.3.0/build-tree/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
2004-03-15 21:51:16.255713536 -0800
+++
xfree86-4.3.0-davidm/build-tree/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
2004-03-15 14:08:39.113145471 -0800
@@ -372,6 +372,7 @@
#define PCI_CHIP_ZX1_SBA 0x1229
#define PCI_CHIP_ZX1_IOC 0x122A
#define PCI_CHIP_ZX1_LBA 0x122E /* a.k.a. Mercury */
+#define PCI_CHIP_ZX1_AGP8 0x12B4 /* a.k.a. QuickSilver */
/* SGS */
#define PCI_CHIP_STG2000 0x0008
diff -x '*.o' -urN
xfree86-4.3.0/build-tree/xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c
xfree86-4.3.0-davidm/build-tree/xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c
---
xfree86-4.3.0/build-tree/xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c
2003-02-23 12:26:49.0 -0800
+++
xfree86-4.3.0-davidm/build-tree/xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c
2004-03-15 14:56:24.346247527 -0800
@@ -97,7 +97,10 @@
#define LBA_PORT5_CNTRL0x1228U
#define LBA_PORT6_CNTRL0x1230U
#define LBA_PORT7_CNTRL0x1238U
-#define LBA_HARD_FAIL0x40UL
+#define LBA_RESET_FUNCTION 0x01UL
+#define LBA_CLEAR_ERROR 0x10UL
+#define LBA_HARD_FAIL0x40UL
+#define LBA_RESET_COMPLETE 0x01UL
#define ROPE_PAGE_CONTROL 0x1418U
@@ -115,8 +118,11 @@
#define IOA_SUBORDINATE_BUS0x0059U
#define IOA_CONTROL0x0108U
-#define IOA_FORWARD_VGA 0x08UL
-#define IOA_HARD_FAIL0x40UL
+#define IOA_RESET_FUNCTION 0x01UL
+#define IOA_FORWARD_VGA 0x08UL
+#define IOA_CLEAR_ERROR 0x10UL
+#define IOA_HARD_FAIL0x40UL
+#define IOA_RESET_COMPLETE 0x01UL
#define IOA_LMMIO_BASE 0x0200U
#define IOA_LMMIO_MASK 0x0208U
@@ -132,12 +138,33 @@
#define IOA_ELMMIO_MASK0x0258U
#define IOA_EIOS_BASE 0x0260U
#define IOA_EIOS_MASK 0x0268U
-
+#define IOA_GLOBAL_MASK0x0270U
#define IOA_SLAVE_CONTROL 0x0278U
#define IOA_VGA_PEER_ENABLE 0x2000UL
#define IOA_MSI_BASE 0x0280U
#define IOA_MSI_MASK 0x0288U
+#define IOA_DMA_BASE 0x02B0U
+#define IOA_DMA_MASK 0x02B8U
+
+#define IOA_ERROR_CONFIG 0x0680U
+#define IOA_ERROR_PIOWRITE 0x0001UL
+#define IOA_ERROR_PIOREAD0x0002UL
+#define IOA_ERROR_DMAWRITE 0x0004UL
+#define IOA_ERROR_DMAREAD0x0008UL
+#define IOA_ERROR_CONFIG_MASTER 0x0010UL
+#define IOA_ERROR_SMART 0x0020UL
+#define IOA_ERROR_FATAL_SERR 0x0040UL
+#define IOA_ERROR_ASSERT_SERR0x0080UL
+/* ? 0x0100UL */
+#define IOA_ERROR_LOOPBACK 0x0200UL
+#define IOA_ERROR_CONFIG_TARGET 0x0400UL
+#define IOA_ERROR_IO_MASTER 0x0800UL
+#define IOA_ERROR_IO_TARGET 0x1000UL
+#define IOA_ERROR_MEM_MASTER 0x2000UL
+#define IOA_ERROR_MEM_TARGET 0x4000UL
+#define IOA_ERROR_HF_IO_FATAL0x8000UL
+
#define RANGE_ENABLE 0x01UL /* In various base registers */
#define IO_MASK((1UL << 16) - 1UL)
@@ -154,10 +181,15 @@
static CARD8 *pZX1mio = NULL,
*pZX1ioa = NULL;
-static INT8 zx1_ropemap[8]; /* One for each (potential) rope */
-static CARD64 zx1_lbacntl[8]; /* " " "" " */
+/* Per-rope data */
+static INT8 zx1_ropemap[8];
+static CARD32 zx1_pciids[8];
+static CARD64 zx1_lbacntl[8];
static intzx1_busno[8], zx1_subno[8];
+/* Array of Booleans for non-empty buses */
Bug#235331: Seems to be working now
I cannot understand what was the problem, but after the weekly dist-upgrade to today testing, then the problem seems solved. I will test it with more machines in the next few days and then close this bug. Bye, Giuseppe
Bug#237775: xserver-xfree86: radeon 9200: VGA/DVI head analog signal missing in dual head config
Michel Dänzer <[EMAIL PROTECTED]> writes: >> But frankly, I don't understand why. Does the TMDS specification imply >> a DVI output instead of analog output ? > > It's rather the other way around: analog connector implies treatment as > a CRT. As LCD display and LCD/DLP video projectors and getting affordable, I think that a lot of people are bound to make the same mistake. Shouldn't this be clearly stated in the doc ? Err, do you want a patch against /usr/X11R6/man/man4/radeon.4x.gz ? (This should be doable with my humble X skills) Thanks -- [EMAIL PROTECTED]
Processed: tagging 237878
Processing commands for [EMAIL PROTECTED]: > # Automatically generated email from bts, devscripts version 2.7.95.1 > # fixed in Debian X Strike Force XFree86 repository; to view, run "svn diff > -r 1149:1150 svn://necrotic.deadbeast.net/xfree86" > tags 237878 + pending Bug#237878: xdm: Xservers file should reflect XFree86 4.0's change from -bpp to -depth Tags were: patch Tags added: pending > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Processed: tagging 237877
Processing commands for [EMAIL PROTECTED]: > # Automatically generated email from bts, devscripts version 2.7.95.1 > tags 237877 - sid Bug#237877: xdm: stop passing '-dpi 100' option to X server by default Tags were: wontfix patch sid Tags removed: sid > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Processed: retitle 237877 to xdm: stop passing '-dpi 100' option to X server by default
Processing commands for [EMAIL PROTECTED]: > # Automatically generated email from bts, devscripts version 2.7.95.1 > retitle 237877 xdm: stop passing '-dpi 100' option to X server by default Bug#237877: should xdm still force a dpi 100 by default? 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)
Processed: tagging 237878
Processing commands for [EMAIL PROTECTED]: > # Automatically generated email from bts, devscripts version 2.7.95.1 > tags 237878 - sid Bug#237878: xdm: Xservers file should reflect XFree86 4.0's change from -bpp to -depth Tags were: patch sid Tags removed: sid > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Processed: retitle 237878 to xdm: Xservers file should reflect XFree86 4.0's change from -bpp to -depth
Processing commands for [EMAIL PROTECTED]: > # Automatically generated email from bts, devscripts version 2.7.95.1 > retitle 237878 xdm: Xservers file should reflect XFree86 4.0's change from > -bpp to -depth Bug#237878: xdm should reflect XFree86 4.0s change from -bpp to -depth 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: r1150 - in trunk/debian: . patches
Author: branden Date: 2004-03-16 02:30:32 -0500 (Tue, 16 Mar 2004) New Revision: 1150 Modified: trunk/debian/changelog trunk/debian/patches/905_debian_xdm.diff Log: Update examples and information in xdm's Xservers file to give sysadmins more detailed and accurate advice, and to use XFree86 4.x's "-depth" option in the examples instead of XFree86 3.x's "-bpp" option. Thanks to Frank Murphy for pointing out how long in the tooth this information had become. (Closes: #237878) Modified: trunk/debian/changelog === --- trunk/debian/changelog 2004-03-15 17:36:32 UTC (rev 1149) +++ trunk/debian/changelog 2004-03-16 07:30:32 UTC (rev 1150) @@ -18,8 +18,15 @@ (Closes: #236388) - debian/patches/075_elographics_improve_manpage.diff - -- Branden Robinson <[EMAIL PROTECTED]> Mon, 8 Mar 2004 16:52:27 -0500 + * Update examples and information in xdm's Xservers file to give sysadmins +more detailed and accurate advice, and to use XFree86 4.x's "-depth" +option in the examples instead of XFree86 3.x's "-bpp" option. Thanks to +Frank Murphy for pointing out how long in the tooth this information had +become. (Closes: #237878) +- debian/patches/905_debian_xdm.diff + -- Branden Robinson <[EMAIL PROTECTED]> Mon, 15 Mar 2004 13:29:17 -0500 + xfree86 (4.3.0-5) unstable; urgency=medium * Urgency due to fix for FTBFS on some architectures. Modified: trunk/debian/patches/905_debian_xdm.diff === --- trunk/debian/patches/905_debian_xdm.diff2004-03-15 17:36:32 UTC (rev 1149) +++ trunk/debian/patches/905_debian_xdm.diff2004-03-16 07:30:32 UTC (rev 1150) @@ -12,8 +12,8 @@ * config/Xres.cpp: report OS name in greeter widget * config/Xserv.ws.cpp: - add comments to help local admins -- run local server on default VT, with DPI setting forced to 100, and - TCP listening turned off for security +- run local server with DPI setting forced to 100 and TCP listening + turned off for security * config/Xsession: replace guts with simple call to Debian's Xsession script * config/xdm-conf.cpp: @@ -89,26 +89,35 @@ xlogin*namePrompt: \040\040\040\040\040\040\040Login: #endif /* XPM */ xlogin*fail: Login incorrect -diff -urN xc/programs/xdm~/config/Xserv.ws.cpp xc/programs/xdm/config/Xserv.ws.cpp xc/programs/xdm~/config/Xserv.ws.cpp 2001-01-17 18:45:24.0 -0500 -+++ xc/programs/xdm/config/Xserv.ws.cpp2003-02-23 18:29:33.0 -0500 -@@ -10,4 +10,16 @@ +--- xc/programs/xdm/config/Xserv.ws.cpp~ 2004-03-16 02:14:09.0 -0500 xc/programs/xdm/config/Xserv.ws.cpp2004-03-16 02:14:39.0 -0500 +@@ -10,4 +10,26 @@ XCOMM look like: XCOMM XTerminalName:0 foreign XCOMM -:0 local BINDIR/X DEFAULTVT +XCOMM When adding X servers, please keep the following things in mind: -+XCOMM - For each X server other than :0, the display number must be on the command -+XCOMM line. -+XCOMM - This is the place to add the -bpp option to the command line. -+XCOMM - It is wise to add the vtXX option to each local X server, since this is -+XCOMM the only sure way of knowing in advance which X server attaches to which ++XCOMM - If the X server's number is not zero, it must be passed to the X ++XCOMM server's command line as its first argument. ++XCOMM - When using the XFree86 X server, it is wise to add the vtXX ++XCOMM option to each local X server, since this is the only sure way ++XCOMM of knowing in advance which X server attaches to which virtual +XCOMM console. -+XCOMM - See the Xserver(1) manpage for a description of X server options. ++XCOMM - SECURITY NOTE: Always pass the "-nolisten tcp" option to the X ++XCOMM server, as shown in the examples below, unless you know you ++XCOMM need the X server listening on a TCP port. Omitting this ++XCOMM option can expose your X server to attacks from remote hosts. ++XCOMM Note also that SSH's X11 port-forwarding option works even with ++XCOMM X servers that do not listen on a TCP port, so you do not need ++XCOMM to remove the "-nolisten tcp" option for SSH's benefit. ++XCOMM - See the Xserver(1) manpage for a description of X server ++XCOMM options. If you are using the XFree86 X server, see the ++XCOMM XFree86(1) manpage for a description of options specific to it ++XCOMM (such as "-depth"). +XCOMM +XCOMM Examples for multiple local X displays: -+XCOMM :0 local BINDIR/X :0 vt9 -bpp 16 -+XCOMM :1 local BINDIR/X :1 vt10 -bpp 8 ++XCOMM :0 local BINDIR/X :0 vt9 -depth 15 -nolisten tcp ++XCOMM :1 local BINDIR/X :1 vt10 -depth 8 -nolisten tcp +:0 local BINDIR/X DEFAULTVT -dpi 100 -nolisten tcp diff -urN xc/programs/xdm~/config/Xsession xc/programs/xdm/config/Xsession --- xc/programs/xdm~/config/Xsession 2001-01-17 18:45:24.0 -0500
[PATCH] small backport from XFree86 CVS tree
The attached patch has been in the CVS tree for some time (not sure
when it was added, but it definitely has made into XFree86 v4.4.0) and
I was hoping that it could be applied to the Debian/{unstable,testing}
package as well. It shouldn't have any negative effect (in case it
isn't obvious: zx1 is HP's chipset for Itanium workstations, so the
patch definitely won't affect anything outside of ia64).
Thanks,
--david
diff -x '*.o' -urN
xfree86-4.3.0/build-tree/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
xfree86-4.3.0-davidm/build-tree/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
---
xfree86-4.3.0/build-tree/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
2004-03-15 21:51:16.255713536 -0800
+++
xfree86-4.3.0-davidm/build-tree/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
2004-03-15 14:08:39.113145471 -0800
@@ -372,6 +372,7 @@
#define PCI_CHIP_ZX1_SBA 0x1229
#define PCI_CHIP_ZX1_IOC 0x122A
#define PCI_CHIP_ZX1_LBA 0x122E /* a.k.a. Mercury */
+#define PCI_CHIP_ZX1_AGP8 0x12B4 /* a.k.a. QuickSilver */
/* SGS */
#define PCI_CHIP_STG2000 0x0008
diff -x '*.o' -urN
xfree86-4.3.0/build-tree/xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c
xfree86-4.3.0-davidm/build-tree/xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c
---
xfree86-4.3.0/build-tree/xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c
2003-02-23 12:26:49.0 -0800
+++
xfree86-4.3.0-davidm/build-tree/xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c
2004-03-15 14:56:24.346247527 -0800
@@ -97,7 +97,10 @@
#define LBA_PORT5_CNTRL0x1228U
#define LBA_PORT6_CNTRL0x1230U
#define LBA_PORT7_CNTRL0x1238U
-#define LBA_HARD_FAIL0x40UL
+#define LBA_RESET_FUNCTION 0x01UL
+#define LBA_CLEAR_ERROR 0x10UL
+#define LBA_HARD_FAIL0x40UL
+#define LBA_RESET_COMPLETE 0x01UL
#define ROPE_PAGE_CONTROL 0x1418U
@@ -115,8 +118,11 @@
#define IOA_SUBORDINATE_BUS0x0059U
#define IOA_CONTROL0x0108U
-#define IOA_FORWARD_VGA 0x08UL
-#define IOA_HARD_FAIL0x40UL
+#define IOA_RESET_FUNCTION 0x01UL
+#define IOA_FORWARD_VGA 0x08UL
+#define IOA_CLEAR_ERROR 0x10UL
+#define IOA_HARD_FAIL0x40UL
+#define IOA_RESET_COMPLETE 0x01UL
#define IOA_LMMIO_BASE 0x0200U
#define IOA_LMMIO_MASK 0x0208U
@@ -132,12 +138,33 @@
#define IOA_ELMMIO_MASK0x0258U
#define IOA_EIOS_BASE 0x0260U
#define IOA_EIOS_MASK 0x0268U
-
+#define IOA_GLOBAL_MASK0x0270U
#define IOA_SLAVE_CONTROL 0x0278U
#define IOA_VGA_PEER_ENABLE 0x2000UL
#define IOA_MSI_BASE 0x0280U
#define IOA_MSI_MASK 0x0288U
+#define IOA_DMA_BASE 0x02B0U
+#define IOA_DMA_MASK 0x02B8U
+
+#define IOA_ERROR_CONFIG 0x0680U
+#define IOA_ERROR_PIOWRITE 0x0001UL
+#define IOA_ERROR_PIOREAD0x0002UL
+#define IOA_ERROR_DMAWRITE 0x0004UL
+#define IOA_ERROR_DMAREAD0x0008UL
+#define IOA_ERROR_CONFIG_MASTER 0x0010UL
+#define IOA_ERROR_SMART 0x0020UL
+#define IOA_ERROR_FATAL_SERR 0x0040UL
+#define IOA_ERROR_ASSERT_SERR0x0080UL
+/* ? 0x0100UL */
+#define IOA_ERROR_LOOPBACK 0x0200UL
+#define IOA_ERROR_CONFIG_TARGET 0x0400UL
+#define IOA_ERROR_IO_MASTER 0x0800UL
+#define IOA_ERROR_IO_TARGET 0x1000UL
+#define IOA_ERROR_MEM_MASTER 0x2000UL
+#define IOA_ERROR_MEM_TARGET 0x4000UL
+#define IOA_ERROR_HF_IO_FATAL0x8000UL
+
#define RANGE_ENABLE 0x01UL /* In various base registers */
#define IO_MASK((1UL << 16) - 1UL)
@@ -154,10 +181,15 @@
static CARD8 *pZX1mio = NULL,
*pZX1ioa = NULL;
-static INT8 zx1_ropemap[8]; /* One for each (potential) rope */
-static CARD64 zx1_lbacntl[8]; /* " " "" " */
+/* Per-rope data */
+static INT8 zx1_ropemap[8];
+static CARD32 zx1_pciids[8];
+static CARD64 zx1_lbacntl[8];
static intzx1_busno[8], zx1_subno[8];
+/* Array of Booleans for non-empty buses */
+static INT8 zx1_busnmpt[MAX_PCI_BUSES];
+
static pciBusFuncs_t zx1BusFuncs;
static int zx1_fakebus = -1;
static Bool zx1_hasvga = FALSE;
@@ -290,7 +322,8 @@
* SLAVE_CONTROL register.
*/
tmp1 = MIO_QUAD(VGA_ROUTE);
- tmp2 = IOA_QUAD(ropenum, IOA_CONTROL);
+ tmp2 = IOA_QUAD(ropenum, IOA_CONTROL) &
+ ~(IOA_RESET_FUNCTION | IOA_CLEAR_ERROR);
if ((tmp1 & VGA_ENABLE) && ((tmp1 & 0x07UL) == ropenum)) {
current |= PCI_PCI_BRIDGE_VGA_EN;
if ((mask & PCI_PCI_BRIDGE_VGA_EN) &&
@@ -313,8 +346,9 @@
Re: X Strike Force XFree86 SVN commit: r1149 - trunk/debian
On Mon, Mar 15, 2004 at 12:36:34PM -0500, X Strike Force SVN Repository Admin wrote: > + + udev users will have "/dev/input/mousen" -- configure that as only mouse > +device? (see #237574) Interesting. The knoppix script actually sets up a single device in /dev to run everything through, but doesn't seem to use it. What it does instead is to put entries in for all the major mouse devices (usb,ps2,serial) and then uses the AllowMouseOpenFail option. I could easily add in the udev entry too. As a side note, I've been swamped with real life work lately, and have barely had time to update discover for the d-i beta3 release. Now that that's out of the way and my life seems to be close to calming down I'm going to try and finish hacking the knoppix script. Then I'm going to have to hack at the packaging to actually get it running. The only thing left to do in the knoppix script is figure out the monitor resolution stuff. Anyhow, that's where I'm at now, just in case you're wondering what the hell happened to me. - David Nusinow
