From a0cc21923b373f9a94483f162f88c2ed67b74afc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:10:11 +0000 Subject: [PATCH 01/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index f782d8d..0550d70 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten Group: Applications/System @@ -78,6 +78,9 @@ make install \ %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Aug 18 2017 Lubomir Rintel - 2.5.1-1 - New 2.5.1 release From 881e9241f3a994d5ea953f980185399477d808e6 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 23 Feb 2018 16:23:06 +0100 Subject: [PATCH 02/32] Use LDFLAGS from redhat-rpm-config --- usb_modeswitch.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 0550d70..49cbc4f 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten Group: Applications/System @@ -55,7 +55,8 @@ cp -f %{SOURCE1} device_reference.txt %build -CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} +%{set_build_flags} +make %{?_smp_mflags} %install @@ -78,6 +79,9 @@ make install \ %changelog +* Fri Feb 23 2018 Florian Weimer - 2.5.1-3 +- Use LDFLAGS from redhat-rpm-config + * Fri Feb 09 2018 Fedora Release Engineering - 2.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 44f1f6829084d77c630b0a0cb268162e56750120 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 28 Feb 2018 22:19:47 +0100 Subject: [PATCH 03/32] New 2.5.2 release --- 0001-Fix-crash-on-early-fail.patch | 29 ------------------- ...h-count-the-target-devices-from-zero.patch | 12 ++++---- ...sb_modeswitch-fix-a-wrong-comparison.patch | 26 ----------------- rhbz948451-fix-manual-pages.patch | 23 --------------- sources | 2 +- usb_modeswitch.spec | 24 ++++++--------- 6 files changed, 16 insertions(+), 100 deletions(-) delete mode 100644 0001-Fix-crash-on-early-fail.patch rename 0002-usb_modeswitch-count-the-target-devices-from-zero.patch => 0001-usb_modeswitch-count-the-target-devices-from-zero.patch (67%) delete mode 100644 0001-usb_modeswitch-fix-a-wrong-comparison.patch delete mode 100644 rhbz948451-fix-manual-pages.patch diff --git a/0001-Fix-crash-on-early-fail.patch b/0001-Fix-crash-on-early-fail.patch deleted file mode 100644 index bab74dc..0000000 --- a/0001-Fix-crash-on-early-fail.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 73001792b29f080fcabc57f30d6030bedb2a24b0 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Wed, 20 Jul 2016 21:14:10 +0200 -Subject: [PATCH] Fix crash on early fail - -Don't uninitialize libusb if it has not been initialized yet. - -https://bugzilla.redhat.com/show_bug.cgi?id=1358472 ---- - usb_modeswitch.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/usb_modeswitch.c b/usb_modeswitch.c -index cbb8c28..f9c8b2e 100644 ---- a/usb_modeswitch.c -+++ b/usb_modeswitch.c -@@ -2021,7 +2021,8 @@ void close_all() - libusb_close(devh); - // libusb_exit will crash on Raspbian 7, crude protection - #ifndef __ARMEL__ -- libusb_exit(NULL); -+ if (ctx) -+ libusb_exit(NULL); - #endif - if (sysmode) - closelog(); --- -2.7.4 - diff --git a/0002-usb_modeswitch-count-the-target-devices-from-zero.patch b/0001-usb_modeswitch-count-the-target-devices-from-zero.patch similarity index 67% rename from 0002-usb_modeswitch-count-the-target-devices-from-zero.patch rename to 0001-usb_modeswitch-count-the-target-devices-from-zero.patch index 144d93d..822ee72 100644 --- a/0002-usb_modeswitch-count-the-target-devices-from-zero.patch +++ b/0001-usb_modeswitch-count-the-target-devices-from-zero.patch @@ -1,7 +1,7 @@ -From 9d05fe0e0f6b049520d97a47d042d5cfad35b5d6 Mon Sep 17 00:00:00 2001 +From 99cade3624c432a478e624f278692cdedf4e0450 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 18 Aug 2017 10:40:41 +0200 -Subject: [PATCH 2/2] usb_modeswitch: count the target devices from zero +Subject: [PATCH] usb_modeswitch: count the target devices from zero Most likely a typo here. --- @@ -9,18 +9,18 @@ Most likely a typo here. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usb_modeswitch.c b/usb_modeswitch.c -index 6948a84..4a1fb5c 100644 +index 3239946..1b3bf9d 100644 --- a/usb_modeswitch.c +++ b/usb_modeswitch.c -@@ -1579,7 +1579,7 @@ int checkSuccess() - * Target device on the same bus with higher device number is returned, +@@ -1582,7 +1582,7 @@ int checkSuccess() * description is read for syslog message */ + // Wait counter passed on from previous loop - for (i=i; i < CheckSuccess; i++) { + for (i=0; i < CheckSuccess; i++) { SHOW_PROGRESS(output," Search for target devices ...\n"); dev = search_devices(&newTargetCount, TargetVendor, TargetProductList, TargetClass, 0, SEARCH_TARGET); -- -2.13.0 +2.14.3 diff --git a/0001-usb_modeswitch-fix-a-wrong-comparison.patch b/0001-usb_modeswitch-fix-a-wrong-comparison.patch deleted file mode 100644 index 863e880..0000000 --- a/0001-usb_modeswitch-fix-a-wrong-comparison.patch +++ /dev/null @@ -1,26 +0,0 @@ -From bcb5b8702adbf568598988fccf256586b5788fcb Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 18 Aug 2017 10:37:15 +0200 -Subject: [PATCH 1/2] usb_modeswitch: fix a wrong comparison - -The char pointer should be dereferences when checking the string is empty. ---- - usb_modeswitch.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/usb_modeswitch.c b/usb_modeswitch.c -index b2b930b..6948a84 100644 ---- a/usb_modeswitch.c -+++ b/usb_modeswitch.c -@@ -1707,7 +1707,7 @@ struct libusb_device* search_devices( int *numFound, int vendor, char* productLi - *numFound = 0; - - /* Sanity check */ -- if (!vendor || productList == '\0') -+ if (!vendor || *productList == '\0') - return NULL; - - listcopy = malloc(strlen(productList)+1); --- -2.13.0 - diff --git a/rhbz948451-fix-manual-pages.patch b/rhbz948451-fix-manual-pages.patch deleted file mode 100644 index 32238b9..0000000 --- a/rhbz948451-fix-manual-pages.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/usb_modeswitch.c b/usb_modeswitch.c -index 52598f7..cbb8c28 100644 ---- a/usb_modeswitch.c -+++ b/usb_modeswitch.c -@@ -2060,7 +2060,8 @@ void printHelp() - " -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 message to send (hex number as string)\n" -- " -2 , -3 additional messages to send (-n recommended)\n" -+ " -2, --message-content2 additional messages to send (-n recommended)\n" -+ " -3, --message-content3 additional messages to send (-n recommended)\n" - " -w, --release-delay NUM wait NUM ms before releasing the interface\n" - " -n, --need-response obsolete, no effect (always on)\n" - " -r, --response-endpoint NUM read response from there (optional)\n" -@@ -2084,7 +2085,7 @@ void printHelp() - " -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 switching result check with timeout\n" -+ " -s, --check-success switching result check with timeout\n" - " -I, --inquire obsolete, no effect\n\n" - " -c, --config-file load long configuration from file\n\n" - " -t, --stdinput read long configuration from stdin\n\n" diff --git a/sources b/sources index 33497be..f0f3584 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usb-modeswitch-2.5.1.tar.bz2) = 23f1866cbb5882280369362f6d3e01d991136f322284d3f343da132520569f9e303cd9c4368a71893a3d959bae6bde2d4325f6dc175a1cb2d4dd5faa61add6ab +SHA512 (usb-modeswitch-2.5.2.tar.bz2) = ad2a7e5134379664fca83b85803e52ec8e3fe3c2d6c633eb5af3c291c43b15ca4a67198612864de01d146a029ee5c475c8c7dc71d16e3a475b532837c5dd34ea diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 49cbc4f..3887da0 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -1,8 +1,8 @@ %define source_name usb-modeswitch Name: usb_modeswitch -Version: 2.5.1 -Release: 3%{?dist} +Version: 2.5.2 +Release: 1%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten Group: Applications/System @@ -12,16 +12,10 @@ URL: http://www.draisberghof.de/usb_modeswitch/ Source0: http://www.draisberghof.de/%{name}/%{source_name}-%{version}.tar.bz2 Source1: http://www.draisberghof.de/usb_modeswitch/device_reference.txt -# http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?f=2&t=2546 -Patch0: rhbz948451-fix-manual-pages.patch # Submitted upstream (2014-11-24) -Patch1: device_reference-utf8.patch -# http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?f=2&t=2556 -Patch2: 0001-Fix-crash-on-early-fail.patch -# http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?f=2&t=2732 -Patch3: 0001-usb_modeswitch-fix-a-wrong-comparison.patch +Patch0: device_reference-utf8.patch # http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?f=2&t=2733 -Patch4: 0002-usb_modeswitch-count-the-target-devices-from-zero.patch +Patch1: 0001-usb_modeswitch-count-the-target-devices-from-zero.patch BuildRequires: libusbx-devel BuildRequires: jimtcl-devel @@ -47,11 +41,8 @@ Vodafone, Option, ZTE und Novatell werden unterstützt. %setup -q -n %{source_name}-%{version} cp -f %{SOURCE1} device_reference.txt -%patch0 -p1 -b .manpage -%patch1 -p0 -b .utf8 -%patch2 -p1 -b .libusb_exit -%patch3 -p1 -b .char_deref -%patch4 -p1 -b .zero_iter +%patch0 -p0 +%patch1 -p1 %build @@ -79,6 +70,9 @@ make install \ %changelog +* Wed Feb 28 2018 Lubomir Rintel - 2.5.2-1 +- New 2.5.2 release + * Fri Feb 23 2018 Florian Weimer - 2.5.1-3 - Use LDFLAGS from redhat-rpm-config From 583d7c750034d9d66f82c9ffb3f3640d558c6b9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:19:42 +0000 Subject: [PATCH 04/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 3887da0..6626648 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten Group: Applications/System @@ -70,6 +70,9 @@ make install \ %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 28 2018 Lubomir Rintel - 2.5.2-1 - New 2.5.2 release From 5e11010ea9dc25517e5516ff2180ca929ac33106 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 24 Jul 2018 16:37:42 +0200 Subject: [PATCH 05/32] Add missing BuildRequires on gcc /bin/sh: cc: command not found References: https://bugzilla.redhat.com/show_bug.cgi?id=1606622 Signed-off-by: Igor Gnatenko --- usb_modeswitch.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 6626648..9a0baa2 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -17,6 +17,7 @@ Patch0: device_reference-utf8.patch # http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?f=2&t=2733 Patch1: 0001-usb_modeswitch-count-the-target-devices-from-zero.patch +BuildRequires: gcc BuildRequires: libusbx-devel BuildRequires: jimtcl-devel BuildRequires: systemd From 0f7f377d1bf947340931513177cc6e8c5966bff9 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 06/32] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- usb_modeswitch.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 9a0baa2..f570cba 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -5,7 +5,6 @@ Version: 2.5.2 Release: 2%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten -Group: Applications/System License: GPLv2+ URL: http://www.draisberghof.de/usb_modeswitch/ From abe42ed6b84a60822aae89ca4d4d7a9499860401 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:56:53 +0000 Subject: [PATCH 07/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index f570cba..a6e3ae8 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.5.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPLv2+ @@ -70,6 +70,9 @@ make install \ %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2.5.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2.5.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From b19e83bb5490fd5bfcd1ad3d7ed7ebcd5831498f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:38:54 +0000 Subject: [PATCH 08/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index a6e3ae8..cbe2af0 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.5.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPLv2+ @@ -70,6 +70,9 @@ make install \ %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.5.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 2.5.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d78d63e3d262c5005b7b89747cc801ca7037d279 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:45:54 +0000 Subject: [PATCH 09/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index cbe2af0..31c1f5e 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.5.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPLv2+ @@ -70,6 +70,9 @@ make install \ %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2.5.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 2.5.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 870d68e8f351c0feed424ce3d63e858d6d7f51df Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 24 Mar 2020 15:51:28 +0100 Subject: [PATCH 10/32] New 2.6.0 release --- sources | 2 +- usb_modeswitch.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index f0f3584..8c9f5d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usb-modeswitch-2.5.2.tar.bz2) = ad2a7e5134379664fca83b85803e52ec8e3fe3c2d6c633eb5af3c291c43b15ca4a67198612864de01d146a029ee5c475c8c7dc71d16e3a475b532837c5dd34ea +SHA512 (usb-modeswitch-2.6.0.tar.bz2) = 43e6d885380602ddaaf771af73a302a7de30f7ae6ea58b2b572a9ad9ec77a453789020595de33a8b04ec209414fe08face2bbf84c67271d7b6b90700face09ef diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 31c1f5e..34bf55d 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -1,8 +1,8 @@ %define source_name usb-modeswitch Name: usb_modeswitch -Version: 2.5.2 -Release: 5%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPLv2+ @@ -70,6 +70,9 @@ make install \ %changelog +* Tue Mar 24 2020 Lubomir Rintel - 2.6.0-1 +- New 2.6.0 release + * Fri Jan 31 2020 Fedora Release Engineering - 2.5.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 8a2687d26df8c3658d7a3545f50046fe9c26b03b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:24:50 +0000 Subject: [PATCH 11/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 34bf55d..12ac4fe 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPLv2+ @@ -70,6 +70,9 @@ make install \ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Mar 24 2020 Lubomir Rintel - 2.6.0-1 - New 2.6.0 release From 421c517eafe1ece07e0bc761193db6949702b308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 29 Sep 2020 23:58:21 +0100 Subject: [PATCH 12/32] Use make macros (https://src.fedoraproject.org/rpms/usb_modeswitch/pull-request/1) https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- usb_modeswitch.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 12ac4fe..26dcf92 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPLv2+ @@ -47,13 +47,12 @@ cp -f %{SOURCE1} device_reference.txt %build %{set_build_flags} -make %{?_smp_mflags} +%make_build %install mkdir -p $RPM_BUILD_ROOT%{_unitdir} -make install \ - DESTDIR=$RPM_BUILD_ROOT \ +%make_install \ SYSDIR=$RPM_BUILD_ROOT%{_unitdir} \ UDEVDIR=$RPM_BUILD_ROOT%{_prefix}/lib/udev @@ -70,6 +69,10 @@ make install \ %changelog +* Tue Sep 29 2020 Sérgio Basto - 2.6.0-3 +- Use make macros (https://src.fedoraproject.org/rpms/usb_modeswitch/pull-request/1) +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Wed Jul 29 2020 Fedora Release Engineering - 2.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 8258cbbb77096aee1d03f1d6a308ad628aebaef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 30 Nov 2020 00:39:59 +0000 Subject: [PATCH 13/32] Update usb_modeswitch to 2.6.1 Drop patch1, http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?f=2&t=2733 Drop BR jimtcl-devel, if we don't install dynlink-dispatcher --- sources | 2 +- usb_modeswitch.spec | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/sources b/sources index 8c9f5d0..85020d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usb-modeswitch-2.6.0.tar.bz2) = 43e6d885380602ddaaf771af73a302a7de30f7ae6ea58b2b572a9ad9ec77a453789020595de33a8b04ec209414fe08face2bbf84c67271d7b6b90700face09ef +SHA512 (usb-modeswitch-2.6.1.tar.bz2) = 5d800b45257ca1182a13155dc37b614ee2d93273ed226cc9d05b6ae423f9e88b7c9aca6829604bdb86f68707ddf2c51c9ad2bcf898b8261b2c5bb56a21351e1e diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 26dcf92..da06fc9 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -1,8 +1,8 @@ %define source_name usb-modeswitch Name: usb_modeswitch -Version: 2.6.0 -Release: 3%{?dist} +Version: 2.6.1 +Release: 1%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPLv2+ @@ -13,12 +13,11 @@ Source1: http://www.draisberghof.de/usb_modeswitch/device_reference.txt # Submitted upstream (2014-11-24) Patch0: device_reference-utf8.patch -# http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?f=2&t=2733 -Patch1: 0001-usb_modeswitch-count-the-target-devices-from-zero.patch BuildRequires: gcc BuildRequires: libusbx-devel -BuildRequires: jimtcl-devel +# "tcl" or "jimsh"), use the light-weight installation: +#BuildRequires: jimtcl-devel BuildRequires: systemd Requires: usb_modeswitch-data >= 20121109 Requires: systemd @@ -42,11 +41,12 @@ Vodafone, Option, ZTE und Novatell werden unterstützt. cp -f %{SOURCE1} device_reference.txt %patch0 -p0 -%patch1 -p1 %build %{set_build_flags} +# this will require jimtcl-devel +#make_build all-with-dynlink-dispatcher %make_build @@ -69,6 +69,11 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir} %changelog +* Wed Nov 18 2020 Sérgio Basto - 2.6.1-1 +- Update usb_modeswitch to 2.6.1 +- Drop patch1, http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?f=2&t=2733 +- Drop BR jimtcl-devel, if we don't install dynlink-dispatcher + * Tue Sep 29 2020 Sérgio Basto - 2.6.0-3 - Use make macros (https://src.fedoraproject.org/rpms/usb_modeswitch/pull-request/1) - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From 9001135f20acbad4537169990a5f1aa7aec8e1ef Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:29:12 +0000 Subject: [PATCH 14/32] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- usb_modeswitch.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index da06fc9..748e61d 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -14,6 +14,7 @@ Source1: http://www.draisberghof.de/usb_modeswitch/device_reference.txt # Submitted upstream (2014-11-24) Patch0: device_reference-utf8.patch +BuildRequires: make BuildRequires: gcc BuildRequires: libusbx-devel # "tcl" or "jimsh"), use the light-weight installation: From 6ca83012be88dfbcb419de35b120122580bbbe05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:46:57 +0000 Subject: [PATCH 15/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 748e61d..985d47c 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPLv2+ @@ -70,6 +70,9 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir} %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Nov 18 2020 Sérgio Basto - 2.6.1-1 - Update usb_modeswitch to 2.6.1 - Drop patch1, http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?f=2&t=2733 From 49b50913421d4f5fe931ebd0832a36573f7ffd42 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:09:46 +0000 Subject: [PATCH 16/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 985d47c..7aee53a 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPLv2+ @@ -70,6 +70,9 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir} %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 2.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 9718ae0f033794be4497eba2a99521c59586d86a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:38:53 +0000 Subject: [PATCH 17/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 7aee53a..f3c632c 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPLv2+ @@ -70,6 +70,9 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir} %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 2.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From a38ecae85205a56652b96b4faf96be28ab1cd85f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:31:50 +0000 Subject: [PATCH 18/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index f3c632c..4356975 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPLv2+ @@ -70,6 +70,9 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir} %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 2.6.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From c848680baedcb3b7ab5c77257614f996261c0768 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:57:03 +0000 Subject: [PATCH 19/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 4356975..c86b93e 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPLv2+ @@ -70,6 +70,9 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir} %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.6.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 2e63e4c74f9126111c996a9918628ae794dd4506 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:15:04 +0000 Subject: [PATCH 20/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index c86b93e..d8dc392 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPLv2+ @@ -70,6 +70,9 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir} %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.6.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 2.6.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 80331ece0f63e7693924db492b385a33335c4a17 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Thu, 24 Aug 2023 19:34:56 +0200 Subject: [PATCH 21/32] Cleanup spec: use %license, use %patch 0 - Use spdx license specifier - Remove unused patch --- ...h-count-the-target-devices-from-zero.patch | 26 ------------------- usb_modeswitch.spec | 11 +++++--- 2 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 0001-usb_modeswitch-count-the-target-devices-from-zero.patch diff --git a/0001-usb_modeswitch-count-the-target-devices-from-zero.patch b/0001-usb_modeswitch-count-the-target-devices-from-zero.patch deleted file mode 100644 index 822ee72..0000000 --- a/0001-usb_modeswitch-count-the-target-devices-from-zero.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 99cade3624c432a478e624f278692cdedf4e0450 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 18 Aug 2017 10:40:41 +0200 -Subject: [PATCH] usb_modeswitch: count the target devices from zero - -Most likely a typo here. ---- - usb_modeswitch.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/usb_modeswitch.c b/usb_modeswitch.c -index 3239946..1b3bf9d 100644 ---- a/usb_modeswitch.c -+++ b/usb_modeswitch.c -@@ -1582,7 +1582,7 @@ int checkSuccess() - * description is read for syslog message - */ - // Wait counter passed on from previous loop -- for (i=i; i < CheckSuccess; i++) { -+ for (i=0; i < CheckSuccess; i++) { - SHOW_PROGRESS(output," Search for target devices ...\n"); - dev = search_devices(&newTargetCount, TargetVendor, TargetProductList, - TargetClass, 0, SEARCH_TARGET); --- -2.14.3 - diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index d8dc392..1e8ca40 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPLv2+ @@ -41,7 +41,7 @@ Vodafone, Option, ZTE und Novatell werden unterstützt. %setup -q -n %{source_name}-%{version} cp -f %{SOURCE1} device_reference.txt -%patch0 -p0 +%patch 0 -p0 %build @@ -66,10 +66,15 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir} %{_prefix}/lib/udev/usb_modeswitch %{_unitdir}/usb_modeswitch@.service %config(noreplace) %{_sysconfdir}/usb_modeswitch.conf -%doc COPYING README ChangeLog device_reference.txt +%doc README ChangeLog device_reference.txt +%license COPYING %changelog +* Thu Aug 24 2023 Till Maas - 2.6.1-8 +- Cleanup spec: use %%license, use %%patch 0 +- Use spdx license specifier + * Sat Jul 22 2023 Fedora Release Engineering - 2.6.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 674dbed569c51da70e5db9d6a21c527d11d22d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= Date: Thu, 2 Nov 2023 16:00:46 +0100 Subject: [PATCH 22/32] Really use SPDX license identifier --- usb_modeswitch.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 1e8ca40..1c4a45a 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,10 +2,10 @@ Name: usb_modeswitch Version: 2.6.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten -License: GPLv2+ +License: GPL-2.0-or-later URL: http://www.draisberghof.de/usb_modeswitch/ Source0: http://www.draisberghof.de/%{name}/%{source_name}-%{version}.tar.bz2 @@ -71,6 +71,9 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir} %changelog +* Thu Nov 2 2023 Íñigo Huguet - 2.6.1-9 +- Really use SPDX license specifier + * Thu Aug 24 2023 Till Maas - 2.6.1-8 - Cleanup spec: use %%license, use %%patch 0 - Use spdx license specifier From d4c4cd8bdc991acb14e9c1a0bc17003c8b91e0a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:16:03 +0000 Subject: [PATCH 23/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 1c4a45a..941af31 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPL-2.0-or-later @@ -71,6 +71,9 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir} %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.6.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Nov 2 2023 Íñigo Huguet - 2.6.1-9 - Really use SPDX license specifier From 109fa600da9ed93fe023dcebda30a82730bccab4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:24:06 +0000 Subject: [PATCH 24/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 941af31..f9eff0f 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPL-2.0-or-later @@ -71,6 +71,9 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir} %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.6.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.6.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ec98dd90b073bad9355ee2c47b5fc8b72dc8fd64 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:55:05 +0000 Subject: [PATCH 25/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index f9eff0f..a87d449 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPL-2.0-or-later @@ -71,6 +71,9 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir} %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.6.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 2.6.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b2294969f258acd735edc2d02c73cc2cd54b173a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 20 Feb 2025 01:00:02 +0000 Subject: [PATCH 26/32] Update usb_modeswitch to 2.6.2 Resolves: rhbz#2346392 --- device_reference.txt | 14 ++++++++------ sources | 2 +- usb_modeswitch.spec | 18 ++++++++++++------ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/device_reference.txt b/device_reference.txt index d34ec3e..d3065d9 100644 --- a/device_reference.txt +++ b/device_reference.txt @@ -1,16 +1,16 @@ # # Device Reference (UTF-8 encoding used) # -# Last modified: 2014-05-29 +# Last modified: 2017-02-05 # # Collection of configurations for usb_modeswitch, a mode switching # tool for controlling flip flop (multiple mode) USB devices # # Detailed instructions and a friendly forum on the homepage: # http://www.draisberghof.de/usb_modeswitch -# -# You may want to check for a newer version of this file at: -# http://www.draisberghof.de/usb_modeswitch/device_reference.txt +# +# Note that new devices are no longer added to this file. See the +# config files included with the data package for these # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # @@ -21,9 +21,10 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# For a parameter reference see file REFERENCE in the data package +# For a parameter reference see file REFERENCE in the data package or +# http://www.draisberghof.de/usb_modeswitch/parameter_reference.txt # -# If you find working codes and configurations, please contribute +# If you find new working codes and configurations, please report # them! @@ -31,6 +32,7 @@ ####################################################### # Option GlobeSurfer Icon (aka "Vodafone EasyBox") +# This is the thing that started it all ... # # The MessageContent is identical for all Option devices diff --git a/sources b/sources index 85020d3..6e90156 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usb-modeswitch-2.6.1.tar.bz2) = 5d800b45257ca1182a13155dc37b614ee2d93273ed226cc9d05b6ae423f9e88b7c9aca6829604bdb86f68707ddf2c51c9ad2bcf898b8261b2c5bb56a21351e1e +SHA512 (usb-modeswitch-2.6.2.tar.bz2) = adaedf89de3c5f9dc55da7bb5bb3fe8165c0424cffacb00f83876094b7abdc386ced9959e5dbdf46ab06aa1d03fbfca13df539421489ef4d2dd0f72742057f3d diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index a87d449..08a53ba 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -1,8 +1,8 @@ %define source_name usb-modeswitch Name: usb_modeswitch -Version: 2.6.1 -Release: 12%{?dist} +Version: 2.6.2 +Release: 1%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPL-2.0-or-later @@ -52,10 +52,11 @@ cp -f %{SOURCE1} device_reference.txt %install -mkdir -p $RPM_BUILD_ROOT%{_unitdir} +mkdir -p %{buildroot}%{_unitdir} %make_install \ - SYSDIR=$RPM_BUILD_ROOT%{_unitdir} \ - UDEVDIR=$RPM_BUILD_ROOT%{_prefix}/lib/udev + SYSDIR=%{buildroot}%{_unitdir} \ + SBINDIR=%{buildroot}%{_sbindir} \ + UDEVDIR=%{buildroot}%{_udevrulesdir} %files @@ -63,7 +64,7 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir} %{_sbindir}/usb_modeswitch_dispatcher %{_mandir}/man1/usb_modeswitch.1.gz %{_mandir}/man1/usb_modeswitch_dispatcher.1.gz -%{_prefix}/lib/udev/usb_modeswitch +%{_udevrulesdir}/usb_modeswitch %{_unitdir}/usb_modeswitch@.service %config(noreplace) %{_sysconfdir}/usb_modeswitch.conf %doc README ChangeLog device_reference.txt @@ -71,6 +72,11 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir} %changelog +* Thu Feb 20 2025 Sérgio Basto - 2.6.2-1 +- Update usb_modeswitch to 2.6.2 +- Resolves: rhbz#2346392 +- Fix build related to /usr/sbin move + * Sun Jan 19 2025 Fedora Release Engineering - 2.6.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4898f94e0e3f5cd4de76101bc04fa11a9501efc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 20 Feb 2025 01:26:39 +0000 Subject: [PATCH 27/32] vim :retab --- usb_modeswitch.spec | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 08a53ba..1edcff4 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -1,27 +1,27 @@ -%define source_name usb-modeswitch +%define source_name usb-modeswitch -Name: usb_modeswitch -Version: 2.6.2 -Release: 1%{?dist} -Summary: USB Modeswitch gets mobile broadband cards in operational mode -Summary(de): USB Modeswitch aktiviert UMTS-Karten -License: GPL-2.0-or-later -URL: http://www.draisberghof.de/usb_modeswitch/ +Name: usb_modeswitch +Version: 2.6.2 +Release: 1%{?dist} +Summary: USB Modeswitch gets mobile broadband cards in operational mode +Summary(de): USB Modeswitch aktiviert UMTS-Karten +License: GPL-2.0-or-later +URL: http://www.draisberghof.de/usb_modeswitch/ -Source0: http://www.draisberghof.de/%{name}/%{source_name}-%{version}.tar.bz2 -Source1: http://www.draisberghof.de/usb_modeswitch/device_reference.txt +Source0: http://www.draisberghof.de/%{name}/%{source_name}-%{version}.tar.bz2 +Source1: http://www.draisberghof.de/usb_modeswitch/device_reference.txt # Submitted upstream (2014-11-24) Patch0: device_reference-utf8.patch BuildRequires: make BuildRequires: gcc -BuildRequires: libusbx-devel +BuildRequires: libusbx-devel # "tcl" or "jimsh"), use the light-weight installation: -#BuildRequires: jimtcl-devel -BuildRequires: systemd -Requires: usb_modeswitch-data >= 20121109 -Requires: systemd +#BuildRequires: jimtcl-devel +BuildRequires: systemd +Requires: usb_modeswitch-data >= 20121109 +Requires: systemd %description USB Modeswitch brings up your datacard into operational mode. When plugged @@ -30,7 +30,7 @@ installation files. This tool deactivates this cdrom-device and enables the real communication device. It supports most devices built and sold by Huawei, T-Mobile, Vodafone, Option, ZTE, Novatel. -%description -l de +%description -l de USB Modeswitch deaktiviert die CDROM-Emulation einiger UMTS-Karten. Dadurch erkennt Linux die Datenkarte und kann damit Internet- Verbindungen aufbauen. Die gängigen Karten von Huawei, T-Mobile, From 75c85809651a3969c43a9b2513252d5d466f219d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 27 Feb 2025 13:05:59 +0000 Subject: [PATCH 28/32] Revert the move of usb_modeswitch to /usr/lib/udev/rules.d, usb_modeswitch is not an rule --- usb_modeswitch.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 1edcff4..faefe1c 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPL-2.0-or-later @@ -56,7 +56,7 @@ mkdir -p %{buildroot}%{_unitdir} %make_install \ SYSDIR=%{buildroot}%{_unitdir} \ SBINDIR=%{buildroot}%{_sbindir} \ - UDEVDIR=%{buildroot}%{_udevrulesdir} + UDEVDIR=%{buildroot}%{_prefix}/lib/udev %files @@ -64,7 +64,7 @@ mkdir -p %{buildroot}%{_unitdir} %{_sbindir}/usb_modeswitch_dispatcher %{_mandir}/man1/usb_modeswitch.1.gz %{_mandir}/man1/usb_modeswitch_dispatcher.1.gz -%{_udevrulesdir}/usb_modeswitch +%{_prefix}/lib/udev/usb_modeswitch %{_unitdir}/usb_modeswitch@.service %config(noreplace) %{_sysconfdir}/usb_modeswitch.conf %doc README ChangeLog device_reference.txt @@ -72,6 +72,10 @@ mkdir -p %{buildroot}%{_unitdir} %changelog +* Thu Feb 27 2025 Sérgio Basto - 2.6.2-2 +- Revert the move of usb_modeswitch to /usr/lib/udev/rules.d, usb_modeswitch is + not an rule + * Thu Feb 20 2025 Sérgio Basto - 2.6.2-1 - Update usb_modeswitch to 2.6.2 - Resolves: rhbz#2346392 From 98f0e006befea208d8e72f37dff6a757b3fa914b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:51:55 +0000 Subject: [PATCH 29/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index faefe1c..c4125fc 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPL-2.0-or-later @@ -72,6 +72,9 @@ mkdir -p %{buildroot}%{_unitdir} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.6.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Feb 27 2025 Sérgio Basto - 2.6.2-2 - Revert the move of usb_modeswitch to /usr/lib/udev/rules.d, usb_modeswitch is not an rule From 498f59aeeda8bbb76ce40905d1565769130c5c48 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 14 Aug 2025 16:51:51 +0200 Subject: [PATCH 30/32] Do not let the unit send SIGTERM to usb_modeswitch mid-switch. --- usb_modeswitch-2.6.2-SIGTERM.patch | 49 ++++++++++++++++++++++++++++++ usb_modeswitch.spec | 10 ++++-- 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 usb_modeswitch-2.6.2-SIGTERM.patch diff --git a/usb_modeswitch-2.6.2-SIGTERM.patch b/usb_modeswitch-2.6.2-SIGTERM.patch new file mode 100644 index 0000000..ce4352b --- /dev/null +++ b/usb_modeswitch-2.6.2-SIGTERM.patch @@ -0,0 +1,49 @@ +From e3cf80c95a1c67d05dded68ec171bfde4686003f Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Thu, 14 Aug 2025 16:35:56 +0200 +Subject: [PATCH] service: Do not ever send SIGTERM to the unit + +Following happens when modem 03f0:a31d (HP lt4132 LTE/HSPA+ 4G Module) is +plugged: + +- systemd-udevd emits "add" action +- The "add" action triggers restart of usb_modeswitch@.service +- usb_modeswitch@.service starts usb_modeswitch +- Another udev rule renames the network interface from usb0 to enp0... +- Above causes systemd-udevd emit "change" action for the device +- The "change" action triggers another restart of usb_modeswitch@.service +- usb_modeswitch run initially gets terminated mid-air +- Device drops off the bus +- Infinite sadness + +Possible solutions: + +- The udev rule could just emit the "change" action. I have no idea why + it handles "change" actions, but it looks intentional -> No touchy + from me. +- usb_modeswitch could just trap TERM and shut down gracefully. This + involves Tcl -> No touchy. +- The systemd unit could just send an innocent signal instead of TERM + and just let usb_modeswitch end its life journey naturally. + Let's do this, because it involves least brain. + +Anybody please feel free to send this upstream. +--- + usb_modeswitch@.service | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/usb_modeswitch@.service b/usb_modeswitch@.service +index 22d2ea7..23d4ed0 100644 +--- a/usb_modeswitch@.service ++++ b/usb_modeswitch@.service +@@ -7,3 +7,7 @@ ExecStart=/usr/sbin/usb_modeswitch_dispatcher --switch-mode %i + # Testing + #ExecStart=/bin/echo "usb_modeswitch.service: device name is %i" + ++# Do not ever terminate violently on restart -- interrupting the switching ++# transaction will crash some modems! We'll terminate shortly anyways. ++# If we hang, FinalKillSignal (defaults to SIGKILL) will take care of that. ++KillSignal=SIGCONT +-- +2.50.1 + diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index c4125fc..b6413f4 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPL-2.0-or-later @@ -13,8 +13,10 @@ Source1: http://www.draisberghof.de/usb_modeswitch/device_reference.txt # Submitted upstream (2014-11-24) Patch0: device_reference-utf8.patch +# Not submitted upstream due to lack of courage +Patch1: usb_modeswitch-2.6.2-SIGTERM.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc BuildRequires: libusbx-devel # "tcl" or "jimsh"), use the light-weight installation: @@ -42,6 +44,7 @@ Vodafone, Option, ZTE und Novatell werden unterstützt. cp -f %{SOURCE1} device_reference.txt %patch 0 -p0 +%patch 1 -p1 %build @@ -72,6 +75,9 @@ mkdir -p %{buildroot}%{_unitdir} %changelog +* Thu Aug 14 2025 Lubomir Rintel - 2.6.2-4 +- Do not let the unit send SIGTERM to usb_modeswitch mid-switch. + * Fri Jul 25 2025 Fedora Release Engineering - 2.6.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From f8de5edc6887d3f8468b0ea6bd59e365963de0d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:41:04 +0000 Subject: [PATCH 31/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index b6413f4..351889f 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPL-2.0-or-later @@ -75,6 +75,9 @@ mkdir -p %{buildroot}%{_unitdir} %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 2.6.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Thu Aug 14 2025 Lubomir Rintel - 2.6.2-4 - Do not let the unit send SIGTERM to usb_modeswitch mid-switch. From d1134f50580081fdd195ea5c9ab24dac6b59f2d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:15:41 +0000 Subject: [PATCH 32/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- usb_modeswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 351889f..b4fa0c0 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.6.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten License: GPL-2.0-or-later @@ -75,6 +75,9 @@ mkdir -p %{buildroot}%{_unitdir} %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.6.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 2.6.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild