Revision: 5981
http://ipcop.svn.sourceforge.net/ipcop/?rev=5981&view=rev
Author: owes
Date: 2011-10-25 12:19:09 +0000 (Tue, 25 Oct 2011)
Log Message:
-----------
Update usb-modeswitch to 1.2.0. The 'jimsh-version' is no longer available,
usb_modeswitch_dispatcher can now be build as binary with 'included' TCL
interpreter.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/usb-modeswitch
ipcop/trunk/lfs/usb-modeswitch
ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1
ipcop/trunk/updates/2.0.1/information.xml
ipcop/trunk/updates/2.0.1/setup
Removed Paths:
-------------
ipcop/trunk/src/patches/usb-modeswitch-1.1.9-jimsh_default-if.patch
Modified: ipcop/trunk/config/rootfiles/common/usb-modeswitch
===================================================================
--- ipcop/trunk/config/rootfiles/common/usb-modeswitch 2011-10-25 05:56:05 UTC
(rev 5980)
+++ ipcop/trunk/config/rootfiles/common/usb-modeswitch 2011-10-25 12:19:09 UTC
(rev 5981)
@@ -1,6 +1,5 @@
etc/usb_modeswitch.conf
lib/udev/usb_modeswitch
-usr/bin/jimsh
usr/sbin/usb_modeswitch
usr/sbin/usb_modeswitch_dispatcher
#usr/share/man/man1/usb_modeswitch.1
Modified: ipcop/trunk/lfs/usb-modeswitch
===================================================================
--- ipcop/trunk/lfs/usb-modeswitch 2011-10-25 05:56:05 UTC (rev 5980)
+++ ipcop/trunk/lfs/usb-modeswitch 2011-10-25 12:19:09 UTC (rev 5981)
@@ -32,10 +32,8 @@
include Config
-# Use the variant including jimsh mini-tcl interpreter
-# Add jimsh on VER, so log_ and files_ have the same name
PKG_NAME = usb-modeswitch
-VER = 1.1.9-jimsh
+VER = 1.2.0
HOST_ARCH = all
OTHER_SRC = yes
@@ -54,7 +52,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5a4a43894b1e68c05f890b40b95f1782
+$(DL_FILE)_MD5 = 1932ab96d6e3c5e0a6bdfac863338627
install : $(TARGET)
@@ -84,14 +82,9 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_DATAAPP) && cd $(DIR_SRC) && tar xf
$(DIR_DL)/$(DL_FILE)
- # apply patch that will be on 1.2.0
- cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(THISAPP)_default-if.patch
- # remove tclsh symlink creation as that break tclsh tree wide and
create issues rebuilding packages with tcl tests
- # link will be remade on cdrom stage
- cd $(DIR_APP) && sed -i '/ln .*jimsh.*tclsh/d' Makefile
+ # Use usb_modeswitch_dispatcher statically linked with TCL interpreter
+ cd $(DIR_APP) && make install-static
- cd $(DIR_APP) && make install
-
@rm -rf $(DIR_APP) $(DIR_DATAAPP)
@$(POSTBUILD)
Deleted: ipcop/trunk/src/patches/usb-modeswitch-1.1.9-jimsh_default-if.patch
===================================================================
--- ipcop/trunk/src/patches/usb-modeswitch-1.1.9-jimsh_default-if.patch
2011-10-25 05:56:05 UTC (rev 5980)
+++ ipcop/trunk/src/patches/usb-modeswitch-1.1.9-jimsh_default-if.patch
2011-10-25 12:19:09 UTC (rev 5981)
@@ -1,37 +0,0 @@
-commit 6ba592574d59bf9ab3aa890f536b00acc60b9095
-Author: Alexander Gordeev <lasa...@lvk.cs.msu.su>
-Date: Wed Aug 31 12:01:04 2011 +0400
-
- use the first available interface instead of zero
-
- In some broken devices interface numbers start from 1 while in other
devices
- with the same VID:PID combination (but under different brand) it's the
usual
- zero. The config file doesn't provide any means to set the right Interface
- variable for them both to work. I think the best way is to dynamically
detect
- the least available interface number.
-
- Signed-off-by: Alexander Gordeev <lasa...@lvk.cs.msu.su>
-
-diff --git a/usb_modeswitch.c b/usb_modeswitch.c
-index 73d7e5d..701dbda 100644
---- a/usb_modeswitch.c
-+++ b/usb_modeswitch.c
-@@ -91,7 +91,7 @@ char ByteString[LINE_DIM/2];
- char buffer[BUF_SIZE];
-
- /* Settable Interface and Configuration (for debugging mostly) (jmw) */
--int Interface = 0, Configuration = 0, AltSetting = -1;
-+int Interface = -1, Configuration = 0, AltSetting = -1;
-
-
- static struct option long_options[] = {
-@@ -437,6 +437,9 @@ int main(int argc, char **argv)
- defaultClass = 8;
- }
-
-+ if (Interface == -1)
-+ Interface =
dev->config[0].interface[0].altsetting[0].bInterfaceNumber;
-+
- /* Check or get endpoints */
- if (strlen(MessageContent) || InquireDevice || CiscoMode) {
- if (!MessageEndpoint)
Modified: ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1
===================================================================
--- ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1 2011-10-25 05:56:05 UTC
(rev 5980)
+++ ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1 2011-10-25 12:19:09 UTC
(rev 5981)
@@ -407,6 +407,11 @@
/usr/share/zoneinfo/posix/Europe/Zaporozhye
/usr/share/zoneinfo/posix/Pacific/Fiji
##
+## usb-modeswitch-1.2.0
+/lib/udev/usb_modeswitch
+/usr/sbin/usb_modeswitch
+/usr/sbin/usb_modeswitch_dispatcher
+##
## usb-modeswitch-data-20111023
/lib/udev/rules.d/40-usb_modeswitch.rules
/usr/share/usb_modeswitch/configPack.tar.gz
Modified: ipcop/trunk/updates/2.0.1/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.1/information.xml 2011-10-25 05:56:05 UTC (rev
5980)
+++ ipcop/trunk/updates/2.0.1/information.xml 2011-10-25 12:19:09 UTC (rev
5981)
@@ -10,7 +10,8 @@
iptables to 1.4.12.1, iw to 3.1, krb5 to 1.9.1, libpng to 1.5.5,
ntp to 4.2.6p4,
openssh to 5.9, openssl to 1.0.0e, openswan to 2.6.36,
pciutils to 3.1.8, pixman to 0.22.2, smartmontools to 5.41, sqlite
to 3.7.8,
- squid to 3.1.16, squid-langpack to 20110902, tzdata to 2011l,
usb-modeswitch-data to 20111023,
+ squid to 3.1.16, squid-langpack to 20110902, tzdata to 2011l,
+ usb-modeswitch to 1.2.0, usb-modeswitch-data to 20111023,
util-linux to 2.20.1, several Perl CPAN modules.</description>
<previousversion>2.0.0</previousversion>
<installdate>INSTALLDATE</installdate>
Modified: ipcop/trunk/updates/2.0.1/setup
===================================================================
--- ipcop/trunk/updates/2.0.1/setup 2011-10-25 05:56:05 UTC (rev 5980)
+++ ipcop/trunk/updates/2.0.1/setup 2011-10-25 12:19:09 UTC (rev 5981)
@@ -92,6 +92,9 @@
/bin/rm -f /usr/lib/libpixman-1.so.0.20.2
/bin/rm -f /usr/lib/libpng15.so.15.4.0
+# Using usb-modeswitch-dispatcher compiled static with TCL
+/bin/rm -f /usr/bin/jimsh
+
# being only prove of concept code, should not have been installed by default
/bin/rm -f /usr/libexec/ipsec/showpolicy
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
