[bug#39142] Update USB_ModeSwitch.

[bug#39142] Update USB_ModeSwitch.

[pelzflorian (Florian Pelz)]

This series updates USB_ModeSwitch and its data package to their
November release.

[bug#39142] [PATCH 1/2] gnu: USB_ModeSwitch: Update to 2.6.0.

[Florian Pelz]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=utf-8, Size: 5719 bytes --]

* gnu/packages/usb-modeswitch.scm (usb-modeswitch): Update to 2.6.0.
[source]: Remove snippet that deletes jimtcl, which is no longer bundled.
Remove patch.  Use HTTPS.
[arguments]: Adapt to changed file names.
[home-page] Use HTTPS.
[license]: Fix missing BSD-2 license.
* gnu/packages/patches/usb-modeswitch-accept-config-arg.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                  |  1 -
 .../usb-modeswitch-accept-config-arg.patch    | 42 -------------------
 gnu/packages/usb-modeswitch.scm               | 23 ++++------
 3 files changed, 8 insertions(+), 58 deletions(-)
 delete mode 100644 gnu/packages/patches/usb-modeswitch-accept-config-arg.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 32ef715bb5..cca5765a56 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1444,7 +1444,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/util-linux-tests.patch			\
   %D%/packages/patches/upower-builddir.patch			\
   %D%/packages/patches/upx-fix-CVE-2017-15056.patch		\
-  %D%/packages/patches/usb-modeswitch-accept-config-arg.patch	\
   %D%/packages/patches/valgrind-enable-arm.patch		\
   %D%/packages/patches/vboot-utils-fix-format-load-address.patch	\
   %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch	\
diff --git a/gnu/packages/patches/usb-modeswitch-accept-config-arg.patch b/gnu/packages/patches/usb-modeswitch-accept-config-arg.patch
deleted file mode 100644
index 9c050f7ee6..0000000000
--- a/gnu/packages/patches/usb-modeswitch-accept-config-arg.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- old/usb_modeswitch.tcl	1970-01-01 01:00:00.000000000 +0100
-+++ usb_modeswitch.tcl	2019-06-12 08:39:42.140000000 +0200
-@@ -41,7 +41,7 @@
- global scsi usb config match device flags setup devdir loginit
- 
- set flags(config) ""
--Log "[ParseGlobalConfig]"
-+Log "[ParseGlobalConfig $argv]"
- 
- if {$flags(stordelay) > 0} {
- 	SetStorageDelay $flags(stordelay)
-@@ -496,9 +496,21 @@
- # end of proc {MatchDevice}
- 
- 
--proc {ParseGlobalConfig} {} {
-+proc {ParseGlobalConfig} {argv} {
- 
- global flags
-+
-+set configFileParam ""
-+for {set i 0} {$i < [llength $argv]} {incr i} {
-+	switch -glob -- [set v [lindex $argv $i]] {
-+		--config-file=* {
-+			set configFileParam $v
-+		}
-+	}
-+}
-+if {$configFileParam != ""} {
-+	set configFile [string range $configFileParam [string length "--config-file="] end]
-+} else {
- set configFile ""
- set places [list /etc/usb_modeswitch.conf /etc/sysconfig/usb_modeswitch /etc/default/usb_modeswitch]
- foreach cfg $places {
-@@ -507,6 +519,7 @@
- 		break
- 	}
- }
-+}
- if {$configFile == ""} {return}
- 
- set rc [open $configFile r]
diff --git a/gnu/packages/usb-modeswitch.scm b/gnu/packages/usb-modeswitch.scm
index 7e4526ae46..8f3edc7f43 100644
--- a/gnu/packages/usb-modeswitch.scm
+++ b/gnu/packages/usb-modeswitch.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de>
+;;; Copyright © 2019, 2020 Florian Pelz <pelzflorian@pelzflorian.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -76,23 +76,15 @@ file for use with USB_ModeSwitch.")
 (define-public usb-modeswitch
   (package
     (name "usb-modeswitch")
-    (version "2.5.2")
+    (version "2.6.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
-                    "http://www.draisberghof.de/usb_modeswitch/"
+                    "https://www.draisberghof.de/usb_modeswitch/"
                     "usb-modeswitch-" version ".tar.bz2"))
               (sha256
                (base32
-                "19ifi80g9ns5dmspchjvfj4ykxssq9yrci8m227dgb3yr04srzxb"))
-              (modules '((guix build utils)))
-              (snippet
-               ;; Remove bundled jimtcl.
-               '(begin
-                  (delete-file-recursively "jim")
-                  #t))
-              (patches
-               (search-patches "usb-modeswitch-accept-config-arg.patch"))))
+                "18wbbxc5cfsmikba0msdvd5qlaga27b32nhrzicyd9mdddp265f2"))))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (inputs `(("libusb" ,libusb)
               ("jimtcl" ,jimtcl)
@@ -145,7 +137,7 @@ file for use with USB_ModeSwitch.")
                  (rename-file "usb_modeswitch.sh" "usb_modeswitch")
                  (install-file "usb_modeswitch" udev)
 
-                 (rename-file "usb_modeswitch.tcl" "usb_modeswitch_dispatcher")
+                 (rename-file "usb_modeswitch_dispatcher.tcl" "usb_modeswitch_dispatcher")
                  (substitute* "usb_modeswitch_dispatcher"
                    (("/usr/bin/tclsh")
                     (string-append jimtcl "/bin/jimsh"))
@@ -155,7 +147,7 @@ file for use with USB_ModeSwitch.")
                  (install-file "usb_modeswitch_dispatcher"
                                dispatcher-bin)
                  #t)))))))
-    (home-page "http://www.draisberghof.de/usb_modeswitch/")
+    (home-page "https://www.draisberghof.de/usb_modeswitch/")
     (synopsis "Mode switching tool for controlling `multi-mode' USB devices")
     (description "USB_ModeSwitch is a mode switching tool for controlling USB
 devices with multiple @dfn{modes}.  When plugged in for the first time many
@@ -163,4 +155,5 @@ USB devices (primarily high-speed WAN modems) act like a flash storage
 containing installers for Windows drivers.  USB_ModeSwitch replays the
 sequence the Windows drivers would send to switch their mode from storage to
 modem (or whatever the thing is supposed to do).")
-    (license license:gpl2+)))
+    (license (list license:gpl2+ ;"this program" according to home page
+                   license:bsd-2)))) ;dispatcher.c
-- 
2.24.1

[bug#39142] [PATCH 2/2] gnu: USB_ModeSwitch data: Update to 20191128.

[Florian Pelz]

* gnu/packages/usb-modeswitch.scm (usb-modeswitch-data): Update to 20191128.
[source] Use HTTPS.
[home-page] Use HTTPS.
---
 gnu/packages/usb-modeswitch.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/usb-modeswitch.scm b/gnu/packages/usb-modeswitch.scm
index 8f3edc7f43..6de810d23d 100644
--- a/gnu/packages/usb-modeswitch.scm
+++ b/gnu/packages/usb-modeswitch.scm
@@ -32,15 +32,15 @@
 (define-public usb-modeswitch-data
   (package
     (name "usb-modeswitch-data")
-    (version "20170806")
+    (version "20191128")
     (source (origin
               (method url-fetch)
               (uri (string-append
-                    "http://www.draisberghof.de/usb_modeswitch/"
+                    "https://www.draisberghof.de/usb_modeswitch/"
                     "usb-modeswitch-data-" version ".tar.bz2"))
               (sha256
                (base32
-                "0b1wari3aza6qjggqd0hk2zsh93k1q8scgmwh6f8wr0flpr3whff"))))
+                "1ygahl3r26r38ai8yyblq9nhf3v5i6n6r6672p5wf88wg5h9n0rz"))))
     (build-system trivial-build-system)
     (native-inputs `(("tar" ,tar)
                      ("bzip2" ,bzip2)))
@@ -67,7 +67,7 @@
            (install-file (string-append files "/40-usb_modeswitch.rules")
                          udev-dir)
            (install-file (string-append files "/COPYING") license-dir)))))
-    (home-page "http://www.draisberghof.de/usb_modeswitch/")
+    (home-page "https://www.draisberghof.de/usb_modeswitch/")
     (synopsis "Data package for USB_ModeSwitch")
     (description "This package contains data about devices and a UDEV rules
 file for use with USB_ModeSwitch.")
-- 
2.24.1

[bug#39142] Update USB_ModeSwitch.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 643 bytes --]


pelzflorian (Florian Pelz) <pelzflorian@pelzflorian.de> writes:

> This series updates USB_ModeSwitch and its data package to their
> November release.

Both patches look good to me :)

There's a somewhat uninformative comparison of Guix without these
patches, and Guix with these patches here [1].

1: https://guix-patches-data.cbaines.net/compare?base_commit=9edae6c05cd879393d59702f033f4c3ccce30dba&target_commit=0115c829cc1021b01b1686c5d28a7f6004390c83

But what it does show is that there aren't any additional lint warnings,
and the derivations can be computed.

I also tried building the derivations on x86_64-linux, and they built :D

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

[bug#39142] Update USB_ModeSwitch.

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 448 bytes --]

Hi,

On Sat, 18 Jan 2020 11:29:41 +0000
Christopher Baines <mail@cbaines.net> wrote:

> 1: https://guix-patches-data.cbaines.net/compare?base_commit=9edae6c05cd879393d59702f033f4c3ccce30dba&target_commit=0115c829cc1021b01b1686c5d28a7f6004390c83

Very nice!

In general, I suggest to also list license changes.  Whether we like it or
not, in practice those happen and it's important to know (especially to know
when they stay the same).

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#39142] Update USB_ModeSwitch.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1065 bytes --]


Danny Milosavljevic <dannym@scratchpost.org> writes:

> Hi,
>
> On Sat, 18 Jan 2020 11:29:41 +0000
> Christopher Baines <mail@cbaines.net> wrote:
>
>> 1: https://guix-patches-data.cbaines.net/compare?base_commit=9edae6c05cd879393d59702f033f4c3ccce30dba&target_commit=0115c829cc1021b01b1686c5d28a7f6004390c83
>
> Very nice!

Thanks :)

> In general, I suggest to also list license changes.  Whether we like it or
> not, in practice those happen and it's important to know (especially to know
> when they stay the same).

So, the Guix Data Service does know what licenses are associated with a
package. I guess it could list packages where that's changed on the main
comparison page, is that what you're referring to?

In my mind at least, the primary issue when reviewing packages is making
sure the license list for the package corresponds with the actual
licenses that apply to the contents. That's a little harder, as you'd
have to download the source tarball, and run licensecheck or something
similar, but hopefully that can be automated at some point!

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

[bug#39142] Update USB_ModeSwitch.

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 1420 bytes --]

Hi,

On Sat, 18 Jan 2020 12:02:46 +0000
Christopher Baines <mail@cbaines.net> wrote:

> > In general, I suggest to also list license changes.  Whether we like it or
> > not, in practice those happen and it's important to know (especially to know
> > when they stay the same).  
> 
> So, the Guix Data Service does know what licenses are associated with a
> package. I guess it could list packages where that's changed on the main
> comparison page, is that what you're referring to?

Yes, on that ".../compare" page, just like "Version changes" there could be
an always-visible section "License changes".

> In my mind at least, the primary issue when reviewing packages is making
> sure the license list for the package corresponds with the actual
> licenses that apply to the contents. That's a little harder, as you'd
> have to download the source tarball, and run licensecheck or something
> similar, but hopefully that can be automated at some point!

I'm not sure that that could ever be reliably automated (after all, the source
code can say whatever license text in the comments--we can't have an
exhaustive list).

In general it would already be much help to automate basically

  grep -ri 'gnu general' $(grep -ril license .)

just in order to reduce the workload.  But I think we already package third
party license checkers for that, no need to do that for Guix Data Service.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

bug#39142: Update USB_ModeSwitch.

[pelzflorian (Florian Pelz)]

On Sat, Jan 18, 2020 at 11:29:41AM +0000, Christopher Baines wrote:
> 
> pelzflorian (Florian Pelz) <pelzflorian@pelzflorian.de> writes:
> 
> > This series updates USB_ModeSwitch and its data package to their
> > November release.
> 
> Both patches look good to me :)
> 

Thank you for the review!  Pushed as
d0759f613480c13b8c81716eb46dc3606b3a34b0 and
17fe068ed7372dbae09043885b8f091105bef143.
Closing this bug.


> There's a somewhat uninformative comparison of Guix without these
> patches, and Guix with these patches here [1].
> 
> 1: https://guix-patches-data.cbaines.net/compare?base_commit=9edae6c05cd879393d59702f033f4c3ccce30dba&target_commit=0115c829cc1021b01b1686c5d28a7f6004390c83
> 
> But what it does show is that there aren't any additional lint warnings,
> and the derivations can be computed.
> 

I do not see the first patch there, but it should be OK.  I have built
it on armhf and x86_64 and successfully modeswitched.

Regards,
Florian