Bugzilla Bug 89624

/etc/X11/xinit/xinitrc reads the wrong global Xmodmap file. it reads
/etc/X11/.Xmodmap, but google says it should read /etc/X11/Xmodmap

I am assuming this applies to Xresources too.

bug #79998 may be related to this

the header of my xinitrc reads:

# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $

does this indicate that this bug should go upstream to Xorg? or is xinit a
distro-specific thing?

here's a short patch:

--- xinitrc.orig        2005-04-19 01:00:24.000000000 -0700
+++ xinitrc     2005-04-19 01:01:41.000000000 -0700
@@ -4,8 +4,8 @@
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
 xinitdir=/usr/X11R6/lib/X11/xinit
-sysresources=$xinitdir/.Xresources
-sysmodmap=$xinitdir/.Xmodmap
+sysresources=$xinitdir/Xresources
+sysmodmap=$xinitdir/Xmodmap

 # merge in defaults and keymaps


Reproducible: Always
Steps to Reproduce:
1. add some stuff to /etc/X11/Xmodmap
2. startx or xinit
3. watch your changes not work

Actual Results:  
xmodmap commands are not performed

Expected Results:  
xmodmap commands should be performed, but are not b/c xinitrc reads the wrong
file.

Portage 2.0.51.19 (default-linux/amd64/2005.0, gcc-3.4.3,
glibc-2.3.4.20041102-r1, 2.6.11-gentoo-r6 x86_64)
=================================================================
System uname: 2.6.11-gentoo-r6 x86_64 AMD Athlon(tm) 64 Processor 3200+
Gentoo Base System version 1.4.16
Python:              dev-lang/python-2.3.4-r1 [2.3.4 (#1, Mar 16 2005,
19:19:16)]
distcc 2.18.3 x86_64-pc-linux-gnu (protocols 1 and 2) (default port 3632)
[disabled]
dev-lang/python:     2.3.4-r1
sys-devel/autoconf:  2.59-r6, 2.13
sys-devel/automake:  1.7.9-r1, 1.8.5-r3, 1.5, 1.4_p6, 1.6.3, 1.9.4
sys-devel/binutils:  2.15.92.0.2-r7
sys-devel/libtool:   1.5.14
virtual/os-headers:  2.6.8.1-r4
ACCEPT_KEYWORDS="amd64"
AUTOCLEAN="yes"
CFLAGS="-O2 -march=athlon64 -pipe -fomit-frame-pointer"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3.3/env
/usr/kde/3.3/share/config /usr/kde/3.3/shutdown /us
r/kde/3.4/env /usr/kde/3.4/share/config /usr/kde/3.4/shutdown
/usr/kde/3/share/config /usr/lib/X11/xkb /usr/share
/config /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"
CXXFLAGS="-O2 -march=athlon64 -pipe -fomit-frame-pointer"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs autoconfig ccache distlocks sandbox strict"
GENTOO_MIRRORS="http://gentoo.ccccom.com
ftp://ftp.ucsb.edu/pub/mirrors/linux/gentoo/ http://gentoo.osuosl.org/"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="amd64 X aac aalib acpi alsa avi bash-completion berkdb bitmap-fonts cd
cdparanoia cdr crypt cups curl direct
fb dvd dvdr dvdread encode escreen esd fam fbcon flac font-server foomaticdb
fortran gif glut gpm gtk gtk2 imlib 
ipv6 jack java jikes jp2 jpeg junit kdeenablefinal lzw lzw-tiff mad matroska
motif mozilla mp3 mpeg ncurses netwo
rk nls nptl nptlonly nvidia ogg oggvorbis opengl oss pam perl pic png ppds
python qt quicktime readline samba sdl
 spell ssl tcpd tiff truetype truetype-fonts type1-fonts usb userlocales vorbis
xine xinerama xml2 xmms xpm xprin
t xrandr xv xvid zlib video_cards_nvidia"
Unset:  ASFLAGS, CBUILD, CTARGET, LANG, LC_ALL, LDFLAGS, LINGUAS

I'm probably just wrong about this, so let's clean up.

No, you're right.

Fixed in modular.