From 63f5e7d295659a855709901ce22a3e5f40fce455 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Sat, 30 Dec 2017 19:04:30 +0100 Subject: [various]: unify names of licenses according to SPDX This commit updates $license variable in all APKBUILDs to comply with short names specified by SPDX version 3.0 [1] where possible. It was done using find-and-replace method on substrings inside $license variables. Only license names were updated, not "expressions" specifying relation between the licenses (e.g. "X and Y", "X or Y", "X and (Y or Z)") or exceptions (e.g. "X with exceptions"). Many licenses have a version or multiple variants, e.g. MPL-2.0, BSD-2-Clause, BSD-3-Clause. However, $license in many aports do not contain license version or variant. Since there's no way how to infer this information just from abuild, it were left without the variant suffix or version, i.e. non SPDX compliant. GNU licenses (AGPL, GFDL, GPL, LGPL) are especially complicated. They exist in two variants: -only (formerly e.g. GPL-2.0) and -or-later (formerly e.g. GPL-2.0+). We did not systematically noted distinguish between these variants, so GPL-2.0, GPL2, GPLv2 etc. may mean GPL-2.0-only or GPL-2.0-or-later. Thus GNU licenses without "+" (e.g. GPL2+) were left without the variant suffix, i.e. non SPDX compliant. Note: This commit just fixes format of the license names, no verification has been done if the specified license information is actually correct! [1]: https://spdx.org/licenses/ --- unmaintained/acf-provisioning-algo/APKBUILD | 2 +- unmaintained/acf-provisioning-cisco/APKBUILD | 2 +- unmaintained/acf-provisioning-cyberdata/APKBUILD | 2 +- unmaintained/acf-provisioning-linksys/APKBUILD | 2 +- unmaintained/acf-provisioning-polycom/APKBUILD | 2 +- unmaintained/acf-provisioning-snom/APKBUILD | 2 +- unmaintained/beecrypt/APKBUILD | 2 +- unmaintained/geary/APKBUILD | 2 +- unmaintained/ocfs2-tools/APKBUILD | 2 +- unmaintained/sipwise-sems/APKBUILD | 2 +- unmaintained/sword/APKBUILD | 2 +- unmaintained/usbip-utils/APKBUILD | 2 +- unmaintained/webkitgtk/APKBUILD | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'unmaintained') diff --git a/unmaintained/acf-provisioning-algo/APKBUILD b/unmaintained/acf-provisioning-algo/APKBUILD index 1c1f48570c..db55bc91ee 100644 --- a/unmaintained/acf-provisioning-algo/APKBUILD +++ b/unmaintained/acf-provisioning-algo/APKBUILD @@ -6,7 +6,7 @@ pkgrel=1 pkgdesc="Files for provisioning Algo Products" url="http://www.algosolutions.com/products/overview.html" arch="noarch" -license="AS IS" +license="AS-IS" depends="" makedepends="" source="http://www.algosolutions.com/fw-downloads/8180/firmware/algo-8180-2.4.fw diff --git a/unmaintained/acf-provisioning-cisco/APKBUILD b/unmaintained/acf-provisioning-cisco/APKBUILD index 10f1d513ff..924870a06d 100644 --- a/unmaintained/acf-provisioning-cisco/APKBUILD +++ b/unmaintained/acf-provisioning-cisco/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="Files for provisioning Cisco Small Business Voice Gateways and ATAs" url="http://www.cisco.com/c/en/us/support/unified-communications/small-business-voice-gateways-ata/tsd-products-support-series-home.html" arch="noarch" -license="AS IS" +license="AS-IS" depends="" makedepends="" # Source obtained from http://software.cisco.com/download/release.html?mdfid=283998771&softwareid=282463187&release=1.3.1 diff --git a/unmaintained/acf-provisioning-cyberdata/APKBUILD b/unmaintained/acf-provisioning-cyberdata/APKBUILD index e803d3622a..4e8bd69b19 100644 --- a/unmaintained/acf-provisioning-cyberdata/APKBUILD +++ b/unmaintained/acf-provisioning-cyberdata/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="Files for provisioning CyberData Outdoor Intercom" url="http://www.cyberdata.net/products/voip/digitalanalog/intercom_endpoints.html" arch="noarch" -license="AS IS" +license="AS-IS" depends="" makedepends="" source="http://www.cyberdata.net/assets/011186/1148-uImage-outdoor_intercom.zip diff --git a/unmaintained/acf-provisioning-linksys/APKBUILD b/unmaintained/acf-provisioning-linksys/APKBUILD index 8d9d57efaf..8d807a1278 100644 --- a/unmaintained/acf-provisioning-linksys/APKBUILD +++ b/unmaintained/acf-provisioning-linksys/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="Files for provisioning Cisco Linksys IP phones" url="http://www.cisco.com/en/US/products/ps10029/index.html" arch="noarch" -license="AS IS" +license="AS-IS" depends="" makedepends="" source="http://download.cisco.com/swc/esd/03/282414114/anon/PAP2T_v5.1.6_fw.zip diff --git a/unmaintained/acf-provisioning-polycom/APKBUILD b/unmaintained/acf-provisioning-polycom/APKBUILD index 2ef1d1a6f4..df2d577fa9 100644 --- a/unmaintained/acf-provisioning-polycom/APKBUILD +++ b/unmaintained/acf-provisioning-polycom/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="Files for provisioning Polycom IP phones" url="http://www.polycom.com/products/voice/index.html" arch="noarch" -license="AS IS" +license="AS-IS" depends="" makedepends="" # Make sure 5.5.1 comes after 4.0.11 so that older files are overwritten diff --git a/unmaintained/acf-provisioning-snom/APKBUILD b/unmaintained/acf-provisioning-snom/APKBUILD index 13ec4193a1..3548bdbe93 100644 --- a/unmaintained/acf-provisioning-snom/APKBUILD +++ b/unmaintained/acf-provisioning-snom/APKBUILD @@ -6,7 +6,7 @@ pkgrel=1 pkgdesc="Files for provisioning Snom IP phones" url="http://snom.com/" arch="noarch" -license="AS IS" +license="AS-IS" depends="" makedepends="" source="http://downloads.snom.com/fw/snom300-$pkgver-SIP-f.bin diff --git a/unmaintained/beecrypt/APKBUILD b/unmaintained/beecrypt/APKBUILD index a1a2aa8435..33fb673fd9 100644 --- a/unmaintained/beecrypt/APKBUILD +++ b/unmaintained/beecrypt/APKBUILD @@ -5,7 +5,7 @@ pkgrel=2 pkgdesc="A general-purpose cryptography library" url="http://sourceforge.net/projects/beecrypt" arch="all" -license="LGPL2+" +license="LGPL-2.0-or-later" makedepends="libtool m4" subpackages="$pkgname-dev" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" diff --git a/unmaintained/geary/APKBUILD b/unmaintained/geary/APKBUILD index fb0f244b6c..b2683b5139 100644 --- a/unmaintained/geary/APKBUILD +++ b/unmaintained/geary/APKBUILD @@ -5,7 +5,7 @@ pkgrel=0 pkgdesc="A lightweight email program designed around conversations" url="http://yorba.org/geary/" arch="all !ppc64le !s390x" -license="LGPLv2+" +license="LGPL-2.0-or-later" depends="hicolor-icon-theme gsettings-desktop-schemas" depends_dev="" makedepends="$depends_dev" diff --git a/unmaintained/ocfs2-tools/APKBUILD b/unmaintained/ocfs2-tools/APKBUILD index 9169d3dc96..8567e40d68 100644 --- a/unmaintained/ocfs2-tools/APKBUILD +++ b/unmaintained/ocfs2-tools/APKBUILD @@ -5,7 +5,7 @@ pkgrel=2 pkgdesc="Oracle Cluster File System 2 utilities" url="http://oss.oracle.com/projects/ocfs2-tools" arch="" -license="GPL2" +license="GPL-2.0" depends= depends_dev="e2fsprogs-dev glib-dev ncurses-dev readline-dev" makedepends="$depends_dev" diff --git a/unmaintained/sipwise-sems/APKBUILD b/unmaintained/sipwise-sems/APKBUILD index df08b8a93f..42391971fd 100644 --- a/unmaintained/sipwise-sems/APKBUILD +++ b/unmaintained/sipwise-sems/APKBUILD @@ -10,7 +10,7 @@ pkgrel=1 pkgdesc="SIP Express Media Server, an extensible SIP media server" url="http://iptel.org/sems/" arch="all !aarch64" -license="GPLv2+" +license="GPL-2.0-or-later" pkgusers="sems" pkggroups="sems" install="$pkgname.pre-install" diff --git a/unmaintained/sword/APKBUILD b/unmaintained/sword/APKBUILD index 3a3f960cdc..063f2cd684 100644 --- a/unmaintained/sword/APKBUILD +++ b/unmaintained/sword/APKBUILD @@ -6,7 +6,7 @@ pkgrel=6 pkgdesc="Library for free Bible software" url="http://www.crosswire.org/sword/" arch="all" -license="GPL2" +license="GPL-2.0" depends="" # all are optional but desireable; clucene-dev could be replaced with # new --with-cxx11regex or --with-internalregex, diff --git a/unmaintained/usbip-utils/APKBUILD b/unmaintained/usbip-utils/APKBUILD index fd904f048c..9bbd485021 100644 --- a/unmaintained/usbip-utils/APKBUILD +++ b/unmaintained/usbip-utils/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="Utilities for USB device sharing over IP network" url="https://kernel.org/doc/readme/drivers-staging-usbip-userspace-README" arch="all" -license="GPLv2" +license="GPL-2.0" depends="glib sysfsutils usbutils" depends_dev="gcc automake autoconf eudev-dev libtool linux-headers sysfsutils-dev glib-dev" makedepends="$depends_dev tar" diff --git a/unmaintained/webkitgtk/APKBUILD b/unmaintained/webkitgtk/APKBUILD index 6c7e49bfce..ec1d864cb9 100644 --- a/unmaintained/webkitgtk/APKBUILD +++ b/unmaintained/webkitgtk/APKBUILD @@ -5,7 +5,7 @@ pkgrel=3 pkgdesc="portable web rendering engine WebKit for GTK+" url="http://webkitgtk.org/" arch="all !ppc64le !s390x" -license="LGPL2+ BSD" +license="LGPL-2.0-or-later BSD" depends="" depends_dev="gtk+2.0-dev gtk+3.0-dev libsoup-dev gstreamer1-dev gst-plugins-base1-dev" -- cgit v1.2.3