import clean BK tree at cset 1.3670

8 files changed, 217 insertions, 0 deletions

diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/.mtn2git_empty b/packages/pcmcia-cs/pcmcia-cs-3.2.8/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pcmcia-cs/pcmcia-cs-3.2.8/.mtn2git_empty
diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/automount.patch b/packages/pcmcia-cs/pcmcia-cs-3.2.8/automount.patch
index e69de29bb2..5f11147eb8 100644
--- a/packages/pcmcia-cs/pcmcia-cs-3.2.8/automount.patch
+++ b/packages/pcmcia-cs/pcmcia-cs-3.2.8/automount.patch
@@ -0,0 +1,19 @@
+--- pcmcia-cs-3.2.8/etc/shared.orig	2004-12-15 02:21:11.000000000 +0100
++++ pcmcia-cs-3.2.8/etc/shared	2004-12-27 17:09:51.000000000 +0100
+@@ -55,8 +55,15 @@
+     fi
+     if is_true $DO_MOUNT ; then
+ 	O=${OPTS:+-o $OPTS} ; FS=${FSTYPE:+-t $FSTYPE}
+-	log mount $O $FS $1 $MOUNTPT || return 1
++	if test -x /etc/pcmcia/ide_automount
++	then
++		/etc/pcmcia/ide_automount
++	else
++		log mount $O $FS $1 $MOUNTPT || return 1
++	fi
+     fi
++
++	logger "SHARED [$MOUNTPT] [$1]"
+     return 0
+ }
+ 
diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/busybox.patch b/packages/pcmcia-cs/pcmcia-cs-3.2.8/busybox.patch
index e69de29bb2..7237f3b813 100644
--- a/packages/pcmcia-cs/pcmcia-cs-3.2.8/busybox.patch
+++ b/packages/pcmcia-cs/pcmcia-cs-3.2.8/busybox.patch
@@ -0,0 +1,20 @@
+--- pcmcia-cs-3.2.3/etc/shared~ide	2003-03-11 10:26:14.000000000 -0600
++++ pcmcia-cs-3.2.3/etc/shared	2003-03-11 10:32:39.000000000 -0600
+@@ -57,7 +57,7 @@
+     fi
+     if is_true $DO_MOUNT ; then
+ 	O=${OPTS:+-o $OPTS} ; FS=${FSTYPE:+-t $FSTYPE}
+-	log mount -v $O $FS $1 $MOUNTPT || return 1
++	log mount $O $FS $1 $MOUNTPT || return 1
+     fi
+     return 0
+ }
+@@ -85,7 +85,7 @@
+     test -b $1 || return 1
+     do_fuser -k -m $1 > /dev/null
+     if mount | grep -q "$1 on" ; then
+-	log umount -v $1 || return 1
++	log umount $1 || return 1
+     fi
+     if is_true $DO_FSTAB ; then
+ 	grep -v $1 /etc/fstab > /etc/fstab.N
diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/network.patch b/packages/pcmcia-cs/pcmcia-cs-3.2.8/network.patch
index e69de29bb2..fb808e209c 100644
--- a/packages/pcmcia-cs/pcmcia-cs-3.2.8/network.patch
+++ b/packages/pcmcia-cs/pcmcia-cs-3.2.8/network.patch
@@ -0,0 +1,92 @@
+--- pcmcia-cs/etc/network.old	2004-07-01 00:31:59.000000000 +0100
++++ pcmcia-cs/etc/network	2004-07-01 00:32:57.000000000 +0100
+@@ -31,16 +31,39 @@
+ 
+ RESOLV=/etc/resolv.conf
+ 
++# if this interface has an entry in /etc/network/interfaces, let ifupdown
++# handle it
++if grep -q "iface \+$DEVICE" /etc/network/interfaces; then
++  case $ACTION in
++    start)
++    	ifup $DEVICE
++    	;;
++    stop)
++    	ifdown $DEVICE
++    	;;
++    restart)
++    	ifdown $DEVICE
++    	ifup $DEVICE
++    	;;
++  esac
++  
++  exit 0
++fi
++
++## see if it is a wireless card. Jamey and AntiProxy
++CHECK_WIRELESS=`grep "$DEVICE" /proc/net/wireless`
++if [ -n "$CHECK_WIRELESS" ] ; then
+ # Now, run the specific script for Wireless LAN interfaces
+ # Note : we need the wireless parameters to be set up before IP parameters,
+ # so that we can perform DHCP over the Wireless link if needed. Jean II
+-O_INFO=$INFO ; INFO=
+-if [ -x ./wireless ] ; then
+-    . ./wireless
+-else
+-    . /etc/pcmcia/wireless
++    O_INFO=$INFO ; INFO=
++    if [ -x ./wireless ] ; then
++	. ./wireless
++    else
++	. /etc/pcmcia/wireless
++    fi
++    INFO=$O_INFO
+ fi
+-INFO=$O_INFO
+ 
+ bootp_setup ()
+ {
+@@ +225,6 -188,11 @@
+ 		fi
+ 		/sbin/dhcpcd -XYZZY 2>&1 | grep -q DHCP || \
+ 		    rm -f /var/run/dhcpcd-$DEVICE.pid
++  	    # modified for udhcpc
++	    elif [ -x /sbin/udhcpc ] ; then
++		PID=`cat /var/run/udhcpc.$DEVICE.pid 2>/dev/null`
++		if [ -n "$PID" ] ; then kill -TERM $PID ; fi
++	    # end of modification
+ 	    elif [ -x /sbin/dhclient ] ; then
+ 		PID=`cat /var/run/dhclient.pid 2>/dev/null`
+ 		if [ -n "$PID" ] ; then kill -TERM $PID ; fi
+@@ +282,7 -250,30 @@
+     [ -n "$IPADDR" ] && /sbin/ifconfig $DEVICE down up
+     ;;
+ 
++'resume')
++    #logger RESUME EVENT PCMCIA SEEN FROM CARDMGR
++    if [ -z "$IPADDR" ] || is_true $DHCP ; then
++        if [ ! -x /sbin/dhcpcd ] && [ -x /sbin/udhcpc ] ; then
++              PID=`cat /var/run/udhcpc.$DEVICE.pid 2>/dev/null`
++              if [ -n "$PID" ] ; then
++                 kill -USR1 $PID
++              fi
++        fi
++    fi
++    ;;
++    
++'suspend')
++    #logger SUSPEND EVENT SEEN FROM CARDMGR
++# ## uncomment this code below if you get problems where
++# ## you are getting in IP conflict upon resume on DHCP networks
++#    if [ -z "$IPADDR" ] || is_true $DHCP ; then
++#        if [ ! -x /sbin/dhcpcd ] && [ -x /sbin/udhcpc ] ; then
++#	      PID=`cat /var/run/udhcpc.$DEVICE.pid 2>/dev/null`
++#       	      if [ -n "$PID" ] ; then
++#                 ifconfig $DEVICE 0.0.0.0
++#              fi
++#        fi
++#    fi
+-'suspend'|'resume')
+     ;;
+ 
+ *)
diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/nocleanup.patch b/packages/pcmcia-cs/pcmcia-cs-3.2.8/nocleanup.patch
index e69de29bb2..afebb5a9b9 100644
--- a/packages/pcmcia-cs/pcmcia-cs-3.2.8/nocleanup.patch
+++ b/packages/pcmcia-cs/pcmcia-cs-3.2.8/nocleanup.patch
@@ -0,0 +1,11 @@
+--- pcmcia-cs-3.2.8/etc/rc.pcmcia.orig	2005-04-22 23:14:56.308784152 +0100
++++ pcmcia-cs-3.2.8/etc/rc.pcmcia	2005-04-22 23:15:34.637957232 +0100
+@@ -140,7 +140,7 @@
+ 	echo -n "Shutting down PCMCIA services: "
+ 	if [ -s /var/run/cardmgr.pid ] ; then
+ 	    PID=`cat /var/run/cardmgr.pid`
+-	    kill $PID
++	    kill -9 $PID
+ 	    # Give cardmgr a few seconds to handle the signal
+ 	    for N in 1 2 3 4 5 1 2 3 4 5 1 2 3 4 5 ; do
+ 		kill -0 $PID 2>/dev/null || break
diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/.mtn2git_empty b/packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/.mtn2git_empty
diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/ide.opts b/packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/ide.opts
index e69de29bb2..c67df8e348 100644
--- a/packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/ide.opts
+++ b/packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/ide.opts
@@ -0,0 +1,28 @@
+# ATA/IDE drive adapter configuration
+#
+# The address format is "scheme,socket,serial_no[,part]".
+#
+# For multi-partition devices, first return list of partitions in
+# $PARTS.  Then, we'll get called for each partition.
+#
+case "$ADDRESS" in
+*,1,*,*)
+    # Socket 1 is the internal HD; don't do anything clever as it's /
+    ;;
+*,*,*,1)
+    #INFO="Sample IDE setup"
+    DO_FSTAB="n";
+    #DO_FSCK="y" ;
+    DO_MOUNT="y"
+    #FSTYPE="msdos"
+    #FSTYPE="auto"
+    #OPTS=""
+    #MOUNTPT="/mnt/ide"
+    ;;
+*,*,*)
+    PARTS="1"
+    # Card eject policy options
+    NO_CHECK=n
+    NO_FUSER=y
+    ;;
+esac
diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/wireless.opts b/packages/pcmcia-cs/pcmcia-cs-3.2.8/wireless.opts
index e69de29bb2..3e498297fc 100644
--- a/packages/pcmcia-cs/pcmcia-cs-3.2.8/wireless.opts
+++ b/packages/pcmcia-cs/pcmcia-cs-3.2.8/wireless.opts
@@ -0,0 +1,47 @@
+# Wireless LAN adapter configuration
+#
+# Theory of operation : 
+#
+# The script attempts to match a block of settings to the specific wireless
+# card inserted, the *first* block matching the card is used.
+# The address format is "scheme,socket,instance,hwaddr", with * as a wildcard.
+# 'scheme' is the pcmcia scheme (set via 'cardctl scheme XXX').
+# 'hwaddr' is the unique MAC address identifier of the wireless card.
+# The MAC address is usually printed on the card, or can be found via ifconfig.
+# Some examples here use only half of the MAC address with a wildcard to
+# match a whole family of cards...
+#
+# All the Wireless specific configuration is done through the Wireless
+# Extensions, so we will just call 'iwconfig' with the right parameters
+# defined below.
+# Of course, you need to have iwconfig installled on your system.
+# To download iwconfig, or for more info on Wireless Extensions :
+#	http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
+#
+# Note : you don't need to fill all parameters, leave them blank, in most
+# cases the driver will initialise itself with sane defaults values or
+# automatically figure out the value... And no drivers do support all
+# possible settings...
+#
+# If you make any mistakes, you'll get a cryptic message in the system
+# log.  You'll need to figure out on your own which parameter was wrong:
+#     cardmgr[310]: executing: './network start wvlan0'
+#     cardmgr[310]: + SIOCSIWMODE: Invalid argument
+# I've tried to give more troubleshooting help at :
+#	http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html#debug
+# In case of doubts, just check "/etc/pcmcia/wireless" for the gory details...
+#
+# Note also that this script will work only with the original Pcmcia scripts,
+# and not with the default Red Hat scripts. Send a bug report to Red Hat ;-)
+#
+# Finally, send comments and flames to me, Jean Tourrilhes <jt@hpl.hp.com>
+#
+
+case "$ADDRESS" in
+*,*,*,*)
+    INFO="Default Config"
+    ESSID=any
+    MODE=Managed
+    RATE=auto
+    ;;
+esac