rpms/usb_modeswitch
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 2.0.1 and build against libusbx (RHBZ 994974)

Browse Source 
- Use distro jimtcl (RHBZ 967314)
- Fix build on aarch64
- Cleanup and modernise spec
This commit is contained in:
Peter Robinson 2014-01-06 18:09:24 +00:00
parent f26b0a5f27
commit 12b0446425
5 changed files with 4033 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitignore vendored
View File

@ -1,13 +1 @@
usb-modeswitch-1.1.3.tar.bz2 /usb-modeswitch-*.tar.bz2
usb-modeswitch-1.1.4.tar.bz2
/usb-modeswitch-1.1.6.tar.bz2
/usb-modeswitch-1.1.7.tar.bz2
/usb-modeswitch-1.1.9.tar.bz2
/device_reference.txt
/usb-modeswitch-1.2.0.tar.bz2
/usb-modeswitch-1.2.1.tar.bz2
/usb-modeswitch-1.2.2.tar.bz2
/usb-modeswitch-1.2.4.tar.bz2
/usb-modeswitch-1.2.5.tar.bz2
/usb-modeswitch-1.2.6.tar.bz2
/usb-modeswitch-1.2.7.tar.bz2

4016
device_reference.txt Normal file
View File

File diff suppressed because it is too large Load Diff

99
rhbz948451-fix-manual-pages.patch
View File

@ -1,99 +0,0 @@
diff -up usb-modeswitch-1.2.7/usb_modeswitch.1.fix-manual-pages usb-modeswitch-1.2.7/usb_modeswitch.1
--- usb-modeswitch-1.2.7/usb_modeswitch.1.fix-manual-pages 2013-08-20 12:07:24.292188457 +0200
+++ usb-modeswitch-1.2.7/usb_modeswitch.1 2013-08-20 12:30:41.606556395 +0200
@@ -48,10 +48,12 @@ Product ID to look for (mandatory)
Target vendor ID. When given will be searched for and detected initially
for information purposes. If success checking (option \-s) is active,
providing target IDs (vendor/product) or target class is recommended
+.IP "\fB-j\fP \fB\-\-find-mbim\fP " 10
+Return configuration number with MBIM interface and exit.
.IP "\fB-P\fP \fB\-\-target-product NUM\fP " 10
Target product ID
-.IP "\fB-b\fP \fB\-\-busnum NUM\fP " 10
-.IP "\fB-g\fP \fB\-\-devnum NUM\fP " 10
+.IP "\fB-b\fP \fB\-\-bus-num NUM\fP " 10
+.IP "\fB-g\fP \fB\-\-device-num NUM\fP " 10
If bus and device number are provided, the handling of a specific device on
a specific USB port is guaranteed, in contrast to using only the USB ID. This
is important if there are multiple similar devices on a system
@@ -110,7 +112,7 @@ Send a special control message used by P
.IP "\fB-Z\fP \fB\-\-blackberry-mode\fP " 10
Send a special control message used by Blackberry devices
.IP "\fB-O\fP \fB\-\-sony-mode\fP " 10
-Apply a special sequence used by Sony Ericsson devices. Implies option \--success
+Apply a special sequence used by Sony Ericsson devices. Implies option \--check-success
.IP "\fB-L\fP \fB\-\-cisco-mode\fP " 10
Send a sequence of bulk messages used by Cisco devices
.IP "\fB-R\fP \fB\-\-reset-usb\fP " 10
@@ -119,7 +121,7 @@ method or stand alone. It is always done
interactions.
Few devices need it to complete the switching; apart from that it may be
useful during testing
-.IP "\fB-c\fP \fB\-\-config FILENAME\fP " 10
+.IP "\fB-c\fP \fB\-\-config-file FILENAME\fP " 10
Use a specific config file. If any ID or switching options are given as
command line parameters, this option is ignored.
In that case all mandatory parameters have to be provided on
@@ -138,7 +140,7 @@ Print all settings before running and sh
Changes the behaviour of the program slightly. A success message including the
effective target device ID is put out and a syslog notice is issued. Mainly for
integration with a wrapper script
-.IP "\fB-s\fP \fB\-\-success NUM\fP " 10
+.IP "\fB-s\fP \fB\-\-check-success NUM\fP " 10
After switching, keep checking for the result up to max. NUM seconds. If target IDs
or target class were provided, their appearance indicates certain success. Otherwise
the disconnection of the original device is rated as likely proof
diff -up usb-modeswitch-1.2.7/usb_modeswitch.c.fix-manual-pages usb-modeswitch-1.2.7/usb_modeswitch.c
--- usb-modeswitch-1.2.7/usb_modeswitch.c.fix-manual-pages 2013-08-20 12:12:10.752953754 +0200
+++ usb-modeswitch-1.2.7/usb_modeswitch.c 2013-08-20 12:37:27.415242925 +0200
@@ -1968,11 +1968,12 @@ void printHelp()
" -V, --target-vendor NUM target mode vendor ID (optional)\n"
" -P, --target-product NUM target mode product ID (optional)\n"
" -C, --target-class NUM target mode device class (optional)\n"
- " -b, --busnum NUM system bus number of device (for hard ID)\n"
- " -g, --devnum NUM system device number (for hard ID)\n"
+ " -b, --bus-num NUM system bus number of device (for hard ID)\n"
+ " -g, --device-num NUM system device number (for hard ID)\n"
" -m, --message-endpoint NUM direct the message transfer there (optional)\n"
" -M, --message-content <msg> message to send (hex number as string)\n"
- " -2 <msg>, -3 <msg> additional messages to send (-n recommended)\n"
+ " -2, --message-content2 <msg> additional messages to send (-n recommended)\n"
+ " -3, --message-content3 <msg> additional messages to send (-n recommended)\n"
" -n, --need-response read response to the message transfer (CSW)\n"
" -r, --response-endpoint NUM read response from there (optional)\n"
" -d, --detach-only detach the active driver, no further action\n"
@@ -1989,10 +1990,11 @@ void printHelp()
" -Z, --blackberry-mode apply a special procedure\n"
" -F, --pantech-mode apply a special procedure\n"
" -R, --reset-usb reset the device after all other actions\n"
+ " -w, --release-delay <seconds> delay releasing the interface\n"
" -Q, --quiet don't show progress or error messages\n"
" -W, --verbose print all settings and debug output\n"
" -D, --sysmode specific result and syslog message\n"
- " -s, --success <seconds> switching result check with timeout\n"
+ " -s, --check-success <seconds> switching result check with timeout\n"
" -I, --no-inquire do not get SCSI attributes (default on)\n\n"
" -c, --config-file <filename> load long configuration from file\n\n"
" -t, --stdinput read long configuration from stdin\n\n"
diff -up usb-modeswitch-1.2.7/usb_modeswitch_dispatcher.1.fix-manual-pages usb-modeswitch-1.2.7/usb_modeswitch_dispatcher.1
--- usb-modeswitch-1.2.7/usb_modeswitch_dispatcher.1.fix-manual-pages 2013-08-20 11:59:15.467713141 +0200
+++ usb-modeswitch-1.2.7/usb_modeswitch_dispatcher.1 2013-08-20 12:57:51.913947292 +0200
@@ -0,0 +1,18 @@
+.TH "USB_MODESWITCH_DISPATCHER" "1"
+.SH "NAME"
+usb_modeswitch_dispatcher - dispatcher not intended for direct invocation.
+.SH "SYNOPSIS"
+.PP
+\fBusb_modeswitch_dispatcher\fR
+.SH "DESCRIPTION"
+.PP
+usb_modeswitch_dispatcher is doing additional device checking and
+using the usb_modeswitch binary to switch with the selected device config file.
+If no drivers are taking care of the device after the mode switch, the dispatcher
+will try to load and bind the "option" serial driver, in order to make the device
+usable.
+.PP
+This program is called by udev and is not supposed to be called directly
+by the user.
+.SH SEE ALSO
+.BR usb_modeswitch(1).

3
sources
View File

@ -1,2 +1 @@
18d889d72195534ae9133a8181cad42b usb-modeswitch-1.2.7.tar.bz2 e48d4419d0574d342bb183f7465556d0 usb-modeswitch-2.0.1.tar.bz2
dd14f254f6c3642ce16fd7c2f43ee112 device_reference.txt

89
usb_modeswitch.spec
View File

@ -1,18 +1,21 @@
%define source_name usb-modeswitch %define source_name usb-modeswitch
Name: usb_modeswitch Name: usb_modeswitch
Version: 1.2.7 Version: 2.0.1
Release: 3%{?dist} Release: 1%{?dist}
Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary: USB Modeswitch gets mobile broadband cards in operational mode
Summary(de): USB Modeswitch aktiviert UMTS-Karten Summary(de): USB Modeswitch aktiviert UMTS-Karten
Group: Applications/System Group: Applications/System
License: GPLv2+ License: GPLv2+
URL: http://www.draisberghof.de/usb_modeswitch/ URL: http://www.draisberghof.de/usb_modeswitch/
Source0: http://www.draisberghof.de/%{name}/%{source_name}-%{version}.tar.bz2 Source0: http://www.draisberghof.de/%{name}/%{source_name}-%{version}.tar.bz2
Source1: http://www.draisberghof.de/usb_modeswitch/device_reference.txt Source1: http://www.draisberghof.de/usb_modeswitch/device_reference.txt
Patch0: rhbz948451-fix-manual-pages.patch
BuildRequires: libusbx-devel
BuildRequires: jimtcl-devel
BuildRequires: systemd-devel
Requires: usb_modeswitch-data >= 20121109 Requires: usb_modeswitch-data >= 20121109
BuildRequires: libusb-devel
%description %description
USB Modeswitch brings up your datacard into operational mode. When plugged USB Modeswitch brings up your datacard into operational mode. When plugged
@ -30,8 +33,8 @@ Vodafone, Option, ZTE und Novatell werden unterstützt.
%prep %prep
%setup -q -n %{source_name}-%{version} %setup -q -n %{source_name}-%{version}
cp -f %{SOURCE1} device_reference.txt cp -f %{SOURCE1} device_reference.txt
%patch0 -p1 -b .fix-manual-pages
# convert device_reference.txt encoding to UTF-8 # convert device_reference.txt encoding to UTF-8
iconv --from=ISO-8859-1 --to=UTF-8 device_reference.txt > device_reference.txt.new && \ iconv --from=ISO-8859-1 --to=UTF-8 device_reference.txt > device_reference.txt.new && \
@ -40,11 +43,10 @@ chmod 644 device_reference.txt && \
mv device_reference.txt.new device_reference.txt mv device_reference.txt.new device_reference.txt
%build %build
CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} static CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/udev mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/udev
mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
@ -58,9 +60,7 @@ gzip -9c usb_modeswitch_dispatcher.1 > usb_modeswitch_dispatcher.1.gz && install
install -p -m 755 usb_modeswitch.sh $RPM_BUILD_ROOT%{_prefix}/lib/udev/usb_modeswitch install -p -m 755 usb_modeswitch.sh $RPM_BUILD_ROOT%{_prefix}/lib/udev/usb_modeswitch
%files %files
%defattr(-,root,root,-)
%{_sbindir}/usb_modeswitch %{_sbindir}/usb_modeswitch
%{_sbindir}/usb_modeswitch_dispatcher %{_sbindir}/usb_modeswitch_dispatcher
%{_mandir}/man1/usb_modeswitch.1.gz %{_mandir}/man1/usb_modeswitch.1.gz
@ -71,6 +71,12 @@ install -p -m 755 usb_modeswitch.sh $RPM_BUILD_ROOT%{_prefix}/lib/udev/usb_modes
%changelog %changelog
* Mon Jan 6 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2.0.1-1
- Update to 2.0.1 and build against libusbx (RHBZ 994974)
- Use distro jimtcl (RHBZ 967314)
- Fix build on aarch64
- Cleanup and modernise spec
* Wed Aug 28 2013 Thomas Haller <thaller@redhat.com> 1.2.7-3 * Wed Aug 28 2013 Thomas Haller <thaller@redhat.com> 1.2.7-3
- Add manual page for usb_modeswitch_dispatcher and fix errors in - Add manual page for usb_modeswitch_dispatcher and fix errors in
manual page of usb_modeswitch (rhbz#948451, rhbz#884203). manual page of usb_modeswitch (rhbz#948451, rhbz#884203).
@ -128,68 +134,3 @@ install -p -m 755 usb_modeswitch.sh $RPM_BUILD_ROOT%{_prefix}/lib/udev/usb_modes
* Thu Dec 30 2010 Dan Williams <dcbw@redhat.com> 1.1.6-1 * Thu Dec 30 2010 Dan Williams <dcbw@redhat.com> 1.1.6-1
- New upstream version - New upstream version
* Tue Aug 24 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> 1.1.4-1
- New upstream version
* Tue Jun 22 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> 1.1.3-1
- New upstream
* Fri Apr 23 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> - 1.1.2-3
- Fix typo in binary location
* Fri Apr 23 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> - 1.1.2-2
- Move usb_modeswitch binary back to /usr/sbin
- Package /etc/usb_modeswitch.setup for manual mode
* Tue Apr 20 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> - 1.1.2-1
- New upstream
- Split data and main package
* Mon Mar 8 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> - 1.1.0-6
- Version bump for F-12 build
* Sat Mar 6 2010 Huzaifa Sidhpurwala <huzaifas@redaht.com> - 1.1.0-5
- Fix regression in rhbz #571001
- Version bump
* Thu Mar 4 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> 1.1.0-3
- Patch usb_modeswitch to use the binary from /usr/bin/
- usb_modeswitch-data needs tcl
* Tue Mar 2 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> 1.1.0-2
- Reload udev when new rules are installed
* Tue Mar 2 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> 1.1.0-1
- New upstream 1.1.0 release
- Split package into binary and data part
* Thu Sep 17 2009 Peter Robinson <pbrobinson@gmail.com> 1.0.5-1
- new upstream 1.0.5 release
* Sun Aug 02 2009 Robert M. Albrecht <fedora@romal.de> 1.0.2-1
- new upstream release
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Sun Jan 11 2009 Robert M. Albrecht <fedora@romal.de> 0.9.6-1
* new upstream release
* Sat Dec 13 2008 Robert M. Albrecht <fedora@romal.de> 0.9.5-1
* new upstream release
* Sun Jun 22 2008 Robert M. Albrecht <romal@gmx.de> 0.9.4-2
- Fixed some rpmlint errors
- Added german translation
* Sun Jun 22 2008 Robert M. Albrecht <romal@gmx.de> 0.9.4-1
- Update to 0.9.4
- Honor RPM_OPT_FLAGS
* Mon May 26 2008 Robert M. Albrecht <romal@gmx.de> 0.9.4-0.1.beta2
- First package Release