From 716fbf821d1cf335e04bf6174ee20ae3f09ab9f3 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 24 Jun 2023 16:11:16 -0400 Subject: [PATCH 1/3] spdx-licenses-list: update to 3.21. --- common/scripts/check-custom-licenses | 9 +++++++++ common/travis/license.lst | 28 ++++++++++++++++++++++++++++ srcpkgs/spdx-licenses-list/template | 7 ++++--- 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100755 common/scripts/check-custom-licenses diff --git a/common/scripts/check-custom-licenses b/common/scripts/check-custom-licenses new file mode 100755 index 000000000000..da21c58abdd0 --- /dev/null +++ b/common/scripts/check-custom-licenses @@ -0,0 +1,9 @@ +#!/bin/bash +# checks for licenses that are no longer custom in packages + +mapfile -t licenses < common/travis/license.lst + +for lic in "${licenses[@]}"; do + grep -rl "custom:$lic"'[,"]' --include=template srcpkgs \ + | cut -d/ -f2 | xargs -rn1 printf "%s: $lic is no longer custom\n" +done diff --git a/common/travis/license.lst b/common/travis/license.lst index 649728a15e51..aab1ca5f69d6 100644 --- a/common/travis/license.lst +++ b/common/travis/license.lst @@ -22,6 +22,8 @@ APSL-1.0 APSL-1.1 APSL-1.2 APSL-2.0 +ASWF-Digital-Assets-1.0 +ASWF-Digital-Assets-1.1 Abstyles AdaCore-doc Adobe-2006 @@ -37,9 +39,11 @@ Artistic-1.0-Perl Artistic-1.0-cl8 Artistic-1.0 Artistic-2.0 +Asterisk-exception Autoconf-exception-2.0 Autoconf-exception-3.0 Autoconf-exception-generic +Autoconf-exception-macro BSD-1-Clause BSD-2-Clause-Patent BSD-2-Clause-Views @@ -75,6 +79,7 @@ BitTorrent-1.1 Bitstream-Charter Bitstream-Vera BlueOak-1.0.0 +Boehm-GC Bootloader-exception Borceux Brian-Gladman-3-Clause @@ -129,6 +134,7 @@ CC-BY-SA-2.1-JP CC-BY-SA-2.5 CC-BY-SA-3.0-AT CC-BY-SA-3.0-DE +CC-BY-SA-3.0-IGO CC-BY-SA-3.0 CC-BY-SA-4.0 CC-PDDC @@ -234,6 +240,7 @@ GPL-1.0-only GPL-1.0-or-later GPL-2.0-only GPL-2.0-or-later +GPL-3.0-interface-exception GPL-3.0-linking-exception GPL-3.0-linking-source-exception GPL-3.0-only @@ -265,6 +272,7 @@ ISC ImageMagick Imlib2 Info-ZIP +Inner-Net-2.0 Intel-ACPI Intel Interbase-1.0 @@ -286,6 +294,7 @@ LGPL-3.0-linking-exception LGPL-3.0-only LGPL-3.0-or-later LGPLLR +LLGPL LLVM-exception LOOP LPL-1.0 @@ -298,6 +307,7 @@ LPPL-1.3c LZMA-SDK-9.11-to-9.20 LZMA-SDK-9.22 LZMA-exception +Latex2e-translated-notice Latex2e Leptonica LiLiQ-P-1.1 @@ -306,10 +316,14 @@ LiLiQ-Rplus-1.1 Libpng Libtool-exception Linux-OpenIB +Linux-man-pages-1-para +Linux-man-pages-copyleft-2-para +Linux-man-pages-copyleft-var Linux-man-pages-copyleft Linux-syscall-note MIT-0 MIT-CMU +MIT-Festival MIT-Modern-Variant MIT-Wu MIT-advertising @@ -344,6 +358,7 @@ NGPL NICTA-1.0 NIST-PD-fallback NIST-PD +NIST-Software NLOD-1.0 NLOD-2.0 NLPL @@ -398,8 +413,10 @@ OLDAP-2.5 OLDAP-2.6 OLDAP-2.7 OLDAP-2.8 +OLFL-1.3 OML OPL-1.0 +OPL-UK-3.0 OPUBL-1.0 OSET-PL-2.1 OSL-1.0 @@ -443,6 +460,7 @@ SCEA SGI-B-1.0 SGI-B-1.1 SGI-B-2.0 +SGP4 SHL-0.5 SHL-0.51 SHL-2.0 @@ -482,6 +500,7 @@ TPL-1.0 TTWL TU-Berlin-1.0 TU-Berlin-2.0 +TermReadKey UCAR UCL-1.0 UPL-1.0 @@ -489,6 +508,7 @@ Unicode-DFS-2015 Unicode-DFS-2016 Unicode-TOU Universal-FOSS-exception-1.0 +UnixCrypt Unlicense VOSTROM VSL-1.0 @@ -498,13 +518,16 @@ W3C-20150513 W3C WTFPL Watcom-1.0 +Widget-Workshop Wsuipa WxWindows-exception-3.1 X11-distribute-modifications-variant X11 XFree86-1.1 XSkat +Xdebug-1.03 Xerox +Xfig Xnet YPL-1.0 YPL-1.1 @@ -521,6 +544,7 @@ bzip2-1.0.6 checkmk copyleft-next-0.3.0 copyleft-next-0.3.1 +cryptsetup-OpenSSL-exception curl deprecated_AGPL-1.0 deprecated_AGPL-3.0 @@ -554,6 +578,7 @@ deprecated_bzip2-1.0.5 deprecated_eCos-2.0 deprecated_wxWindows diffmark +dtoa dvipdfm eCos-exception-2.0 eGenix @@ -565,9 +590,11 @@ gnuplot i2p-gpl-java-exception iMatix libpng-2.0 +libpri-OpenH323-exception libselinux-1.0 libtiff libutil-David-Nugent +metamail mif-exception mpi-permissive mpich2 @@ -577,6 +604,7 @@ psfrag psutils snprintf u-boot-exception-2.0 +vsftpd-openssl-exception w3m x11vnc-openssl-exception xinetd diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template index 2fc2aba58140..bf5ec7b0f9c8 100644 --- a/srcpkgs/spdx-licenses-list/template +++ b/srcpkgs/spdx-licenses-list/template @@ -1,15 +1,16 @@ # Template file for 'spdx-licenses-list' - # common/travis/license.lst should be updated in sync with this package +# 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.20 +version=3.21 revision=1 short_desc="SPDX License List" maintainer="mobinmob " license="CC-BY-3.0" homepage="https://spdx.org" distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz" -checksum=fba795a26f8d646340b0cef2d22c3fa490158809636b225c7a0c2214a91c156f +checksum=7f7a4ffb4aa2d6ac32610a629a6fe127e5d5a3a5e41774b555dccc9284f3e149 do_install() { vmkdir usr/share/spdx From 3b5ae7528449d55e2292a1067c3eb505c7bfccd4 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 24 Jun 2023 16:11:40 -0400 Subject: [PATCH 2/3] tk: TCL license is no longer custom --- srcpkgs/tk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tk/template b/srcpkgs/tk/template index c40db4cc081e..c91a50aa97d6 100644 --- a/srcpkgs/tk/template +++ b/srcpkgs/tk/template @@ -11,7 +11,7 @@ hostmakedepends="pkg-config" makedepends="zlib-devel tcl-devel libXext-devel libXScrnSaver-devel libXft-devel" short_desc="TK graphical user interface toolkit for TCL" maintainer="Orphaned " -license="custom:TCL" +license="TCL" homepage="http://www.tcl.tk" distfiles="${SOURCEFORGE_SITE}/tcl/tk${version}-src.tar.gz" checksum=2e65fa069a23365440a3c56c556b8673b5e32a283800d8d9b257e3f584ce0675 From a42ba9effca063a853647534a8a975f672c14f61 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 24 Jun 2023 16:12:26 -0400 Subject: [PATCH 3/3] kwallet-cli: MirOS license is no longer custom --- srcpkgs/kwallet-cli/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kwallet-cli/template b/srcpkgs/kwallet-cli/template index 563e8eeb7bb7..4da38a361a2c 100644 --- a/srcpkgs/kwallet-cli/template +++ b/srcpkgs/kwallet-cli/template @@ -9,7 +9,7 @@ makedepends="kwallet-devel qt5-devel" depends="mksh" short_desc="Command-line interface to the KDE Wallet" maintainer="Louis Dupré Bertoni " -license="custom:MirOS, LGPL-3.0-or-later" +license="MirOS, LGPL-3.0-or-later" homepage="https://www.mirbsd.org/kwalletcli.htm" distfiles="http://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/kwalletcli-${version}.tar.gz" checksum=f228e5b179f6eb92289b9635382e676990dd58cd193ce42b61d3150c8a06b12d