From 305d7fc9b8056a1a8bfb2f954f778a179b1f28e2 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 10 Jan 2011 22:10:38 +0100
Subject: [PATCH] Updated usb_modeswitch (1.0.6) and database (22.12.2010).

---
 config/rootfiles/common/usb_modeswitch_data | 15 ++++++++++++++-
 config/rootfiles/core/44/update.sh          |  2 ++
 lfs/usb_modeswitch                          |  4 ++--
 lfs/usb_modeswitch_data                     |  4 ++--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data
index 58d6db1f13..e7b3079bc3 100644
--- a/config/rootfiles/common/usb_modeswitch_data
+++ b/config/rootfiles/common/usb_modeswitch_data
@@ -1,6 +1,8 @@
 #etc/usb_modeswitch.d
 etc/usb_modeswitch.d/0421:060c
 etc/usb_modeswitch.d/0421:0610
+etc/usb_modeswitch.d/0421:0622
+etc/usb_modeswitch.d/0421:0627
 etc/usb_modeswitch.d/0471:1210
 etc/usb_modeswitch.d/0471:1237
 etc/usb_modeswitch.d/0482:024d
@@ -14,6 +16,7 @@ etc/usb_modeswitch.d/05c6:1000:uMa=SAMSUNG
 etc/usb_modeswitch.d/05c6:1000:uMa=Vertex
 etc/usb_modeswitch.d/05c6:2001
 etc/usb_modeswitch.d/05c6:f000
+etc/usb_modeswitch.d/05c7:1000
 etc/usb_modeswitch.d/072f:100d
 etc/usb_modeswitch.d/0930:0d46
 etc/usb_modeswitch.d/0ace:2011
@@ -68,15 +71,21 @@ etc/usb_modeswitch.d/0af0:d357
 etc/usb_modeswitch.d/0b3c:c700
 etc/usb_modeswitch.d/0b3c:f000
 etc/usb_modeswitch.d/0cf3:20ff
+etc/usb_modeswitch.d/0d46:45a1
+etc/usb_modeswitch.d/0d46:45a5
+etc/usb_modeswitch.d/0e8d:7109
 etc/usb_modeswitch.d/0fce:d0cf
 etc/usb_modeswitch.d/0fce:d0e1
 etc/usb_modeswitch.d/0fce:d103
+etc/usb_modeswitch.d/0fd1:1000
 etc/usb_modeswitch.d/1004:1000
 etc/usb_modeswitch.d/1004:607f
 etc/usb_modeswitch.d/1004:613a
 etc/usb_modeswitch.d/1004:613f
+etc/usb_modeswitch.d/1004:6190
 etc/usb_modeswitch.d/1033:0035
 etc/usb_modeswitch.d/106c:3b03
+etc/usb_modeswitch.d/106c:3b05
 etc/usb_modeswitch.d/106c:3b06
 etc/usb_modeswitch.d/1076:7f40
 etc/usb_modeswitch.d/1199:0fff
@@ -92,13 +101,16 @@ etc/usb_modeswitch.d/12d1:14c1
 etc/usb_modeswitch.d/12d1:1520
 etc/usb_modeswitch.d/12d1:1521
 etc/usb_modeswitch.d/12d1:1523
+etc/usb_modeswitch.d/12d1:1553
 etc/usb_modeswitch.d/12d1:1557
+etc/usb_modeswitch.d/12d1:1c0b
 etc/usb_modeswitch.d/1410:5010
 etc/usb_modeswitch.d/1410:5020
 etc/usb_modeswitch.d/1410:5030
 etc/usb_modeswitch.d/1410:5031
 etc/usb_modeswitch.d/1410:5041
 etc/usb_modeswitch.d/148f:2578
+etc/usb_modeswitch.d/16d8:6281
 etc/usb_modeswitch.d/16d8:6803
 etc/usb_modeswitch.d/16d8:6803:?
 etc/usb_modeswitch.d/16d8:700a
@@ -120,7 +132,6 @@ etc/usb_modeswitch.d/19d2:2000
 etc/usb_modeswitch.d/19d2:fff5
 etc/usb_modeswitch.d/19d2:fff6
 etc/usb_modeswitch.d/1a8d:1000
-etc/usb_modeswitch.d/1a8d:1000:uPr=5G
 etc/usb_modeswitch.d/1ab7:5700
 etc/usb_modeswitch.d/1b7d:0700
 etc/usb_modeswitch.d/1bbb:f000
@@ -130,8 +141,10 @@ etc/usb_modeswitch.d/1c9e:9e00
 etc/usb_modeswitch.d/1c9e:f000
 etc/usb_modeswitch.d/1dd6:1000
 etc/usb_modeswitch.d/1e0e:f000
+etc/usb_modeswitch.d/1edf:6003
 etc/usb_modeswitch.d/1ee8:0009
 etc/usb_modeswitch.d/1ee8:0013
 etc/usb_modeswitch.d/1f28:0021
 etc/usb_modeswitch.d/1fac:0130
+etc/usb_modeswitch.d/230d:0001
 lib/udev/rules.d/40-usb_modeswitch.rules
diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh
index eedc44f60b..2141b3ac0a 100644
--- a/config/rootfiles/core/44/update.sh
+++ b/config/rootfiles/core/44/update.sh
@@ -75,6 +75,8 @@ rm -rf /lib/initcpio
 rm -rf /sbin/mkinitcpio
 # Remove old iw (new is in usr/sbin)
 rm -rf /usr/bin/iw
+# Remove old usb_modeswitch data
+rm -rf /etc/usb_modeswitch.d
 #
 # Backup grub.conf
 #
diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch
index 75fa84c56e..3046171bb5 100644
--- a/lfs/usb_modeswitch
+++ b/lfs/usb_modeswitch
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.1.4
+VER        = 1.1.6
 
 THISAPP    = usb-modeswitch-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a04db36bd0fc6fb303df7567f677b714
+$(DL_FILE)_MD5 = be3c7fc908e6ab50eb9fd29d187ad176
 
 install : $(TARGET)
 
diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data
index d1b23c6c2b..f32208039f 100644
--- a/lfs/usb_modeswitch_data
+++ b/lfs/usb_modeswitch_data
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 20100826
+VER        = 20101222
 
 THISAPP    = usb-modeswitch-data-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 85c16bb87a6f05c2d04b93a22fe87e91
+$(DL_FILE)_MD5 = e386386bc389c2a8184c7ea4136fde0e
 
 install : $(TARGET)
 
-- 
2.39.2