[PR PATCH] spdx-licenses-list: update to 3.22.

[PR PATCH] spdx-licenses-list: update to 3.22.

[mobinmob]

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

There is a new pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages spdx-licenses-list
https://github.com/void-linux/void-packages/pull/47181

spdx-licenses-list: update to 3.22.
Also:
- update common/travis/license.lst

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/47181.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-spdx-licenses-list-47181.patch --]
[-- Type: text/x-diff, Size: 5188 bytes --]

From 79d7b1d868a76c43874628e58f5a4b92a217bb12 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Nov 2023 15:36:13 +0200
Subject: [PATCH] spdx-licenses-list: update to 3.22.

Also:
- update common/travis/license.lst
---
 common/travis/license.lst           | 48 +++++++++++++++++++++++++++++
 srcpkgs/spdx-licenses-list/template |  4 +--
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/common/travis/license.lst b/common/travis/license.lst
index aab1ca5f69d6c..f0ac528417c58 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -28,6 +28,7 @@ Abstyles
 AdaCore-doc
 Adobe-2006
 Adobe-Glyph
+Adobe-Utopia
 Afmparse
 Aladdin
 Apache-1.0
@@ -42,6 +43,7 @@ Artistic-2.0
 Asterisk-exception
 Autoconf-exception-2.0
 Autoconf-exception-3.0
+Autoconf-exception-generic-3.0
 Autoconf-exception-generic
 Autoconf-exception-macro
 BSD-1-Clause
@@ -50,6 +52,7 @@ BSD-2-Clause-Views
 BSD-2-Clause
 BSD-3-Clause-Attribution
 BSD-3-Clause-Clear
+BSD-3-Clause-HP
 BSD-3-Clause-LBNL
 BSD-3-Clause-Modification
 BSD-3-Clause-No-Military-License
@@ -57,6 +60,8 @@ BSD-3-Clause-No-Nuclear-License-2014
 BSD-3-Clause-No-Nuclear-License
 BSD-3-Clause-No-Nuclear-Warranty
 BSD-3-Clause-Open-MPI
+BSD-3-Clause-Sun
+BSD-3-Clause-flex
 BSD-3-Clause
 BSD-4-Clause-Shortened
 BSD-4-Clause-UC
@@ -65,8 +70,10 @@ BSD-4.3RENO
 BSD-4.3TAHOE
 BSD-Advertising-Acknowledgement
 BSD-Attribution-HPND-disclaimer
+BSD-Inferno-Nettverk
 BSD-Protection
 BSD-Source-Code
+BSD-Systemics
 BSL-1.0
 BUSL-1.1
 Baekmuk
@@ -174,11 +181,13 @@ Clips
 Community-Spec-1.0
 Condor-1.1
 Cornell-Lossless-JPEG
+Cronyx
 Crossword
 CrystalStacker
 Cube
 D-FSL-1.0
 DL-DE-BY-2.0
+DL-DE-ZERO-2.0
 DOC
 DRL-1.0
 DSDP
@@ -199,6 +208,7 @@ Elastic-2.0
 Entessa
 ErlPL-1.1
 Eurosym
+FBM
 FDK-AAC
 FLTK-exception
 FSFAP
@@ -208,10 +218,13 @@ FSFULLRWD
 FTL
 Fair
 Fawkes-Runtime-exception
+Ferguson-Twofish
 Font-exception-2.0
 Frameworx-1.0
 FreeBSD-DOC
 FreeImage
+Furuseth
+GCC-exception-2.0-note
 GCC-exception-2.0
 GCC-exception-3.1
 GD
@@ -236,6 +249,7 @@ GFDL-1.3-or-later
 GL2PS
 GLWTPL
 GNAT-exception
+GNU-compiler-exception
 GPL-1.0-only
 GPL-1.0-or-later
 GPL-2.0-only
@@ -253,8 +267,16 @@ Glide
 Glulxe
 Graphics-Gems
 HP-1986
+HP-1989
+HPND-DEC
 HPND-Markus-Kuhn
+HPND-Pbmplus
+HPND-UC
+HPND-doc-sell
+HPND-doc
+HPND-export-US-modify
 HPND-export-US
+HPND-sell-regexpr
 HPND-sell-variant-MIT-disclaimer
 HPND-sell-variant
 HPND
@@ -281,6 +303,7 @@ JPNIC
 JSON
 Jam
 JasPer-2.0
+Kastrup
 Kazlib
 KiCad-libraries-exception
 Knuth-CTAN
@@ -321,6 +344,7 @@ Linux-man-pages-copyleft-2-para
 Linux-man-pages-copyleft-var
 Linux-man-pages-copyleft
 Linux-syscall-note
+Lucida-Bitmap-Fonts
 MIT-0
 MIT-CMU
 MIT-Festival
@@ -330,8 +354,11 @@ MIT-advertising
 MIT-enna
 MIT-feh
 MIT-open-group
+MIT-testregex
 MIT
 MITNFA
+MMIXware
+MPEG-SSG
 MPL-1.0
 MPL-1.1
 MPL-2.0-no-copyleft-exception
@@ -342,6 +369,7 @@ MS-RL
 MTLL
 MakeIndex
 Martin-Birgmeier
+McPhee-slideshow
 Minpack
 MirOS
 Motosoto
@@ -427,6 +455,7 @@ OSL-3.0
 OpenJDK-assembly-exception-1.0
 OpenPBS-2.3
 OpenSSL
+PADL
 PDDL-1.0
 PHP-3.0
 PHP-3.01
@@ -455,11 +484,13 @@ RSA-MD
 RSCPL
 Rdisc
 Ruby
+SANE-exception
 SAX-PD
 SCEA
 SGI-B-1.0
 SGI-B-1.1
 SGI-B-2.0
+SGI-OpenGL
 SGP4
 SHL-0.5
 SHL-0.51
@@ -467,6 +498,7 @@ SHL-2.0
 SHL-2.1
 SISSL-1.2
 SISSL
+SL
 SMLNJ
 SMPPL
 SNIA
@@ -482,6 +514,7 @@ Sendmail-8.23
 Sendmail
 SimPL-2.0
 Sleepycat
+Soundex
 Spencer-86
 Spencer-94
 Spencer-99
@@ -498,12 +531,16 @@ TOSL
 TPDL
 TPL-1.0
 TTWL
+TTYP0
 TU-Berlin-1.0
 TU-Berlin-2.0
 TermReadKey
+Texinfo-exception
+UBDL-exception
 UCAR
 UCL-1.0
 UPL-1.0
+URT-RLE
 Unicode-DFS-2015
 Unicode-DFS-2016
 Unicode-TOU
@@ -535,12 +572,14 @@ ZPL-1.1
 ZPL-2.0
 ZPL-2.1
 Zed
+Zeeff
 Zend-2.0
 Zimbra-1.3
 Zimbra-1.4
 Zlib
 blessing
 bzip2-1.0.6
+check-cvs
 checkmk
 copyleft-next-0.3.0
 copyleft-next-0.3.1
@@ -584,6 +623,7 @@ eCos-exception-2.0
 eGenix
 etalab-2.0
 freertos-exception-2.0
+fwlw
 gSOAP-1.3b
 gnu-javamail-exception
 gnuplot
@@ -594,16 +634,24 @@ libpri-OpenH323-exception
 libselinux-1.0
 libtiff
 libutil-David-Nugent
+lsof
+magaz
 metamail
 mif-exception
 mpi-permissive
 mpich2
 mplus
 openvpn-openssl-exception
+pnmstitch
 psfrag
 psutils
+python-ldap
 snprintf
+ssh-keyscan
+stunnel-exception
+swrule
 u-boot-exception-2.0
+ulem
 vsftpd-openssl-exception
 w3m
 x11vnc-openssl-exception
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index bf5ec7b0f9c87..85864b1824b90 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -3,14 +3,14 @@
 # run common/scripts/check-custom-licenses after updating to find
 # license fields in packages that can have 'custom:' removed
 pkgname=spdx-licenses-list
-version=3.21
+version=3.22
 revision=1
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=7f7a4ffb4aa2d6ac32610a629a6fe127e5d5a3a5e41774b555dccc9284f3e149
+checksum=ecc9b78b590f5460b7713c1fc9e2093979b18edc2eb48084ba36ad35d2f13892
 
 do_install() {
 	vmkdir usr/share/spdx

Re: [PR REVIEW] spdx-licenses-list: update to 3.22.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47181#discussion_r1390526172

Comment:
was this run?

Re: [PR PATCH] [Updated] spdx-licenses-list: update to 3.22.

[mobinmob]

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

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages spdx-licenses-list
https://github.com/void-linux/void-packages/pull/47181

spdx-licenses-list: update to 3.22.
Also:
- update common/travis/license.lst

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/47181.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-spdx-licenses-list-47181.patch --]
[-- Type: text/x-diff, Size: 6053 bytes --]

From 55f303324a8907b4922cbd55a6f6675bb797dd15 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Nov 2023 15:36:13 +0200
Subject: [PATCH 1/2] spdx-licenses-list: update to 3.22.

Also:
- update common/travis/license.lst
---
 common/travis/license.lst           | 48 +++++++++++++++++++++++++++++
 srcpkgs/spdx-licenses-list/template |  4 +--
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/common/travis/license.lst b/common/travis/license.lst
index aab1ca5f69d6c..f0ac528417c58 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -28,6 +28,7 @@ Abstyles
 AdaCore-doc
 Adobe-2006
 Adobe-Glyph
+Adobe-Utopia
 Afmparse
 Aladdin
 Apache-1.0
@@ -42,6 +43,7 @@ Artistic-2.0
 Asterisk-exception
 Autoconf-exception-2.0
 Autoconf-exception-3.0
+Autoconf-exception-generic-3.0
 Autoconf-exception-generic
 Autoconf-exception-macro
 BSD-1-Clause
@@ -50,6 +52,7 @@ BSD-2-Clause-Views
 BSD-2-Clause
 BSD-3-Clause-Attribution
 BSD-3-Clause-Clear
+BSD-3-Clause-HP
 BSD-3-Clause-LBNL
 BSD-3-Clause-Modification
 BSD-3-Clause-No-Military-License
@@ -57,6 +60,8 @@ BSD-3-Clause-No-Nuclear-License-2014
 BSD-3-Clause-No-Nuclear-License
 BSD-3-Clause-No-Nuclear-Warranty
 BSD-3-Clause-Open-MPI
+BSD-3-Clause-Sun
+BSD-3-Clause-flex
 BSD-3-Clause
 BSD-4-Clause-Shortened
 BSD-4-Clause-UC
@@ -65,8 +70,10 @@ BSD-4.3RENO
 BSD-4.3TAHOE
 BSD-Advertising-Acknowledgement
 BSD-Attribution-HPND-disclaimer
+BSD-Inferno-Nettverk
 BSD-Protection
 BSD-Source-Code
+BSD-Systemics
 BSL-1.0
 BUSL-1.1
 Baekmuk
@@ -174,11 +181,13 @@ Clips
 Community-Spec-1.0
 Condor-1.1
 Cornell-Lossless-JPEG
+Cronyx
 Crossword
 CrystalStacker
 Cube
 D-FSL-1.0
 DL-DE-BY-2.0
+DL-DE-ZERO-2.0
 DOC
 DRL-1.0
 DSDP
@@ -199,6 +208,7 @@ Elastic-2.0
 Entessa
 ErlPL-1.1
 Eurosym
+FBM
 FDK-AAC
 FLTK-exception
 FSFAP
@@ -208,10 +218,13 @@ FSFULLRWD
 FTL
 Fair
 Fawkes-Runtime-exception
+Ferguson-Twofish
 Font-exception-2.0
 Frameworx-1.0
 FreeBSD-DOC
 FreeImage
+Furuseth
+GCC-exception-2.0-note
 GCC-exception-2.0
 GCC-exception-3.1
 GD
@@ -236,6 +249,7 @@ GFDL-1.3-or-later
 GL2PS
 GLWTPL
 GNAT-exception
+GNU-compiler-exception
 GPL-1.0-only
 GPL-1.0-or-later
 GPL-2.0-only
@@ -253,8 +267,16 @@ Glide
 Glulxe
 Graphics-Gems
 HP-1986
+HP-1989
+HPND-DEC
 HPND-Markus-Kuhn
+HPND-Pbmplus
+HPND-UC
+HPND-doc-sell
+HPND-doc
+HPND-export-US-modify
 HPND-export-US
+HPND-sell-regexpr
 HPND-sell-variant-MIT-disclaimer
 HPND-sell-variant
 HPND
@@ -281,6 +303,7 @@ JPNIC
 JSON
 Jam
 JasPer-2.0
+Kastrup
 Kazlib
 KiCad-libraries-exception
 Knuth-CTAN
@@ -321,6 +344,7 @@ Linux-man-pages-copyleft-2-para
 Linux-man-pages-copyleft-var
 Linux-man-pages-copyleft
 Linux-syscall-note
+Lucida-Bitmap-Fonts
 MIT-0
 MIT-CMU
 MIT-Festival
@@ -330,8 +354,11 @@ MIT-advertising
 MIT-enna
 MIT-feh
 MIT-open-group
+MIT-testregex
 MIT
 MITNFA
+MMIXware
+MPEG-SSG
 MPL-1.0
 MPL-1.1
 MPL-2.0-no-copyleft-exception
@@ -342,6 +369,7 @@ MS-RL
 MTLL
 MakeIndex
 Martin-Birgmeier
+McPhee-slideshow
 Minpack
 MirOS
 Motosoto
@@ -427,6 +455,7 @@ OSL-3.0
 OpenJDK-assembly-exception-1.0
 OpenPBS-2.3
 OpenSSL
+PADL
 PDDL-1.0
 PHP-3.0
 PHP-3.01
@@ -455,11 +484,13 @@ RSA-MD
 RSCPL
 Rdisc
 Ruby
+SANE-exception
 SAX-PD
 SCEA
 SGI-B-1.0
 SGI-B-1.1
 SGI-B-2.0
+SGI-OpenGL
 SGP4
 SHL-0.5
 SHL-0.51
@@ -467,6 +498,7 @@ SHL-2.0
 SHL-2.1
 SISSL-1.2
 SISSL
+SL
 SMLNJ
 SMPPL
 SNIA
@@ -482,6 +514,7 @@ Sendmail-8.23
 Sendmail
 SimPL-2.0
 Sleepycat
+Soundex
 Spencer-86
 Spencer-94
 Spencer-99
@@ -498,12 +531,16 @@ TOSL
 TPDL
 TPL-1.0
 TTWL
+TTYP0
 TU-Berlin-1.0
 TU-Berlin-2.0
 TermReadKey
+Texinfo-exception
+UBDL-exception
 UCAR
 UCL-1.0
 UPL-1.0
+URT-RLE
 Unicode-DFS-2015
 Unicode-DFS-2016
 Unicode-TOU
@@ -535,12 +572,14 @@ ZPL-1.1
 ZPL-2.0
 ZPL-2.1
 Zed
+Zeeff
 Zend-2.0
 Zimbra-1.3
 Zimbra-1.4
 Zlib
 blessing
 bzip2-1.0.6
+check-cvs
 checkmk
 copyleft-next-0.3.0
 copyleft-next-0.3.1
@@ -584,6 +623,7 @@ eCos-exception-2.0
 eGenix
 etalab-2.0
 freertos-exception-2.0
+fwlw
 gSOAP-1.3b
 gnu-javamail-exception
 gnuplot
@@ -594,16 +634,24 @@ libpri-OpenH323-exception
 libselinux-1.0
 libtiff
 libutil-David-Nugent
+lsof
+magaz
 metamail
 mif-exception
 mpi-permissive
 mpich2
 mplus
 openvpn-openssl-exception
+pnmstitch
 psfrag
 psutils
+python-ldap
 snprintf
+ssh-keyscan
+stunnel-exception
+swrule
 u-boot-exception-2.0
+ulem
 vsftpd-openssl-exception
 w3m
 x11vnc-openssl-exception
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index bf5ec7b0f9c87..85864b1824b90 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -3,14 +3,14 @@
 # run common/scripts/check-custom-licenses after updating to find
 # license fields in packages that can have 'custom:' removed
 pkgname=spdx-licenses-list
-version=3.21
+version=3.22
 revision=1
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=7f7a4ffb4aa2d6ac32610a629a6fe127e5d5a3a5e41774b555dccc9284f3e149
+checksum=ecc9b78b590f5460b7713c1fc9e2093979b18edc2eb48084ba36ad35d2f13892
 
 do_install() {
 	vmkdir usr/share/spdx

From 11db6268bfe515e3d666994fa9b2ab070c8252e1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 26 Nov 2023 19:03:42 +0200
Subject: [PATCH 2/2] lsof: license is no longer custom.

---
 srcpkgs/lsof/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template
index 21a623dad947c..65d1e41e7bf9f 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -8,7 +8,7 @@ hostmakedepends=groff
 checkdepends="util-linux procps-ng"
 short_desc="LiSt Open Files"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
-license="custom:lsof"
+license="lsof"
 homepage="https://github.com/lsof-org/lsof"
 changelog="https://raw.githubusercontent.com/lsof-org/lsof/master/00DIST"
 distfiles="https://github.com/lsof-org/lsof/releases/download/${version}/lsof-${version}.tar.gz"

Re: [PR REVIEW] spdx-licenses-list: update to 3.22.

[mobinmob]

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

New review comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/47181#discussion_r1405435341

Comment:
Sorry for the delay.
I just run the script and added a commit to change the lsof license from custom. Thanks!

Re: [PR PATCH] [Merged]: spdx-licenses-list: update to 3.22.

[classabbyamp]

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

There's a merged pull request on the void-packages repository

spdx-licenses-list: update to 3.22.
https://github.com/void-linux/void-packages/pull/47181

Description:
Also:
- update common/travis/license.lst

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->