gnu: sg3-utils: Update to 1.43.

* gnu/packages/scsi.scm (sg3-utils): Update to 1.43.
[license]: Add bsd-2.
This commit is contained in:
Tobias Geerinckx-Rice 2018-09-12 16:08:34 +02:00
parent 0f304ba73e
commit bec13d872d
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 10 additions and 6 deletions

View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -18,7 +19,7 @@
(define-module (gnu packages scsi) (define-module (gnu packages scsi)
#:use-module ((guix licenses) #:use-module ((guix licenses)
#:select (gpl2+ bsd-3)) #:select (gpl2+ bsd-2 bsd-3))
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu))
@ -26,14 +27,14 @@
(define-public sg3-utils (define-public sg3-utils
(package (package
(name "sg3-utils") (name "sg3-utils")
(version "1.42") (version "1.43")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://sg.danny.cz/sg/p/sg3_utils-" (uri (string-append "http://sg.danny.cz/sg/p/sg3_utils-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1fg71rj0f1gdjmkj0z8wlv46cf9lryjdyjkbi7fjmssgi5jyvblp")))) "04l58wvncqk6lfh4lashsl3ccsa1114hkd6vwi1h1cbmq2fw9c8v"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://sg.danny.cz/sg/sg3_utils.html") (home-page "http://sg.danny.cz/sg/sg3_utils.html")
(synopsis "SCSI device utilities") (synopsis "SCSI device utilities")
@ -49,6 +50,9 @@ up and down disks (@code{sg_start}), do self tests (@code{sg_senddiag}), parse
sense data (@code{sg_decode_sense}), and perform various other functions. In sense data (@code{sg_decode_sense}), and perform various other functions. In
addition, this package includes a library, called libsgutils, which can be addition, this package includes a library, called libsgutils, which can be
used in C and C++ programs to interact with SCSI devices.") used in C and C++ programs to interact with SCSI devices.")
;; The libsgutils library itself is licensed under bsd-3. Some tools are ;; See README: "All utilities and libraries have either a "2 clause" BSD
;; licensed under bsd-3, also. Some tools are licensed under gpl2+. ;; license or are "GPL-2ed". [...] That BSD license was updated from the
(license (list gpl2+ bsd-3)))) ;; "3 clause" to the newer "2 clause" version on 20180119. To save space
;; various source code files refer to a file called "BSD_LICENSE" [...]."
;; Some files (like sg_compare_and_write.c) retain their 3-clause headers!
(license (list gpl2+ bsd-2 bsd-3))))