Update pcmcia-cs to version 3.2.4

diff --git a/make/pcmcia.mk b/make/pcmcia.mk
index ee30a6a4a47ce5533796e1a0e15a01dfde3384d6..43005a4f1df4d48a701f67672793995a7a074c38 100644 (file)
--- a/make/pcmcia.mk
+++ b/make/pcmcia.mk
@@ -21,9 +21,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-PCMCIA_SOURCE:=pcmcia-cs-3.2.3.tar.gz
+PCMCIA_SOURCE:=pcmcia-cs-3.2.4.tar.gz
 PCMCIA_SITE:=http://telia.dl.sourceforge.net/sourceforge/pcmcia-cs
-PCMCIA_DIR:=$(BUILD_DIR)/pcmcia-cs-3.2.3
+PCMCIA_DIR:=$(BUILD_DIR)/pcmcia-cs-3.2.4
 PCMCIA_PATCH:=$(SOURCE_DIR)/pcmcia.patch
 PCMCIA_CAT:=zcat
 
@@ -48,6 +48,8 @@ $(PCMCIA_DIR)/.configured: $(PCMCIA_DIR)/.patched
        perl -i -p -e "s/pump/udhcpc/" $(PCMCIA_DIR)/etc/network
        perl -i -p -e "s/ide_cs/ide-cs/" $(PCMCIA_DIR)/etc/config
        perl -i -p -e "s/bind \"wvlan_cs\"/bind \"orinoco_cs\"/g" $(PCMCIA_DIR)/etc/config
+       perl -i -p -e "s,-f /etc/pcmcia.conf,-f /etc/default/pcmcia.conf,g" $(PCMCIA_DIR)/etc/rc.pcmcia
+       perl -i -p -e "s,\. /etc/pcmcia.conf,\. /etc/default/pcmcia.conf,g" $(PCMCIA_DIR)/etc/rc.pcmcia
        touch $(PCMCIA_DIR)/.configured
 
 $(PCMCIA_DIR)/cardmgr/cardmgr: $(PCMCIA_DIR)/.configured
@@ -80,6 +82,7 @@ $(TARGET_DIR)/sbin/cardmgr: $(PCMCIA_DIR)/cardmgr/cardmgr
        rm -f $(TARGET_DIR)/sbin/ftl_format
        rm -f $(TARGET_DIR)/usr/X11R6/bin/xcardinfo
        rm -rf $(TARGET_DIR)/etc/sysconfig
+       cp -f $(PCMCIA_DIR)/etc/pcmcia $(TARGET_DIR)/etc/default/
        cp -f $(PCMCIA_DIR)/etc/rc.pcmcia $(TARGET_DIR)/etc/init.d/S30pcmcia
        rm -rf $(TARGET_DIR)/etc/pcmcia/cis
        chmod a+x $(TARGET_DIR)/etc/init.d/S30pcmcia

diff --git a/sources/pcmcia.patch b/sources/pcmcia.patch
index 63e1a080ceec132a24994c1ff066ea9c0096dbf8..4663c9c82a8e1b800fd0f0bda3268aed1b6db448 100644 (file)
--- a/sources/pcmcia.patch
+++ b/sources/pcmcia.patch
@@ -21,13 +21,12 @@ diff -urN pcmcia-cs-3.2.3.orig/etc/shared pcmcia-cs-3.2.3/etc/shared
  usage ()
  {
      echo "usage: $0 [action] [device name]"
---- pcmcia-cs-3.2.3/etc/rc.pcmcia~     2003-06-05 19:24:49.000000000 -0600
-+++ pcmcia-cs-3.2.3/etc/rc.pcmcia      2003-06-05 19:25:04.000000000 -0600
-@@ -48,7 +48,6 @@
- for N in PCMCIA PCIC PCIC_OPTS CORE_OPTS CARDMGR_OPTS SCHEME ; do
-     V=`eval echo '$'ENV_$N` ; if [ "$V" ] ; then eval $N=\"$V\" ; fi
- done
--if [ "$PCMCIA" -a "$PCMCIA" != "yes" ] ; then exit 0 ; fi
- 
- usage()
- {
+--- /dev/null  2003-01-21 22:14:35.000000000 -0700
++++ pcmcia-cs-3.2.4/etc/pcmcia 2003-06-09 12:04:02.000000000 -0600
+@@ -0,0 +1,6 @@
++# Defaults for pcmcia (sourced by /etc/init.d/S30pcmcia)
++PCMCIA=yes
++PCIC=yenta_socket
++PCIC_OPTS=
++CORE_OPTS=
++CARDMGR_OPTS=