From 7667a59b28cbda3932574ae198011f40ed19fcc5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 29 Aug 2011 14:28:18 +0200 Subject: [PATCH] usb_modeswitch: update to 1.1.9 and database to 20110805. --- config/rootfiles/common/usb_modeswitch | 4 +- config/rootfiles/common/usb_modeswitch_data | 347 ++++++++++-------- .../core/next/filelists/usb_modeswitch | 1 + .../core/next/filelists/usb_modeswitch_data | 1 + config/rootfiles/core/next/update.sh | 3 + lfs/usb_modeswitch | 7 +- lfs/usb_modeswitch_data | 6 +- 7 files changed, 211 insertions(+), 158 deletions(-) create mode 120000 config/rootfiles/core/next/filelists/usb_modeswitch create mode 120000 config/rootfiles/core/next/filelists/usb_modeswitch_data diff --git a/config/rootfiles/common/usb_modeswitch b/config/rootfiles/common/usb_modeswitch index 13c1a38e85..fe60c0553e 100644 --- a/config/rootfiles/common/usb_modeswitch +++ b/config/rootfiles/common/usb_modeswitch @@ -1,6 +1,6 @@ -#etc/usb_modeswitch.conf -etc/usb_modeswitch.setup.example +etc/usb_modeswitch.conf #lib/udev/usb_modeswitch usr/sbin/usb_modeswitch usr/sbin/usb_modeswitch_dispatcher #usr/share/man/man1/usb_modeswitch.1 +var/lib/usb_modeswitch diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data index e7b3079bc3..c3166a0e8e 100644 --- a/config/rootfiles/common/usb_modeswitch_data +++ b/config/rootfiles/common/usb_modeswitch_data @@ -1,150 +1,199 @@ -#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 -etc/usb_modeswitch.d/04e8:689a -etc/usb_modeswitch.d/04e8:f000 -etc/usb_modeswitch.d/057c:84ff -etc/usb_modeswitch.d/05c6:1000:sVe=Option -etc/usb_modeswitch.d/05c6:1000:uMa=AnyDATA -etc/usb_modeswitch.d/05c6:1000:uMa=Option -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 -etc/usb_modeswitch.d/0ace:20ff -etc/usb_modeswitch.d/0af0:6711 -etc/usb_modeswitch.d/0af0:6731 -etc/usb_modeswitch.d/0af0:6751 -etc/usb_modeswitch.d/0af0:6771 -etc/usb_modeswitch.d/0af0:6791 -etc/usb_modeswitch.d/0af0:6811 -etc/usb_modeswitch.d/0af0:6911 -etc/usb_modeswitch.d/0af0:6951 -etc/usb_modeswitch.d/0af0:6971 -etc/usb_modeswitch.d/0af0:7011 -etc/usb_modeswitch.d/0af0:7031 -etc/usb_modeswitch.d/0af0:7051 -etc/usb_modeswitch.d/0af0:7071 -etc/usb_modeswitch.d/0af0:7111 -etc/usb_modeswitch.d/0af0:7211 -etc/usb_modeswitch.d/0af0:7251 -etc/usb_modeswitch.d/0af0:7271 -etc/usb_modeswitch.d/0af0:7301 -etc/usb_modeswitch.d/0af0:7311 -etc/usb_modeswitch.d/0af0:7361 -etc/usb_modeswitch.d/0af0:7381 -etc/usb_modeswitch.d/0af0:7401 -etc/usb_modeswitch.d/0af0:7501 -etc/usb_modeswitch.d/0af0:7601 -etc/usb_modeswitch.d/0af0:7701 -etc/usb_modeswitch.d/0af0:7801 -etc/usb_modeswitch.d/0af0:7901 -etc/usb_modeswitch.d/0af0:8200 -etc/usb_modeswitch.d/0af0:8201 -etc/usb_modeswitch.d/0af0:8300 -etc/usb_modeswitch.d/0af0:8302 -etc/usb_modeswitch.d/0af0:8304 -etc/usb_modeswitch.d/0af0:8400 -etc/usb_modeswitch.d/0af0:c031 -etc/usb_modeswitch.d/0af0:c100 -etc/usb_modeswitch.d/0af0:d013 -etc/usb_modeswitch.d/0af0:d031 -etc/usb_modeswitch.d/0af0:d033 -etc/usb_modeswitch.d/0af0:d035 -etc/usb_modeswitch.d/0af0:d055 -etc/usb_modeswitch.d/0af0:d057 -etc/usb_modeswitch.d/0af0:d058 -etc/usb_modeswitch.d/0af0:d155 -etc/usb_modeswitch.d/0af0:d157 -etc/usb_modeswitch.d/0af0:d255 -etc/usb_modeswitch.d/0af0:d257 -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 -etc/usb_modeswitch.d/1266:1000 -etc/usb_modeswitch.d/12d1:1001 -etc/usb_modeswitch.d/12d1:1003 -etc/usb_modeswitch.d/12d1:101e -etc/usb_modeswitch.d/12d1:1031 -etc/usb_modeswitch.d/12d1:1414 -etc/usb_modeswitch.d/12d1:1446 -etc/usb_modeswitch.d/12d1:14ad -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 -etc/usb_modeswitch.d/16d8:f000 -etc/usb_modeswitch.d/198f:bccd -etc/usb_modeswitch.d/19d2:0003 -etc/usb_modeswitch.d/19d2:0026 -etc/usb_modeswitch.d/19d2:0040 -etc/usb_modeswitch.d/19d2:0053 -etc/usb_modeswitch.d/19d2:0083 -etc/usb_modeswitch.d/19d2:0101 -etc/usb_modeswitch.d/19d2:0103 -etc/usb_modeswitch.d/19d2:0115 -etc/usb_modeswitch.d/19d2:1001 -etc/usb_modeswitch.d/19d2:1007 -etc/usb_modeswitch.d/19d2:1009 -etc/usb_modeswitch.d/19d2:1013 -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/1ab7:5700 -etc/usb_modeswitch.d/1b7d:0700 -etc/usb_modeswitch.d/1bbb:f000 -etc/usb_modeswitch.d/1c9e:1001 -etc/usb_modeswitch.d/1c9e:9200 -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 +etc/usb_modeswitch.d lib/udev/rules.d/40-usb_modeswitch.rules +#usr/share/usb_modeswitch +usr/share/usb_modeswitch/03f0:002a +usr/share/usb_modeswitch/0421:060c +usr/share/usb_modeswitch/0421:0610 +usr/share/usb_modeswitch/0421:0622 +usr/share/usb_modeswitch/0421:0627 +usr/share/usb_modeswitch/0471:1210:uMa=Philips +usr/share/usb_modeswitch/0471:1210:uMa=Wisue +usr/share/usb_modeswitch/0471:1237 +usr/share/usb_modeswitch/0482:024d +usr/share/usb_modeswitch/04e8:689a +usr/share/usb_modeswitch/04e8:f000 +usr/share/usb_modeswitch/057c:84ff +usr/share/usb_modeswitch/05c6:1000:sVe=GT +usr/share/usb_modeswitch/05c6:1000:sVe=Option +usr/share/usb_modeswitch/05c6:1000:uMa=AnyDATA +usr/share/usb_modeswitch/05c6:1000:uMa=Option +usr/share/usb_modeswitch/05c6:1000:uMa=SAMSUNG +usr/share/usb_modeswitch/05c6:1000:uMa=SSE +usr/share/usb_modeswitch/05c6:1000:uMa=Vertex +usr/share/usb_modeswitch/05c6:2000 +usr/share/usb_modeswitch/05c6:2001 +usr/share/usb_modeswitch/05c6:f000 +usr/share/usb_modeswitch/05c7:1000 +usr/share/usb_modeswitch/072f:100d +usr/share/usb_modeswitch/07d1:a800 +usr/share/usb_modeswitch/07d1:a804 +usr/share/usb_modeswitch/0930:0d46 +usr/share/usb_modeswitch/0ace:2011 +usr/share/usb_modeswitch/0ace:20ff +usr/share/usb_modeswitch/0af0:6711 +usr/share/usb_modeswitch/0af0:6731 +usr/share/usb_modeswitch/0af0:6751 +usr/share/usb_modeswitch/0af0:6771 +usr/share/usb_modeswitch/0af0:6791 +usr/share/usb_modeswitch/0af0:6811 +usr/share/usb_modeswitch/0af0:6911 +usr/share/usb_modeswitch/0af0:6951 +usr/share/usb_modeswitch/0af0:6971 +usr/share/usb_modeswitch/0af0:7011 +usr/share/usb_modeswitch/0af0:7031 +usr/share/usb_modeswitch/0af0:7051 +usr/share/usb_modeswitch/0af0:7071 +usr/share/usb_modeswitch/0af0:7111 +usr/share/usb_modeswitch/0af0:7211 +usr/share/usb_modeswitch/0af0:7251 +usr/share/usb_modeswitch/0af0:7271 +usr/share/usb_modeswitch/0af0:7301 +usr/share/usb_modeswitch/0af0:7311 +usr/share/usb_modeswitch/0af0:7361 +usr/share/usb_modeswitch/0af0:7381 +usr/share/usb_modeswitch/0af0:7401 +usr/share/usb_modeswitch/0af0:7501 +usr/share/usb_modeswitch/0af0:7601 +usr/share/usb_modeswitch/0af0:7701 +usr/share/usb_modeswitch/0af0:7801 +usr/share/usb_modeswitch/0af0:7901 +usr/share/usb_modeswitch/0af0:7a01 +usr/share/usb_modeswitch/0af0:7a05 +usr/share/usb_modeswitch/0af0:8200 +usr/share/usb_modeswitch/0af0:8201 +usr/share/usb_modeswitch/0af0:8300 +usr/share/usb_modeswitch/0af0:8302 +usr/share/usb_modeswitch/0af0:8304 +usr/share/usb_modeswitch/0af0:8400 +usr/share/usb_modeswitch/0af0:8600 +usr/share/usb_modeswitch/0af0:8800 +usr/share/usb_modeswitch/0af0:8900 +usr/share/usb_modeswitch/0af0:9000 +usr/share/usb_modeswitch/0af0:c031 +usr/share/usb_modeswitch/0af0:c100 +usr/share/usb_modeswitch/0af0:d013 +usr/share/usb_modeswitch/0af0:d031 +usr/share/usb_modeswitch/0af0:d033 +usr/share/usb_modeswitch/0af0:d035 +usr/share/usb_modeswitch/0af0:d055 +usr/share/usb_modeswitch/0af0:d057 +usr/share/usb_modeswitch/0af0:d058 +usr/share/usb_modeswitch/0af0:d155 +usr/share/usb_modeswitch/0af0:d157 +usr/share/usb_modeswitch/0af0:d255 +usr/share/usb_modeswitch/0af0:d257 +usr/share/usb_modeswitch/0af0:d357 +usr/share/usb_modeswitch/0b3c:c700 +usr/share/usb_modeswitch/0b3c:f000 +usr/share/usb_modeswitch/0cf3:20ff +usr/share/usb_modeswitch/0d46:45a1 +usr/share/usb_modeswitch/0d46:45a5 +usr/share/usb_modeswitch/0df7:0800 +usr/share/usb_modeswitch/0e8d:7109 +usr/share/usb_modeswitch/0fce:d0cf +usr/share/usb_modeswitch/0fce:d0e1 +usr/share/usb_modeswitch/0fce:d103 +usr/share/usb_modeswitch/0fd1:1000 +usr/share/usb_modeswitch/1004:1000 +usr/share/usb_modeswitch/1004:607f +usr/share/usb_modeswitch/1004:613a +usr/share/usb_modeswitch/1004:613f +usr/share/usb_modeswitch/1004:6190 +usr/share/usb_modeswitch/1033:0035 +usr/share/usb_modeswitch/106c:3b03 +usr/share/usb_modeswitch/106c:3b05 +usr/share/usb_modeswitch/106c:3b06 +usr/share/usb_modeswitch/1076:7f40 +usr/share/usb_modeswitch/1199:0fff +usr/share/usb_modeswitch/1266:1000 +usr/share/usb_modeswitch/12d1:1001 +usr/share/usb_modeswitch/12d1:1003 +usr/share/usb_modeswitch/12d1:1009 +usr/share/usb_modeswitch/12d1:101e +usr/share/usb_modeswitch/12d1:1030 +usr/share/usb_modeswitch/12d1:1031 +usr/share/usb_modeswitch/12d1:1414 +usr/share/usb_modeswitch/12d1:1446 +usr/share/usb_modeswitch/12d1:1449 +usr/share/usb_modeswitch/12d1:14ad +usr/share/usb_modeswitch/12d1:14b5 +usr/share/usb_modeswitch/12d1:14b7 +usr/share/usb_modeswitch/12d1:14c1 +usr/share/usb_modeswitch/12d1:14c4 +usr/share/usb_modeswitch/12d1:14c5 +usr/share/usb_modeswitch/12d1:14d1 +usr/share/usb_modeswitch/12d1:14fe +usr/share/usb_modeswitch/12d1:1505 +usr/share/usb_modeswitch/12d1:1520 +usr/share/usb_modeswitch/12d1:1521 +usr/share/usb_modeswitch/12d1:1523 +usr/share/usb_modeswitch/12d1:1553 +usr/share/usb_modeswitch/12d1:1557 +usr/share/usb_modeswitch/12d1:1c0b +usr/share/usb_modeswitch/12d1:1da1 +usr/share/usb_modeswitch/12d1:380b +usr/share/usb_modeswitch/1307:1169 +usr/share/usb_modeswitch/1410:5010 +usr/share/usb_modeswitch/1410:5020 +usr/share/usb_modeswitch/1410:5030 +usr/share/usb_modeswitch/1410:5031 +usr/share/usb_modeswitch/1410:5041 +usr/share/usb_modeswitch/148e:a000 +usr/share/usb_modeswitch/148f:2578 +usr/share/usb_modeswitch/16d8:6281 +usr/share/usb_modeswitch/16d8:6803 +usr/share/usb_modeswitch/16d8:700a +usr/share/usb_modeswitch/16d8:700b +usr/share/usb_modeswitch/16d8:f000 +usr/share/usb_modeswitch/198a:0003 +usr/share/usb_modeswitch/198f:bccd +usr/share/usb_modeswitch/19d2:0003 +usr/share/usb_modeswitch/19d2:0013 +usr/share/usb_modeswitch/19d2:0026 +usr/share/usb_modeswitch/19d2:0040 +usr/share/usb_modeswitch/19d2:0053 +usr/share/usb_modeswitch/19d2:0083 +usr/share/usb_modeswitch/19d2:0101 +usr/share/usb_modeswitch/19d2:0103 +usr/share/usb_modeswitch/19d2:0110 +usr/share/usb_modeswitch/19d2:0115 +usr/share/usb_modeswitch/19d2:0149 +usr/share/usb_modeswitch/19d2:1001 +usr/share/usb_modeswitch/19d2:1007 +usr/share/usb_modeswitch/19d2:1009 +usr/share/usb_modeswitch/19d2:1013 +usr/share/usb_modeswitch/19d2:1171 +usr/share/usb_modeswitch/19d2:1175 +usr/share/usb_modeswitch/19d2:1179 +usr/share/usb_modeswitch/19d2:1201 +usr/share/usb_modeswitch/19d2:1216 +usr/share/usb_modeswitch/19d2:1224 +usr/share/usb_modeswitch/19d2:2000 +usr/share/usb_modeswitch/19d2:bccd +usr/share/usb_modeswitch/19d2:ffe6 +usr/share/usb_modeswitch/19d2:fff5 +usr/share/usb_modeswitch/19d2:fff6 +usr/share/usb_modeswitch/1a8d:1000 +usr/share/usb_modeswitch/1ab7:5700 +usr/share/usb_modeswitch/1b7d:0700 +usr/share/usb_modeswitch/1bbb:f000 +usr/share/usb_modeswitch/1c9e:1001 +usr/share/usb_modeswitch/1c9e:6061 +usr/share/usb_modeswitch/1c9e:9200 +usr/share/usb_modeswitch/1c9e:9800 +usr/share/usb_modeswitch/1c9e:9e00 +usr/share/usb_modeswitch/1c9e:f000 +usr/share/usb_modeswitch/1dd6:1000 +usr/share/usb_modeswitch/1e0e:f000 +usr/share/usb_modeswitch/1edf:6003 +usr/share/usb_modeswitch/1ee8:0009 +usr/share/usb_modeswitch/1ee8:0013 +usr/share/usb_modeswitch/1ee8:0040 +usr/share/usb_modeswitch/1f28:0021 +usr/share/usb_modeswitch/1fac:0032 +usr/share/usb_modeswitch/1fac:0130 +usr/share/usb_modeswitch/201e:2009 +usr/share/usb_modeswitch/2020:f00e +usr/share/usb_modeswitch/230d:0001 +usr/share/usb_modeswitch/230d:0007 +usr/share/usb_modeswitch/8888:6500 diff --git a/config/rootfiles/core/next/filelists/usb_modeswitch b/config/rootfiles/core/next/filelists/usb_modeswitch new file mode 120000 index 0000000000..acbab6f332 --- /dev/null +++ b/config/rootfiles/core/next/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/usb_modeswitch_data b/config/rootfiles/core/next/filelists/usb_modeswitch_data new file mode 120000 index 0000000000..4cbce46cf7 --- /dev/null +++ b/config/rootfiles/core/next/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index 5a4353ff43..9a46645229 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -50,6 +50,9 @@ rm -rf /usr/lib/libstrongswan.so.0 rm -rf /usr/lib/libstrongswan.so.0.0.0 rm -rf /usr/libexec/ipsec/plugins +# Remove old usb_modeswitch_data +rm -rf /etc/usb_modeswitch.d + # #Extract files extract_files diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch index 3046171bb5..e5ae0ed791 100644 --- a/lfs/usb_modeswitch +++ b/lfs/usb_modeswitch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.1.6 +VER = 1.1.9 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 = be3c7fc908e6ab50eb9fd29d187ad176 +$(DL_FILE)_MD5 = 76f6978f18cac41f269a346a5d0f1052 install : $(TARGET) @@ -73,6 +73,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make clean cd $(DIR_APP) && make all $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install - cp -f $(DIR_APP)/device_reference.txt /etc/usb_modeswitch.setup.example @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data index f32208039f..9afafada1a 100644 --- a/lfs/usb_modeswitch_data +++ b/lfs/usb_modeswitch_data @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 20101222 +VER = 20110805 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 = e386386bc389c2a8184c7ea4136fde0e +$(DL_FILE)_MD5 = 0ed8a28f8efd3177a128ecd46fc8bf9f install : $(TARGET) -- 2.39.2