[Buildroot] [PATCH 1/3] package/lsscsi: bump version to 0.31

[Buildroot] [PATCH 1/3] package/lsscsi: bump version to 0.31

[Bernd Kuhls]

Changelog: http://sg.danny.cz/scsi/lsscsi.ChangeLog

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/lsscsi/lsscsi.hash | 2 +-
 package/lsscsi/lsscsi.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/lsscsi/lsscsi.hash b/package/lsscsi/lsscsi.hash
index fe1bc5d8b4..da1764141f 100644
--- a/package/lsscsi/lsscsi.hash
+++ b/package/lsscsi/lsscsi.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 619a2187405f02c5f57682f3478bffc75326803cd08839e39d434250c5518b15  lsscsi-0.30.tgz
+sha256 12bf1973014803c6fd6d547e7594a4c049f0eef3bf5d22190d4be29d7c09f3ca  lsscsi-0.31.tgz
 sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa  COPYING
diff --git a/package/lsscsi/lsscsi.mk b/package/lsscsi/lsscsi.mk
index 70c5226d9b..e9a5255397 100644
--- a/package/lsscsi/lsscsi.mk
+++ b/package/lsscsi/lsscsi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LSSCSI_VERSION = 0.30
+LSSCSI_VERSION = 0.31
 LSSCSI_SOURCE = lsscsi-$(LSSCSI_VERSION).tgz
 LSSCSI_SITE = http://sg.danny.cz/scsi
 LSSCSI_LICENSE = GPL-2.0+
-- 
2.25.0

[Buildroot] [PATCH 2/3] package/sg3_utils: bump version to 1.45

[Bernd Kuhls]

Changelog: http://sg.danny.cz/sg/p/ChangeLog

Removed patch applied upstream:
https://github.com/hreinecke/sg3_utils/commit/180a604b564ca4b3cb972f6d29e1492aa6698896#diff-480477e89f9b6ddafb30c4383dcdd705

Updated BSD license hash due to switch to 2-clause license:
https://github.com/hreinecke/sg3_utils/commit/cb84e1efb96c52dcaae41e9b62b8628bca3c87a4

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 ...le.am-add-missing-RT_LIB-for-sg_turs.patch | 29 -------------------
 package/sg3_utils/sg3_utils.hash              |  4 +--
 package/sg3_utils/sg3_utils.mk                |  6 ++--
 3 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 package/sg3_utils/0002-src-Makefile.am-add-missing-RT_LIB-for-sg_turs.patch

diff --git a/package/sg3_utils/0002-src-Makefile.am-add-missing-RT_LIB-for-sg_turs.patch b/package/sg3_utils/0002-src-Makefile.am-add-missing-RT_LIB-for-sg_turs.patch
deleted file mode 100644
index 34a4e114ec..0000000000
--- a/package/sg3_utils/0002-src-Makefile.am-add-missing-RT_LIB-for-sg_turs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 68b0591cf37760e09e358533bbcecf36eddfceed Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Date: Sun, 10 Feb 2019 14:46:41 +0100
-Subject: [PATCH] src/Makefile.am: add missing @RT_LIB@ for sg_turs
-
-The sg_turs program uses clock_gettime(), so it should link against
-librt, as provided by @RT_LIB at .
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 881cf29..0eba680 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -170,7 +170,7 @@ sg_test_rwbuf_LDADD = ../lib/libsgutils2.la
- 
- sg_timestamp_LDADD = ../lib/libsgutils2.la
- 
--sg_turs_LDADD = ../lib/libsgutils2.la
-+sg_turs_LDADD = ../lib/libsgutils2.la @RT_LIB@
- 
- sg_unmap_LDADD = ../lib/libsgutils2.la
- 
--- 
-2.20.1
-
diff --git a/package/sg3_utils/sg3_utils.hash b/package/sg3_utils/sg3_utils.hash
index 14b94947d4..eacf55289f 100644
--- a/package/sg3_utils/sg3_utils.hash
+++ b/package/sg3_utils/sg3_utils.hash
@@ -1,6 +1,6 @@
 # Locally calculated from download (no sig, hash)
-sha256	ca94ac106510742cd8ff5ead4a7e5c89d410653291401daf4632d2bef2a35b05	sg3_utils-1.44.tar.xz
+sha256	c7dab547dc37381fa50e482d9da680fe64b88cfe0e3d79b61e478de14f58b2ee	sg3_utils-1.45.tar.xz
 
 # Hash for license files
 sha256	d516b8b337a77e3d4c65dffe708ca7fb25b1cb4ec77ec362cf11ed659b9250bc	COPYING
-sha256	31f6d59679e0fb21c9358f22484e6e3c53e20ef08c0950fd38a4a867cb55edc9	BSD_LICENSE
+sha256	8ddd1d82f2be2f5cbd5b5c3b5c2ee94a90d2ca7112958448da74dd78384fd96a	BSD_LICENSE
diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk
index 7070d6f83d..4685169e39 100644
--- a/package/sg3_utils/sg3_utils.mk
+++ b/package/sg3_utils/sg3_utils.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-SG3_UTILS_VERSION = 1.44
+SG3_UTILS_VERSION = 1.45
 SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz
 SG3_UTILS_SITE = http://sg.danny.cz/sg/p
-SG3_UTILS_LICENSE = BSD-3-Clause (library)
+SG3_UTILS_LICENSE = BSD-2-Clause (library)
 # Some utils progs are GPL-2.0+ licensed while others are BSD-3-Clause
 ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),y)
-SG3_UTILS_LICENSE += , GPL-2.0+ (programs), BSD-3-Clause (programs)
+SG3_UTILS_LICENSE += , GPL-2.0+ (programs), BSD-2-Clause (programs)
 endif
 SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE
 
-- 
2.25.0

[Buildroot] [PATCH 3/3] package/sdparm: bump version to 1.11

[Bernd Kuhls]

Release notes: https://www.spinics.net/lists/linux-scsi/msg139073.html

Updated license according to release notes:

   - update BSD license from 3 to 2 clause aka FreeBSD
     license (without reference to FreeBSD project)

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/sdparm/sdparm.hash | 2 +-
 package/sdparm/sdparm.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/sdparm/sdparm.hash b/package/sdparm/sdparm.hash
index 22d6b5b87b..a44d94d261 100644
--- a/package/sdparm/sdparm.hash
+++ b/package/sdparm/sdparm.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  7dc9e148cef22744e00809dad21b59ac544e3615001bc1b2399978f73e1d58ca  sdparm-1.10.tar.xz
+sha256  483931fc636794d898549706ae247d7cfdd047a9b517b7d856ff102e386112db  sdparm-1.11.tar.xz
 sha256  4f98444e14adb18a94a65c3ded5f0dad42d382c6a2288b593a2d5bd5ecc4f46d  COPYING
diff --git a/package/sdparm/sdparm.mk b/package/sdparm/sdparm.mk
index b9fac518c8..59a32820ff 100644
--- a/package/sdparm/sdparm.mk
+++ b/package/sdparm/sdparm.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-SDPARM_VERSION = 1.10
+SDPARM_VERSION = 1.11
 SDPARM_SOURCE = sdparm-$(SDPARM_VERSION).tar.xz
 SDPARM_SITE = http://sg.danny.cz/sg/p
-SDPARM_LICENSE = BSD-3-Clause
+SDPARM_LICENSE = BSD-2-Clause
 SDPARM_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_SG3_UTILS),y)
-- 
2.25.0

[Buildroot] [PATCH 3/3] package/sdparm: bump version to 1.11

[Yann E. MORIN]

Bernd, All,

On 2020-04-13 14:53 +0200, Bernd Kuhls spake thusly:
> Release notes: https://www.spinics.net/lists/linux-scsi/msg139073.html
> 
> Updated license according to release notes:
> 
>    - update BSD license from 3 to 2 clause aka FreeBSD
>      license (without reference to FreeBSD project)
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/sdparm/sdparm.hash | 2 +-
>  package/sdparm/sdparm.mk   | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/package/sdparm/sdparm.hash b/package/sdparm/sdparm.hash
> index 22d6b5b87b..a44d94d261 100644
> --- a/package/sdparm/sdparm.hash
> +++ b/package/sdparm/sdparm.hash
> @@ -1,3 +1,3 @@
>  # Locally calculated
> -sha256  7dc9e148cef22744e00809dad21b59ac544e3615001bc1b2399978f73e1d58ca  sdparm-1.10.tar.xz
> +sha256  483931fc636794d898549706ae247d7cfdd047a9b517b7d856ff102e386112db  sdparm-1.11.tar.xz
>  sha256  4f98444e14adb18a94a65c3ded5f0dad42d382c6a2288b593a2d5bd5ecc4f46d  COPYING

So we have a license change, and the license file does not change? That
shall raise an eyebrow... See below...

> diff --git a/package/sdparm/sdparm.mk b/package/sdparm/sdparm.mk
> index b9fac518c8..59a32820ff 100644
> --- a/package/sdparm/sdparm.mk
> +++ b/package/sdparm/sdparm.mk
> @@ -4,10 +4,10 @@
>  #
>  ################################################################################
>  
> -SDPARM_VERSION = 1.10
> +SDPARM_VERSION = 1.11
>  SDPARM_SOURCE = sdparm-$(SDPARM_VERSION).tar.xz
>  SDPARM_SITE = http://sg.danny.cz/sg/p
> -SDPARM_LICENSE = BSD-3-Clause
> +SDPARM_LICENSE = BSD-2-Clause
>  SDPARM_LICENSE_FILES = COPYING

This is not good. The COPYING still contains the text of BSD-3-clause.

There is however a BSD-LICENSE file, which appropriately contains the
BSD-2-clause text.

Can you please:

 1. see with upstream whether they still need COPYING, and if yes to
    what files it still applies,

 2. folowup here with an updated patch, and the resolution in the commit
    log ?

Thanks you!

In the meantime, I've marked the patch as Changes Requested in patchwork.

Regards,
Yann E. MORIN.

>  ifeq ($(BR2_PACKAGE_SG3_UTILS),y)
> -- 
> 2.25.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'