diff -Naur MAKEDEV-3.3.1.old/makedev.d/00macros MAKEDEV-3.3.1/makedev.d/00macros
--- MAKEDEV-3.3.1.old/makedev.d/00macros	2002-03-28 20:40:30 +0300
+++ MAKEDEV-3.3.1/makedev.d/00macros	2002-11-21 19:04:21 +0300
@@ -1,14 +1,17 @@
 =ALLREAD  644 root root
 =ALLWRITE 666 root root
+=ALLGROUP 660 root root
 =FLOPPY   660 root floppy
 =KMEM     640 root kmem	 
 =PRINTER  660 root lp
-=PTY      666 root tty
+=PTY      620 root tty
 =ROOT     600 root root
 =SERIAL   660 root uucp
 =STORAGE  660 root disk
+=CDWRITER 660 root cdwriter
 =TTY      620 root tty
-=VCSA     620 vcsa tty
+=X10      660 root x10
+=AUDIO    660 root audio
 
 # Define "console" as an alias for root for specifying input devices and such.
 =CONSOLE  $ROOT
diff -Naur MAKEDEV-3.3.1.old/makedev.d/linux-2.2.x MAKEDEV-3.3.1/makedev.d/linux-2.2.x
--- MAKEDEV-3.3.1.old/makedev.d/linux-2.2.x	2001-07-17 02:03:44 +0400
+++ MAKEDEV-3.3.1/makedev.d/linux-2.2.x	2002-11-21 19:06:55 +0300
@@ -13,22 +13,22 @@
 b 660 root     disk      1   0  1 128 ram%d
 b 660 root     disk      1 250  1   1 initrd
 
-c 666 root     tty       2   0  1  16 ptyp%x
-c 666 root     tty       2  16  1  16 ptyq%x
-c 666 root     tty       2  32  1  16 ptyr%x
-c 666 root     tty       2  48  1  16 ptys%x
-c 666 root     tty       2  64  1  16 ptyt%x
-c 666 root     tty       2  80  1  16 ptyu%x
-c 666 root     tty       2  96  1  16 ptyv%x
-c 666 root     tty       2 112  1  16 ptyw%x
-c 666 root     tty       2 128  1  16 ptyx%x
-c 666 root     tty       2 144  1  16 ptyy%x
-c 666 root     tty       2 160  1  16 ptyz%x
-c 666 root     tty       2 176  1  16 ptya%x
-c 666 root     tty       2 192  1  16 ptyb%x
-c 666 root     tty       2 208  1  16 ptyc%x
-c 666 root     tty       2 224  1  16 ptyd%x
-c 666 root     tty       2 240  1  16 ptye%x
+c 620 root     tty       2   0  1  16 ptyp%x
+c 620 root     tty       2  16  1  16 ptyq%x
+c 620 root     tty       2  32  1  16 ptyr%x
+c 620 root     tty       2  48  1  16 ptys%x
+c 620 root     tty       2  64  1  16 ptyt%x
+c 620 root     tty       2  80  1  16 ptyu%x
+c 620 root     tty       2  96  1  16 ptyv%x
+c 620 root     tty       2 112  1  16 ptyw%x
+c 620 root     tty       2 128  1  16 ptyx%x
+c 620 root     tty       2 144  1  16 ptyy%x
+c 620 root     tty       2 160  1  16 ptyz%x
+c 620 root     tty       2 176  1  16 ptya%x
+c 620 root     tty       2 192  1  16 ptyb%x
+c 620 root     tty       2 208  1  16 ptyc%x
+c 620 root     tty       2 224  1  16 ptyd%x
+c 620 root     tty       2 240  1  16 ptye%x
 
 b 660 root     floppy    2   0  1   4 fd%d 0
 b 660 root     floppy    2 128  1   4 fd%d 4
@@ -100,22 +100,22 @@
 b 660 root     floppy    2   4  1   4 fd%dCompaQ 0
 b 660 root     floppy    2 132  1   4 fd%dCompaQ 4
 
-c 666 root     tty       3   0  1  16 ttyp%x
-c 666 root     tty       3  16  1  16 ttyq%x
-c 666 root     tty       3  32  1  16 ttyr%x
-c 666 root     tty       3  48  1  16 ttys%x
-c 666 root     tty       3  64  1  16 ttyt%x
-c 666 root     tty       3  80  1  16 ttyu%x
-c 666 root     tty       3  96  1  16 ttyv%x
-c 666 root     tty       3 112  1  16 ttyw%x
-c 666 root     tty       3 128  1  16 ttyx%x
-c 666 root     tty       3 144  1  16 ttyy%x
-c 666 root     tty       3 160  1  16 ttyz%x
-c 666 root     tty       3 176  1  16 ttya%x
-c 666 root     tty       3 192  1  16 ttyb%x
-c 666 root     tty       3 208  1  16 ttyc%x
-c 666 root     tty       3 224  1  16 ttyd%x
-c 666 root     tty       3 240  1  16 ttye%x
+c 620 root     tty       3   0  1  16 ttyp%x
+c 620 root     tty       3  16  1  16 ttyq%x
+c 620 root     tty       3  32  1  16 ttyr%x
+c 620 root     tty       3  48  1  16 ttys%x
+c 620 root     tty       3  64  1  16 ttyt%x
+c 620 root     tty       3  80  1  16 ttyu%x
+c 620 root     tty       3  96  1  16 ttyv%x
+c 620 root     tty       3 112  1  16 ttyw%x
+c 620 root     tty       3 128  1  16 ttyx%x
+c 620 root     tty       3 144  1  16 ttyy%x
+c 620 root     tty       3 160  1  16 ttyz%x
+c 620 root     tty       3 176  1  16 ttya%x
+c 620 root     tty       3 192  1  16 ttyb%x
+c 620 root     tty       3 208  1  16 ttyc%x
+c 620 root     tty       3 224  1  16 ttyd%x
+c 620 root     tty       3 240  1  16 ttye%x
 
 b 660 root     disk      3   0  1  64 hda
 b 660 root     disk      3  64  1  64 hdb
@@ -231,7 +231,7 @@
 c 660 root     root     10 180  1   1 vrbuttons
 
 c 660 root     root     11   0  1   1 kbd
-b 660 root     disk     11   0  1  32 sr%d
+b 660 root     cdwriter     11   0  1  32 sr%d
 
 c 660 root     disk     12   2  1   1 ntpqic11
 c 660 root     disk     12   3  1   1 tpqic11
@@ -253,25 +253,26 @@
 b 660 root     disk     13   0  1  64 xda
 b 660 root     disk     13  64  1  64 xdb
 
-c 600 root     sys      14   0  1   1 mixer
-c 666 root     sys      14   1  1   1 sequencer
-c 600 root     sys      14   2  1   1 midi00
-c 600 root     sys      14   3  1   1 dsp
-c 600 root     sys      14   4  1   1 audio
+c 640 root     audio     14   0  1   1 mixer
+c 640 root     audio      14   1  1   1 sequencer
+c 640 root     audio      14   2  1   1 midi00
+c 640 root     audio      14   3  1   1 dsp
+c 640 root     audio      14   4  1   1 audio
+
 # Where did 5 go?
-c 644 root     sys      14   6  1   1 sndstat
-c 600 root     sys      14   7  1   1 audioctl
-c 600 root     sys      14   8  1   1 sequencer2
-
-c 600 root     sys      14  16  1   1 mixer1
-c 600 root     sys      14  17  1   1 patmgr0
-c 600 root     sys      14  18  1   1 midi01
-c 600 root     sys      14  19  1   1 dsp1
-c 600 root     sys      14  20  1   1 audio1
-
-c 600 root     sys      14  33  1   1 patmgr1
-c 600 root     sys      14  34  1   1 midi02
-c 600 root     sys      14  50  1   1 midi03
+c 644 root     audio      14   6  1   1 sndstat
+c 640 root     audio      14   7  1   1 audioctl
+c 640 root     audio      14   8  1   1 sequencer2
+
+c 640 root     audio      14  16  1   1 mixer1
+c 640 root     audio      14  17  1   1 patmgr0
+c 640 root     audio      14  18  1   1 midi01
+c 640 root     audio      14  19  1   1 dsp1
+c 640 root     audio      14  20  1   1 audio1
+
+c 640 root     audio      14  33  1   1 patmgr1
+c 640 root     audio      14  34  1   1 midi02
+c 640 root     audio      14  50  1   1 midi03
 
 b 660 root     root     14   0  1  64 dos_hda
 b 660 root     root     14  64  1  64 dos_hdb
@@ -299,7 +300,7 @@
 c 660 root     uucp     20   0  1  32 cub%d
 b 660 root     disk     20   0  1   1 hitcd
 
-c 600 root     sys      21   0  1  32 sg%d
+c 600 root     cdwriter      21   0  1  32 sg%d
 b 660 root     root     21   0  1  64 mfma
 b 660 root     root     21  64  1  64 mfmb
 
@@ -382,9 +383,9 @@
 b 660 root     disk     34   0  1  64 hdg
 b 660 root     disk     34  64  1  64 hdh
 
-c 600 root     sys      35   0  1   4 midi%d
-c 600 root     sys      35  64  1   4 rmidi%d
-c 600 root     sys      35 128  1   4 smpte%d
+c 640 root     audio    35   0  1   4 midi%d
+c 640 root     audio    35  64  1   4 rmidi%d
+c 640 root     audio    35 128  1   4 smpte%d
 b 600 root     root     35   0  1   1 slram
 
 c 600 root     sys      36   0  1   1 route
@@ -830,7 +831,7 @@
 
 b 660 root     root     96   0  8   4 msd%d
 
-c 600 root     sys      97   0  1   4 pg%d
+c 600 root     cdwriter 97   0  1   4 pg%d
 c 660 root     root     98   0  1   4 comedi%d
 c 660 root     daemon   99   0  1   8 parport%d
 c 660 root     root    100   0  1   8 phone%d
@@ -869,15 +870,15 @@
 
 c 660 root     root    144   0  1  64 pppox%d
 
-c 600 root     sys     145   0 64   4 sam%d_mixer
-c 600 root     sys     145   1 64   4 sam%d_sequencer
-c 600 root     sys     145   2 64   4 sam%d_midi00
-c 600 root     sys     145   3 64   4 sam%d_dsp
-c 600 root     sys     145   4 64   4 sam%d_audio
-c 600 root     sys     145   6 64   4 sam%d_sndstat
-c 600 root     sys     145  18 64   4 sam%d_midi01
-c 600 root     sys     145  34 64   4 sam%d_midi02
-c 600 root     sys     145  50 64   4 sam%d_midi03
+c 640 root     audio     145   0 64   4 sam%d_mixer
+c 640 root     audio     145   1 64   4 sam%d_sequencer
+c 640 root     audio     145   2 64   4 sam%d_midi00
+c 640 root     audio     145   3 64   4 sam%d_dsp
+c 640 root     audio     145   4 64   4 sam%d_audio
+c 640 root     audio     145   6 64   4 sam%d_sndstat
+c 640 root     audio     145  18 64   4 sam%d_midi01
+c 640 root     audio     145  34 64   4 sam%d_midi02
+c 640 root     audio     145  50 64   4 sam%d_midi03
 
 c 660 root     root    146   0  1   8 scramnet%d
 c 660 root     root    147   0  1   8 aureal%d
diff -Naur MAKEDEV-3.3.1.old/makedev.d/linux-2.4.x MAKEDEV-3.3.1/makedev.d/linux-2.4.x
--- MAKEDEV-3.3.1.old/makedev.d/linux-2.4.x	2002-05-10 01:35:54 +0400
+++ MAKEDEV-3.3.1/makedev.d/linux-2.4.x	2002-11-21 20:41:15 +0300
@@ -10,11 +10,10 @@
 c $ALLWRITE              1   3  1   1 null
 c $KMEM                  1   4  1   1 port
 c $ALLWRITE              1   5  1   1 zero
-c $ROOT                  1   6  1   1 core
 c $ALLWRITE              1   7  1   1 full
 c $ALLREAD               1   8  1   1 random
 c $ALLREAD               1   9  1   1 urandom
-c $ALLREAD               1  10  1   1 vsys
+c $ALLWRITE              1  10  1   1 vsys
 
 b $STORAGE               1   0  1 128 ram%d
 b $STORAGE               1 250  1   1 initrd
@@ -137,8 +136,8 @@
 
 c $PRINTER               6   0  1   4 lp%d
 
-c $VCSA                  7   0  1  64 vcs
-c $VCSA                  7 128  1  64 vcsa
+c $TTY                   7   0  1  64 vcs
+c $TTY                   7 128  1  64 vcsa
 
 b $STORAGE               7   0  1  16 loop%d
 
@@ -183,9 +182,7 @@
 c $CONSOLE              10   9  1   1 pc110pad
 c $CONSOLE              10  10  1   1 adbmouse
 c $CONSOLE              10  11  1   1 vrtpanel
-
 # Where did 12 go?
-
 c $CONSOLE              10  13  1   1 vpcmouse
 c $CONSOLE              10  14  1   1 touchscreen/ucb1x00
 c $CONSOLE              10  15  1   1 touchscreen/mk712
@@ -198,9 +195,7 @@
 c $ROOT                 10 133  1   1 exttrp
 c $ROOT                 10 134  1   1 apm_bios
 c $ALLREAD              10 135  1   1 rtc
-
 # Where did 136, 137, and 138 go?
-
 c $ROOT                 10 139  1   1 openprom
 c $ROOT                 10 140  1   1 relay8
 c $ROOT                 10 141  1   1 relay16
@@ -267,10 +267,6 @@
 
 # Where did 202 and 203 go?
 
-c $CONSOLE              10 204  1   1 video/em8300
-c $CONSOLE              10 205  1   1 video/em8300_mv
-c $CONSOLE              10 206  1   1 video/em8300_ma
-c $CONSOLE              10 207  1   1 video/em8300_sp
 c $ROOT                 10 208  1   1 compaq/cpqphpc
 c $ROOT                 10 209  1   1 compaq/cpqrid
 c $ROOT                 10 210  1   1 impi/bt
@@ -291,9 +286,14 @@
 c $ROOT                 10 220  1   1 mptctl
 c $ROOT                 10 221  1   1 mvista/hssdsi
 c $ROOT                 10 222  1   1 mvista/hasi
+c $ALLWRITE             10 250  1   1 vhci
+c $ROOT			10 254  1   1 mbuff
+ 
+c $ROOT                218   0  1  16 logicalco/bci/%d
+c $ROOT                219   0  1  16 logicalco/dci1300/%d
 
 c $CONSOLE              11   0  1   1 kbd
-b $STORAGE              11   0  1  32 scd%d
+b $CDWRITER              11   0  1  32 sr%d
 
 c $STORAGE              12   2  1   1 ntpqic11
 c $STORAGE              12   3  1   1 tpqic11
@@ -314,27 +313,25 @@
 b $STORAGE              13   0  1  64 xda
 b $STORAGE              13  64  1  64 xdb
 
-c $CONSOLE              14   0  1   1 mixer
-c $CONSOLE              14   1  1   1 sequencer
-c $CONSOLE              14   2  1   1 midi00
-c $CONSOLE              14   3  1   1 dsp
-c $CONSOLE              14   4  1   1 audio
-
+c $AUDIO              14   0  1   1 mixer
+c $AUDIO              14   1  1   1 sequencer
+c $AUDIO              14   2  1   1 midi00
+c $AUDIO              14   3  1   1 dsp
+c $AUDIO              14   4  1   1 audio
 # Where did 5 go?
-
-c $CONSOLE              14   6  1   1 sndstat
-c $CONSOLE              14   7  1   1 audioctl
-c $CONSOLE              14   8  1   1 sequencer2
-
-c $CONSOLE              14  16  1   1 mixer1
-c $CONSOLE              14  17  1   1 patmgr0
-c $CONSOLE              14  18  1   1 midi01
-c $CONSOLE              14  19  1   1 dsp1
-c $CONSOLE              14  20  1   1 audio1
-
-c $CONSOLE              14  33  1   1 patmgr1
-c $CONSOLE              14  34  1   1 midi02
-c $CONSOLE              14  50  1   1 midi03
+c $AUDIO              14   6  1   1 sndstat
+c $AUDIO              14   7  1   1 audioctl
+c $AUDIO              14   8  1   1 sequencer2
+
+c $AUDIO              14  16  1   1 mixer1
+c $AUDIO              14  17  1   1 patmgr0
+c $AUDIO              14  18  1   1 midi01
+c $AUDIO              14  19  1   1 dsp1
+c $AUDIO              14  20  1   1 audio1
+
+c $AUDIO              14  33  1   1 patmgr1
+c $AUDIO              14  34  1   1 midi02
+c $AUDIO              14  50  1   1 midi03
 
 b $STORAGE              14   0  1  17 dos_hda
 b $STORAGE              14  64  1  17 dos_hdb
@@ -345,8 +342,6 @@
 l                                     js1 input/js1
 l                                     js2 input/js2
 l                                     js3 input/js3
-
-# Replaced with symlinks to input core joystick devices (see usb).
 #c $CONSOLE              15   0  1 128 js%d
 #c $CONSOLE              15 128  1 128 djs%d
 
@@ -368,7 +363,7 @@
 c $SERIAL               20   0  1  32 cub%d
 b $STORAGE              20   0  1   1 hitcd
 
-c $STORAGE              21   0  1  32 sg%d
+c $CDWRITER               21   0  1  32 sg%d
 b $STORAGE              21   0  1  64 mfma
 b $STORAGE              21  64  1  64 mfmb
 
@@ -469,9 +464,9 @@
 b $STORAGE              34   0  1  33 hdg
 b $STORAGE              34  64  1  33 hdh
 
-c $CONSOLE              35   0  1   4 midi%d
-c $CONSOLE              35  64  1   4 rmidi%d
-c $CONSOLE              35 128  1   4 smpte%d
+c $AUDIO              35   0  1   4 midi%d
+c $AUDIO              35  64  1   4 rmidi%d
+c $AUDIO              35 128  1   4 smpte%d
 b $STORAGE              35   0  1   1 slram
 
 c $ROOT                 36   0  1   1 route
@@ -495,8 +490,6 @@
 c $ROOT                 39  49  1   3 ml16pb-c%d
 
 c $CONSOLE              40   0  1   1 mmetfgrab
-
-# Obsolete (see devices.txt).
 #b $ROOT                 40   0  1  16 eza
 
 c $ROOT                 41   0  1   1 yamm
@@ -565,11 +558,13 @@
 c $SERIAL               58   0  1  16 cup%d
 
 c $ROOT                 59   0  1   1 firewall
-
-# Conflicts with parallel-port disks (see devices.txt).
 #b $STORAGE              59   0  1   8 pda%d
 #b $STORAGE              59   0  1   8 rpda%d
 
 # Here there be dragons.
 
+c $SERIAL		 62  64  1   1 ttyLT0
+c $SERIAL               62  79  1   1 ttyPCT
+c $SERIAL		 62  83  1   1 ttyINT
+
 c $ROOT                 64   0  1   1 enskip
@@ -931,7 +922,7 @@
 
 b $STORAGE              96   0  1   8 msd%d
 
-c $STORAGE              97   0  1   4 pg%d
+c $CDWRITER             97   0  1   4 pg%d
 b $STORAGE              97   0  1   4 pktcdvd%d
 
 c $ROOT                 98   0  1   4 comedi%d
@@ -1054,7 +1045,8 @@
 c $ROOT                114   0  1  16 ise%d
 c $ROOT                114 128  1  16 isex%d
 
-c $PRINTER             115   0  1   8 tipar%d
+c $CONSOLE             115   0  1   1 speaker
+# c $PRINTER             115   0  1   8 tipar%d
 c $SERIAL              115   8  1   8 tiser%d
 c $ROOT                115  16  1  16 tiusb%d
 b $STORAGE             115   0  1 256 nwfs/v%d
@@ -1077,6 +1073,18 @@
 
 c $ROOT                119   0  1  16 vnet%d
 
+c $ROOT                121   0  1  6  rtsock%d
+
+# H+/DXR3
+c $CONSOLE             121   0  4   2 em8300-%d
+c $CONSOLE             121   1  4   2 em8300_mv-%d
+c $CONSOLE             121   2  4   2 em8300_ma-%d
+c $CONSOLE             121   3  4   2 em8300_sp-%d
+l em8300 em8300-0
+l em8300_mv em8300_mv-0
+l em8300_ma em8300_ma-0
+l em8300_sp em8300_sp-0
+
 b $STORAGE             128   0  1  16 sddy
 b $STORAGE             128  16  1  16 sddz
 b $STORAGE             128  32  1  16 sdea
@@ -1223,18 +1215,18 @@
 
 c $ROOT                144   0  1  64 pppox%d
 
-c $CONSOLE             145   0 64   4 sam%d_mixer
-c $CONSOLE             145   1 64   4 sam%d_sequencer
-c $CONSOLE             145   2 64   4 sam%d_midi00
-c $CONSOLE             145   3 64   4 sam%d_dsp
-c $CONSOLE             145   4 64   4 sam%d_audio
-c $CONSOLE             145   6 64   4 sam%d_sndstat
-c $CONSOLE             145  18 64   4 sam%d_midi01
-c $CONSOLE             145  34 64   4 sam%d_midi02
-c $CONSOLE             145  50 64   4 sam%d_midi03
+c $AUDIO             145   0 64   4 sam%d_mixer
+c $AUDIO             145   1 64   4 sam%d_sequencer
+c $AUDIO             145   2 64   4 sam%d_midi00
+c $AUDIO             145   3 64   4 sam%d_dsp
+c $AUDIO             145   4 64   4 sam%d_audio
+c $AUDIO             145   6 64   4 sam%d_sndstat
+c $AUDIO             145  18 64   4 sam%d_midi01
+c $AUDIO             145  34 64   4 sam%d_midi02
+c $AUDIO             145  50 64   4 sam%d_midi03
 
 c $ROOT                146   0  1   8 scramnet%d
-c $CONSOLE             147   0  1   8 aureal%d
+c $AUDIO             147   0  1   8 aureal%d
 
 c $SERIAL              148   0  1  16 ttyT%d
 c $SERIAL              149   0  1  16 cut%d
@@ -1240,7 +1243,7 @@
 c $SERIAL              148   0  1  16 ttyT%d
 c $SERIAL              149   0  1  16 cut%d
 
-c $ROOT                150   0  1  16 rtf%d
+c $ROOT                150   0  1  64 rtf%d
 
 c $STORAGE             151   0  1  16 dpti%d
 
@@ -1399,8 +1404,14 @@
 
 c $SERIAL              211   0  1   8 addinum/cpci1500/%d
 
+c $SERIAL              242   0  1   4 slamr%d
+l                                    ttySL0 slamr0
+
 c $SERIAL              216   0  1  16 ttyUB%d
 c $SERIAL              217   0  1  16 cuub%d
+l                                    rfcomm0 ttyUB0
+l                                    rfcomm1 ttyUB1
+l                                    rfcomm2 ttyUB2
 
 c $ROOT                218   0  1  16 logicalco/bci/%d
 c $ROOT                219   0  1  16 logicalco/dci1300/%d
diff -Naur MAKEDEV-3.3.1.old/makedev.d/mandrake MAKEDEV-3.3.1/makedev.d/mandrake
--- MAKEDEV-3.3.1.old/makedev.d/mandrake	1970-01-01 03:00:00 +0300
+++ MAKEDEV-3.3.1/makedev.d/mandrake	2002-11-21 20:35:56 +0300
@@ -0,0 +1,38 @@
+c $X10		11   0		1  3 x10-%d
+c $ALLGROUP	10   139	1  1 openrom 
+
+c $AUDIO 14   14       16  4   admmidi%d
+c $AUDIO 14   13       16  4   amidi%d
+c $AUDIO 14   12       16  4   adsp%d
+c $AUDIO 116  0        32  4   aload%d
+c $AUDIO 116  1        1   1   aloadSEQ
+c $AUDIO 14   8        1   1   music
+c $AUDIO 14   10       16  4   dmfm%d
+c $AUDIO 14   9        16  4   dmmidi%d
+
+c $ROOT    10  198  1   1 sheep_net
+
+c $ROOT    61 0  1   1 lirc
+
+l amidi amidi0
+l adsp adsp0
+l video video0
+l snd ../proc/asound/dev
+l usbmouse input/mouse0
+
+a alsa dmfm
+a alsa admmidi
+a alsa amidi
+a alsa adsp
+a alsa aload
+a alsa snd
+a alsa music
+a alsa dmfm
+a alsa dmmidi
+
+a mandrake x10
+a mandrake openrom
+l aloadC0 aload0
+l aloadC1 aload1
+l aloadC2 aload2
+l aloadC3 aload3
diff -Naur MAKEDEV-3.3.1.old/makedev.d/redhat MAKEDEV-3.3.1/makedev.d/redhat
--- MAKEDEV-3.3.1.old/makedev.d/redhat	2002-05-10 00:04:16 +0400
+++ MAKEDEV-3.3.1/makedev.d/redhat	2002-11-21 20:26:58 +0300
@@ -40,6 +40,9 @@
 c $CONSOLE              10   3  1   1 atimouse
 c $CONSOLE              10   4  1   1 jmouse
 
+# The spec says sr%d, but...
+b $CDWRITER             11   0  1  32 scd%d
+
 # Tape device names that should probably be symlinks, too.
 c $STORAGE              12   6  1   1 rmt8
 c $STORAGE              12   8  1   1 rmt16
diff -Naur MAKEDEV-3.3.1.old/makedev.d/s390 MAKEDEV-3.3.1/makedev.d/s390
--- MAKEDEV-3.3.1.old/makedev.d/s390	2002-05-27 15:08:02 +0400
+++ MAKEDEV-3.3.1/makedev.d/s390	2002-11-21 19:34:45 +0300
@@ -13,7 +13,7 @@
 c $ALLWRITE              1   7  1   1 full
 c $ALLREAD               1   8  1   1 random
 c $ALLREAD               1   9  1   1 urandom
-c $ALLREAD               1  10  1   1 vsys
+c $ALLWRITE              1  10  1   1 aio
 
 b $STORAGE               1   0  1 128 ram%d
 b $STORAGE               1 250  1   1 initrd
diff -Naur MAKEDEV-3.3.1.old/makedev.d/std MAKEDEV-3.3.1/makedev.d/std
--- MAKEDEV-3.3.1.old/makedev.d/std	2002-05-10 00:04:16 +0400
+++ MAKEDEV-3.3.1/makedev.d/std	2001-01-18 05:15:31 +0300
@@ -21,6 +21,7 @@
 l nfsd socksys
 l X0R null
 
+l core ../proc/kcore
 l ramdisk ram0
 l ftape qft0
 l bttv0 video0
diff -Naur MAKEDEV-3.3.1.old/MAKEDEV.spec MAKEDEV-3.3.1/MAKEDEV.spec
--- MAKEDEV-3.3.1.old/MAKEDEV.spec	2002-09-20 20:06:15 +0400
+++ MAKEDEV-3.3.1/MAKEDEV.spec	2002-11-21 20:29:55 +0300
@@ -22,8 +22,7 @@
 %package -n dev
 Group: System Environment/Base
 Summary: The most commonly-used entries in the /dev directory.
-Prereq: /usr/sbin/groupadd, /usr/sbin/useradd
-Prereq: /bin/mkdir, sed, textutils, fileutils, mktemp
+Prereq: /usr/sbin/groupadd, /bin/mkdir, sed, textutils, fileutils, mktemp
 
 %description -n dev
 The Red Hat Linux operating system uses file system entries to represent
@@ -55,8 +54,8 @@
 	-c $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d \
 	-d $RPM_BUILD_ROOT/dev -M $@ | sed "s|$RPM_BUILD_ROOT||g" >> manifest
 }
-rm -fr $RPM_BUILD_ROOT
-rm -f  manifest
+
+rm -fr $RPM_BUILD_ROOT manifest
 
 %ifnarch s390 s390x
 %makeinstall devdir=$RPM_BUILD_ROOT/dev
@@ -138,7 +137,7 @@
 makedev video1394
 makedev vmmon
 makedev -m 4 vnet
-makedev vsys
+#makedev aio
 makedev -m 4 winradio
 makedev xda
 makedev xdb
@@ -242,8 +241,6 @@
 	/bin/mkdir /dev
 fi
 /usr/sbin/groupadd -g 19 -r -f floppy > /dev/null 2>/dev/null ||:
-/usr/sbin/useradd -c "virtual console memory owner" -u 69 \
-	-s /sbin/nologin -r -d /dev vcsa 2> /dev/null || :
 exit 0
 
 %post -n dev
@@ -322,12 +319,6 @@
 - build the tunnelling device (/dev/net/tun)
 - add configuration for libraw1394 (#67203)
 
-* Tue Jul 09 2002 Florian La Roche <Florian.LaRoche@redhat.de>
-- fix SPARC build, patch from Jakub Jelinek <jakub@redhat.com>
-
-* Tue May 28 2002 Nalin Dahyabhai <nalin@redhat.com> 3.3-7
-- rebuild
-
 * Thu May 16 2002 Nalin Dahyabhai <nalin@redhat.com> 3.3-6
 - build 32 scsi generic devices
 - add cfs device used by coda
@@ -340,41 +331,17 @@
 - resync with current LANANA updates, heads-up from John Cagle
 - create kpoll and 16 scramdisk devices
 
-* Thu Apr 11 2002 Nalin Dahyabhai <nalin@redhat.com> 3.3-4
-- build the package the same way for the superuser as we did before,
-  preventing problems when building as root when some of the device
-  owners don't exist on the build host
-
-* Thu Mar 28 2002 Nalin Dahyabhai <nalin@redhat.com> 3.3-3
-- set the /dev/vcs* devices to be owned by the vcsa user, and create the
-  vcsa user
-
-* Tue Mar 19 2002 Nalin Dahyabhai <nalin@redhat.com> 3.3-2
-- rebuild
-
 * Tue Mar 19 2002 Nalin Dahyabhai <nalin@redhat.com> 3.3-1
 - handle a step of 0 when creating multiple nodes
 - add /dev/cpu/*/microcode (perms 0600) to the dev package
 
-* Thu Feb 21 2002 Nalin Dahyabhai <nalin@redhat.com> 3.2-12
-- rebuild
-
 * Thu Jan 31 2002 Nalin Dahyabhai <nalin@redhat.com> 3.2-11
 - up the limit on ide devices (hda through hdt) back up from 17 to 33 -- I'm
   told it works now
 
-* Mon Jan 21 2002 Nalin Dahyabhai <nalin@redhat.com> 3.2-10
-- build for Raw Hide
-
 * Mon Jan 21 2002 Nalin Dahyabhai <nalin@redhat.com> 3.2-9
 - actually create the vsys device
 
-* Mon Jan 21 2002 Nalin Dahyabhai <nalin@redhat.com> 3.2-8
-- build for Raw Hide
-
-* Mon Jan 21 2002 Nalin Dahyabhai <nalin@redhat.com> 3.2-7
-- aio/vsys rename courtesy of Ben LaHaise
-
 * Thu Aug 30 2001 Nalin Dahyabhai <nalin@redhat.com> 3.2-6
 - fix markup errors in the man page (no bug ID, reported by
   esr@snark.thyrsus.com)
diff -Naur MAKEDEV-3.3.1.old/Makefile MAKEDEV-3.3.1/Makefile
--- MAKEDEV-3.3.1.old/Makefile	2002-09-20 20:04:41 +0400
+++ MAKEDEV-3.3.1/Makefile	2002-11-21 19:47:27 +0300
@@ -1,13 +1,13 @@
 VERSION=$(shell awk '/Version:/ { print $$2 }' MAKEDEV.spec)
 RELEASE=$(shell awk '/Release:/ { print $$2 }' MAKEDEV.spec)
-TAG = makedev$(subst .,-,$(VERSION)-$(RELEASE))
+CVSTAG = makedev$(subst .,-,$(VERSION)-$(RELEASE))
 
 CONF_S390= 00macros console generic std_s390 ftape \
       ipfilter raid s390 undocumented 
 
 CONF= 00macros ataraid cciss cdrom console dac960 ftape generic ia64 ibcs ida \
       ide ipfilter isdn libraw1394 linux-2.4.x mouse qic raid redhat sound std \
-      undocumented usb v4l
+      undocumented usb v4l mandrake
 
 devdir=$(DESTDIR)/dev
 sbindir=$(DESTDIR)/usr/sbin
@@ -19,7 +19,7 @@
 
 DEBUGFLAGS=
 DEFINES=-DCFGDIR=\"$(confdir)\" -DDEVDIR=\"$(devdir)\" -DVERSION=\"$(VERSION)\"
-OPTFLAGS=-g -Wall
+OPTFLAGS=$(RPM_OPT_FLAGS)
 CFLAGS=$(OPTFLAGS) $(DEFINES) $(DEBUG)
 
 ifdef S390
@@ -28,13 +28,13 @@
 all: MAKEDEV mksock makedev.d/dac960 makedev.d/ida makedev.d/cciss makedev.d/ataraid
 endif
 
-tag:
-	@cvs tag -cR $(TAG) || echo GRRRrrrrr -- [tag aborted]
+tag-archive:
+	@cvs tag -cRF $(CVSTAG) || echo GRRRrrrrr -- ignore [tag aborted]
 
 archive: tag-archive
 	@rm -rf /tmp/MAKEDEV
 	@rm -rf /tmp/MAKEDEV-$(VERSION)
-	@dir=`pwd`; cd /tmp; cvs -q -d `cat $$dir/CVS/Root` export -r$(TAG) MAKEDEV
+	@dir=`pwd`; cd /tmp; cvs -q -d `cat $$dir/CVS/Root` export -r$(CVSTAG) MAKEDEV
 	@mv /tmp/MAKEDEV /tmp/MAKEDEV-$(VERSION)
 	@cd /tmp; tar czSpf MAKEDEV-$(VERSION)-$(RELEASE).tar.gz MAKEDEV-$(VERSION)
 	@rm -rf /tmp/MAKEDEV-$(VERSION)
@@ -49,10 +49,8 @@
 
 install: $(devdir)/MAKEDEV $(sbindir)/mksock install-conf
 
-GENERATED = makedev.d/dac960 makedev.d/ida makedev.d/cciss makedev.d/ataraid
-
 clean:
-	$(RM) -f MAKEDEV core mksock $(GENERATED)
+	$(RM) -f MAKEDEV core mksock
 
 makedev.d/dac960: gendac960
 	./gendac960 > makedev.d/dac960
@@ -67,19 +65,19 @@
 	./genataraid > makedev.d/ataraid
 
 $(devdir)/MAKEDEV: MAKEDEV
-	install -m755 -d $(devdir)
-	install -m755 MAKEDEV $(devdir)/MAKEDEV
-	install -m755 -d $(mansubdir)
-	install -m644 MAKEDEV.m $(mansubdir)/MAKEDEV.$(manext)
+	$(INSTALL) -m755 -d $(devdir)
+	$(INSTALL) -m755 MAKEDEV $(devdir)/MAKEDEV
+	$(INSTALL) -m755 -d $(mansubdir)
+	$(INSTALL) -m644 MAKEDEV.m $(mansubdir)/MAKEDEV.$(manext)
 
 $(sbindir)/mksock: mksock
-	install -m755 -d $(sbindir)
-	install -m755 mksock $(sbindir)/mksock
+	$(INSTALL) -m755 -d $(sbindir)
+	$(INSTALL) -m755 mksock $(sbindir)/mksock
 
 install-conf:
-	install -m755 -d $(confdir)
+	$(INSTALL) -m755 -d $(confdir)
 ifdef S390
-	cd makedev.d ; install -m644 $(CONF_S390) $(confdir)/
+	cd makedev.d ; $(INSTALL) -m644 $(CONF_S390) $(confdir)/
 else
-	cd makedev.d ; install -m644 $(CONF) $(confdir)/
+	cd makedev.d ; $(INSTALL) -m644 $(CONF) $(confdir)/
 endif
--- MAKEDEV-3.3.1/makedev.d/libraw1394.orig	2004-06-29 19:13:33 +0400
+++ MAKEDEV-3.3.1/makedev.d/libraw1394	2004-06-29 19:12:32 +0400
@@ -1,4 +1,6 @@
 # Device nodes used by libraw1394 (http://sourceforge.net/projects/libraw1394/)
 # This file last updated 30 August 2001.
 c $ROOT                171   0  1   1 raw1394
-c $ROOT                172   0  1   1 video1394
+c $ROOT                171   16 1   1 video1394
+c $ROOT		       171   34 1   1 dv1394r
+c $ROOT		       171   35 1   1 dv1394w