From: Arne Fitzenreiter Date: Fri, 10 Jan 2014 19:30:13 +0000 (+0100) Subject: usb_modesitch: update to 2.01 and database 20131113. X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=986ba0d12789e4a91d3cfb923822e2f366c9070a;hp=-c usb_modesitch: update to 2.01 and database 20131113. --- 986ba0d12789e4a91d3cfb923822e2f366c9070a diff --git a/config/rootfiles/common/usb_modeswitch b/config/rootfiles/common/usb_modeswitch index ab46c4dc4..2b386b345 100644 --- a/config/rootfiles/common/usb_modeswitch +++ b/config/rootfiles/common/usb_modeswitch @@ -3,4 +3,5 @@ lib/udev/usb_modeswitch usr/sbin/usb_modeswitch usr/sbin/usb_modeswitch_dispatcher #usr/share/man/man1/usb_modeswitch.1 +#usr/share/man/man1/usb_modeswitch_dispatcher.1 var/lib/usb_modeswitch diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data index a454c61e3..6948694cc 100644 --- a/config/rootfiles/common/usb_modeswitch_data +++ b/config/rootfiles/common/usb_modeswitch_data @@ -2,6 +2,9 @@ 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/0408:ea17 +usr/share/usb_modeswitch/0408:ea25 +usr/share/usb_modeswitch/0408:ea43 usr/share/usb_modeswitch/0408:f000 usr/share/usb_modeswitch/0421:060c usr/share/usb_modeswitch/0421:0610 @@ -21,6 +24,7 @@ usr/share/usb_modeswitch/04cc:225c usr/share/usb_modeswitch/04e8:680c usr/share/usb_modeswitch/04e8:689a usr/share/usb_modeswitch/04e8:f000:sMo=U209 +usr/share/usb_modeswitch/057c:62ff usr/share/usb_modeswitch/057c:84ff usr/share/usb_modeswitch/05c6:0010 usr/share/usb_modeswitch/05c6:1000:sVe=GT @@ -36,6 +40,7 @@ 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:6503 +usr/share/usb_modeswitch/05c6:9024 usr/share/usb_modeswitch/05c6:f000 usr/share/usb_modeswitch/05c7:1000 usr/share/usb_modeswitch/072f:100d @@ -112,6 +117,7 @@ usr/share/usb_modeswitch/0d46:45a5 usr/share/usb_modeswitch/0df7:0800 usr/share/usb_modeswitch/0e8d:0002:uPr=MT usr/share/usb_modeswitch/0e8d:7109 +usr/share/usb_modeswitch/0fca:8020 usr/share/usb_modeswitch/0fce:d0cf usr/share/usb_modeswitch/0fce:d0e1 usr/share/usb_modeswitch/0fce:d103 @@ -136,6 +142,7 @@ usr/share/usb_modeswitch/106c:3b11 usr/share/usb_modeswitch/106c:3b14 usr/share/usb_modeswitch/1076:7f40 usr/share/usb_modeswitch/109b:f009 +usr/share/usb_modeswitch/10a9:6080 usr/share/usb_modeswitch/1199:0fff usr/share/usb_modeswitch/1266:1000 usr/share/usb_modeswitch/12d1:1001 @@ -166,6 +173,7 @@ usr/share/usb_modeswitch/12d1:1526 usr/share/usb_modeswitch/12d1:1553 usr/share/usb_modeswitch/12d1:1557 usr/share/usb_modeswitch/12d1:155b +usr/share/usb_modeswitch/12d1:156a usr/share/usb_modeswitch/12d1:1805 usr/share/usb_modeswitch/12d1:1c0b usr/share/usb_modeswitch/12d1:1c1b @@ -175,6 +183,11 @@ usr/share/usb_modeswitch/12d1:1da1 usr/share/usb_modeswitch/12d1:1f01 usr/share/usb_modeswitch/12d1:1f03 usr/share/usb_modeswitch/12d1:1f11 +usr/share/usb_modeswitch/12d1:1f15 +usr/share/usb_modeswitch/12d1:1f16 +usr/share/usb_modeswitch/12d1:1f17 +usr/share/usb_modeswitch/12d1:1f18 +usr/share/usb_modeswitch/12d1:1f19 usr/share/usb_modeswitch/12d1:380b usr/share/usb_modeswitch/1307:1169 usr/share/usb_modeswitch/1410:5010 @@ -198,12 +211,9 @@ usr/share/usb_modeswitch/1726:f00e 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:0031 usr/share/usb_modeswitch/19d2:0040 usr/share/usb_modeswitch/19d2:0053 -usr/share/usb_modeswitch/19d2:0083 usr/share/usb_modeswitch/19d2:0083:uPr=WCDMA usr/share/usb_modeswitch/19d2:0101 usr/share/usb_modeswitch/19d2:0103 @@ -217,6 +227,7 @@ usr/share/usb_modeswitch/19d2:0154 usr/share/usb_modeswitch/19d2:0166 usr/share/usb_modeswitch/19d2:0169 usr/share/usb_modeswitch/19d2:0266 +usr/share/usb_modeswitch/19d2:0304 usr/share/usb_modeswitch/19d2:0325 usr/share/usb_modeswitch/19d2:1001 usr/share/usb_modeswitch/19d2:1007 @@ -229,6 +240,7 @@ 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:1225 usr/share/usb_modeswitch/19d2:1227 usr/share/usb_modeswitch/19d2:1514 usr/share/usb_modeswitch/19d2:1517 @@ -237,6 +249,7 @@ usr/share/usb_modeswitch/19d2:1523 usr/share/usb_modeswitch/19d2:1528 usr/share/usb_modeswitch/19d2:1542 usr/share/usb_modeswitch/19d2:2000 +usr/share/usb_modeswitch/19d2:2004 usr/share/usb_modeswitch/19d2:bccd usr/share/usb_modeswitch/19d2:ffde usr/share/usb_modeswitch/19d2:ffe6 @@ -248,6 +261,7 @@ usr/share/usb_modeswitch/1ab7:5700 usr/share/usb_modeswitch/1b7d:0700 usr/share/usb_modeswitch/1bbb:000f usr/share/usb_modeswitch/1bbb:00ca +usr/share/usb_modeswitch/1bbb:011f usr/share/usb_modeswitch/1bbb:f000 usr/share/usb_modeswitch/1bbb:f017 usr/share/usb_modeswitch/1bbb:f052 @@ -296,5 +310,7 @@ usr/share/usb_modeswitch/22f4:0021 usr/share/usb_modeswitch/230d:0001 usr/share/usb_modeswitch/230d:0007 usr/share/usb_modeswitch/230d:0101 +usr/share/usb_modeswitch/230d:0103 usr/share/usb_modeswitch/2357:0200 +usr/share/usb_modeswitch/2357:f000 usr/share/usb_modeswitch/8888:6500 diff --git a/config/rootfiles/core/fifteen/filelists/usb_modeswitch b/config/rootfiles/core/fifteen/filelists/usb_modeswitch new file mode 120000 index 000000000..acbab6f33 --- /dev/null +++ b/config/rootfiles/core/fifteen/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/fifteen/filelists/usb_modeswitch_data b/config/rootfiles/core/fifteen/filelists/usb_modeswitch_data new file mode 120000 index 000000000..4cbce46cf --- /dev/null +++ b/config/rootfiles/core/fifteen/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/fifteen/update.sh b/config/rootfiles/core/fifteen/update.sh index 8e0c2e1ed..54e756c62 100644 --- a/config/rootfiles/core/fifteen/update.sh +++ b/config/rootfiles/core/fifteen/update.sh @@ -109,6 +109,7 @@ add_to_backup srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi add_to_backup var/ipfire/{dmzholes,portfw,outgoing,xtaccess} add_to_backup etc/inittab add_to_backup etc/fstab +add_to_backup usr/share/usb_modeswitch # Backup the files tar cJvf /var/ipfire/backup/core-upgrade$core_$KVER.tar.xz \ @@ -137,6 +138,9 @@ rm -rf /boot/uImage-ipfire-* rm -rf /boot/uInit-ipfire-* rm -rf /lib/modules +# Remove old usb_modeswitch_data +rm -rf /usr/share/usb_modeswitch + # # Remove old udev rules. # diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch index 0f2807853..b0cf7d359 100644 --- a/lfs/usb_modeswitch +++ b/lfs/usb_modeswitch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team # +# Copyright (C) 2007-2014 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.2.6 +VER = 2.0.1 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 = 3cd804ad2dd4cb61fbd77a5cc033496c +$(DL_FILE)_MD5 = e48d4419d0574d342bb183f7465556d0 install : $(TARGET) diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data index 709434c74..95aeac608 100644 --- a/lfs/usb_modeswitch_data +++ b/lfs/usb_modeswitch_data @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team # +# Copyright (C) 2007-2014 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 = 20130610 +VER = 20131113 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 = 52dff3f54e0c01dad02639d642e089e0 +$(DL_FILE)_MD5 = 7b5ac1226b360ddc366c286e62b3c3a4 install : $(TARGET)