From dbb82d9c051600a49c5398816f2562fd0e8524c1 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 25 Jun 2018 04:48:38 -0500
Subject: system/[various]: last SPDX license fixes

---
 system/abuild/APKBUILD          | 2 +-
 system/busybox/APKBUILD         | 2 +-
 system/clang/APKBUILD           | 2 +-
 system/db/APKBUILD              | 2 +-
 system/easy-kernel/APKBUILD     | 2 +-
 system/fakeroot/APKBUILD        | 2 +-
 system/fortify-headers/APKBUILD | 2 +-
 system/iproute2/APKBUILD        | 2 +-
 system/libarchive/APKBUILD      | 2 +-
 system/libc-dev/APKBUILD        | 2 +-
 system/libedit/APKBUILD         | 2 +-
 system/linux-pam/APKBUILD       | 2 +-
 system/llvm4/APKBUILD           | 2 +-
 system/lutok/APKBUILD           | 2 +-
 system/mkinitfs/APKBUILD        | 5 ++---
 system/openssl/APKBUILD         | 2 +-
 system/perl/APKBUILD            | 2 +-
 system/sp/APKBUILD              | 2 +-
 system/vim/APKBUILD             | 4 ++--
 system/xz/APKBUILD              | 2 +-
 system/zlib/APKBUILD            | 2 +-
 21 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD
index 956ace5a3..4bb421895 100644
--- a/system/abuild/APKBUILD
+++ b/system/abuild/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="Script to build APK packages"
 url="https://code.foxkit.us/adelie/aports"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-only"
 depends="fakeroot sudo pax-utils openssl apk-tools>=2.0.7-r1 libc-utils
 	attr libarchive-tools pkgconf patch lzip"
 if [ "$CBUILD" = "$CHOST" ]; then
diff --git a/system/busybox/APKBUILD b/system/busybox/APKBUILD
index 0c09b1126..ead7b4b55 100644
--- a/system/busybox/APKBUILD
+++ b/system/busybox/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=4
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
-license="GPL2"
+license="GPL-2.0-only"
 makedepends_build=""
 makedepends_host="linux-headers"
 makedepends="$makedepends_build $makedepends_host"
diff --git a/system/clang/APKBUILD b/system/clang/APKBUILD
index a0899df80..6265bf6a1 100644
--- a/system/clang/APKBUILD
+++ b/system/clang/APKBUILD
@@ -8,7 +8,7 @@ _llvmver=${pkgver%%.*}
 pkgdesc="A C language family front-end for LLVM"
 arch="all"
 url="http://llvm.org/"
-license="UOI-NCSA"
+license="NCSA"
 makedepends="
 	cmake
 	isl-dev
diff --git a/system/db/APKBUILD b/system/db/APKBUILD
index 30d2485be..bf920315f 100644
--- a/system/db/APKBUILD
+++ b/system/db/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="The Berkeley DB embedded database system"
 url="https://www.oracle.com/technology/software/products/berkeley-db/index.html"
 arch="all"
-license="custom"
+license="Sleepycat AND BSD-3-Clause"
 options="!check"  # "check target not available"
 depends=
 makedepends=
diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD
index 167c7db77..e14479f23 100644
--- a/system/easy-kernel/APKBUILD
+++ b/system/easy-kernel/APKBUILD
@@ -8,7 +8,7 @@ pkgdesc="The Linux kernel, packaged for your convenience"
 url="https://kernel.org/"
 arch="all"
 options="!check !dbg !strip !tracedeps"
-license="GPL-2.0"
+license="GPL-2.0-only"
 depends=""
 makedepends="bc gzip lzop openssl-dev xz"
 install=""
diff --git a/system/fakeroot/APKBUILD b/system/fakeroot/APKBUILD
index ab7e64af7..219348860 100644
--- a/system/fakeroot/APKBUILD
+++ b/system/fakeroot/APKBUILD
@@ -4,7 +4,7 @@ pkgver=1.22
 pkgrel=0
 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
 arch="all"
-license='GPL'
+license="GPL-3.0+"
 url="http://fakeroot.alioth.debian.org/"
 depends=
 options="!checkroot"
diff --git a/system/fortify-headers/APKBUILD b/system/fortify-headers/APKBUILD
index 2516dcdd0..054f4d256 100644
--- a/system/fortify-headers/APKBUILD
+++ b/system/fortify-headers/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="libc-agnostic implementation of FORTIFY_SOURCE"
 url="https://git.2f30.org/fortify-headers/"
 arch="noarch"
 options="!check"  # No test suite.
-license="BSD-0"
+license="0BSD"
 source="https://dl.2f30.org/releases/$pkgname-$pkgver.tar.gz
 	extension-cpp-fix.patch
 	"
diff --git a/system/iproute2/APKBUILD b/system/iproute2/APKBUILD
index 755d5e21a..afc161b7c 100644
--- a/system/iproute2/APKBUILD
+++ b/system/iproute2/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="IP Routing Utilities"
 url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
 arch="all"
-license="GPL2"
+license="GPL-2.0-only"
 depends=""
 install="$pkgname.post-install"
 makedepends="bison flex bash libelf-dev"
diff --git a/system/libarchive/APKBUILD b/system/libarchive/APKBUILD
index 07b5f9a43..e1bb7ee04 100644
--- a/system/libarchive/APKBUILD
+++ b/system/libarchive/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="Library for creating and reading streaming archives"
 url="http://libarchive.org/"
 arch="all"
-license="BSD"
+license="BSD-2-Clause AND BSD-3-Clause AND Public-Domain"
 makedepends="zlib-dev bzip2-dev xz-dev lz4-dev acl-dev openssl-dev expat-dev
 	attr-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
diff --git a/system/libc-dev/APKBUILD b/system/libc-dev/APKBUILD
index f75d3a8a4..4ead3c13b 100644
--- a/system/libc-dev/APKBUILD
+++ b/system/libc-dev/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Meta package to pull in correct libc"
 url="http://alpinelinux.org"
 arch="noarch"
-license="BSD"
+license="BSD-2-Clause AND BSD-3-Clause"
 makedepends_build=" "
 makedepends_host=" "
 makedepends="$makedepends_build $makedepends_host"
diff --git a/system/libedit/APKBUILD b/system/libedit/APKBUILD
index 97275513f..f5d3bf0d2 100644
--- a/system/libedit/APKBUILD
+++ b/system/libedit/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Library providing line editing, history, and tokenisation functions"
 url="http://thrysoee.dk/editline/"
 arch="all"
-license="BSD"
+license="BSD-2-Clause"
 depends=""
 depends_dev="ncurses-dev"  # XXX is this always unconditionally needed?
 makedepends="$depends_dev"
diff --git a/system/linux-pam/APKBUILD b/system/linux-pam/APKBUILD
index bf6a19f93..37dc7d7fe 100644
--- a/system/linux-pam/APKBUILD
+++ b/system/linux-pam/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Pluggable Authentication Modules"
 url="http://www.kernel.org/pub/linux/libs/pam"
 arch="all"
-license="BSD"
+license="BSD-3-Clause"
 depends_dev="gettext-tiny-dev"
 makedepends_host="$depends_dev utmps-dev"
 makedepends_build="$depends_dev bison flex-dev autoconf automake libtool"
diff --git a/system/llvm4/APKBUILD b/system/llvm4/APKBUILD
index 0841affab..35c2bc37f 100644
--- a/system/llvm4/APKBUILD
+++ b/system/llvm4/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=5
 pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"
 arch="all"
 url="http://llvm.org/"
-license="UOI-NCSA"
+license="NCSA"
 depends_dev="$pkgname=$pkgver-r$pkgrel"
 makedepends="binutils-dev chrpath cmake file libffi-dev paxmark python3 zlib-dev"
 subpackages="$pkgname-static $pkgname-libs $pkgname-dev $pkgname-test-utils:_test_utils"
diff --git a/system/lutok/APKBUILD b/system/lutok/APKBUILD
index 61106b7b3..5e84fd867 100644
--- a/system/lutok/APKBUILD
+++ b/system/lutok/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="Lightweight C++ API for Lua"
 url="https://github.com/jmmv/lutok"
 arch="all"
-license="BSD"
+license="BSD-3-Clause"
 depends_dev="lua5.3-dev"
 makedepends="$depends_dev"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/system/mkinitfs/APKBUILD b/system/mkinitfs/APKBUILD
index ecb51abeb..fe21413e3 100644
--- a/system/mkinitfs/APKBUILD
+++ b/system/mkinitfs/APKBUILD
@@ -6,9 +6,8 @@ pkgrel=14
 pkgdesc="Tool to generate initramfs images for Alpine"
 url="https://git.alpinelinux.org/cgit/mkinitfs"
 arch="all"
-license="GPL-2.0"
-# currently we do not ship any testsuite
-options="!check"
+options="!check"  # currently we do not ship any testsuite
+license="GPL-2.0-only"
 makedepends_build=""
 makedepends_host="busybox kmod-dev util-linux-dev cryptsetup-dev linux-headers"
 makedepends="$makedepends_build $makedepends_host"
diff --git a/system/openssl/APKBUILD b/system/openssl/APKBUILD
index c9ec7f569..684f41bf1 100644
--- a/system/openssl/APKBUILD
+++ b/system/openssl/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
 url="https://www.openssl.org/"
 arch="all"
-license="openssl"
+license="OpenSSL"
 depends=
 makedepends_build="perl"
 makedepends_host="zlib-dev"
diff --git a/system/perl/APKBUILD b/system/perl/APKBUILD
index 1414e4842..a492a84bd 100644
--- a/system/perl/APKBUILD
+++ b/system/perl/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Larry Wall's Practical Extraction and Report Language"
 url="http://www.perl.org/"
 arch="all"
-license="Artistic GPL-2.0"
+license="Artistic-1.0-Perl GPL-2.0"
 # remove !check when tests pass.
 options="!check !fhs"
 depends=""
diff --git a/system/sp/APKBUILD b/system/sp/APKBUILD
index 2802aed89..c25be62d0 100644
--- a/system/sp/APKBUILD
+++ b/system/sp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An SGML system conforming to ISO 8879"
 url="http://www.jclark.com/sp/"
 arch="all"
-license="X/Open"
+license="X11"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD
index abed04ed8..88eb53baa 100644
--- a/system/vim/APKBUILD
+++ b/system/vim/APKBUILD
@@ -9,9 +9,9 @@ pkgrel=0
 pkgdesc="advanced text editor"
 url="http://www.vim.org"
 arch="all"
-license="custom"
-depends=""
 options="!check"  # requires controlling TTY, and fails with musl locales
+license="Vim"
+depends=""
 makedepends_host="acl-dev ncurses-dev"
 [ "$CBUILD" != "$CHOST" ] || makedepends_host="$makedepends_host perl-dev python3-dev"
 subpackages="$pkgname-doc ${pkgname}diff::noarch"
diff --git a/system/xz/APKBUILD b/system/xz/APKBUILD
index 00c62410c..5e53aca60 100644
--- a/system/xz/APKBUILD
+++ b/system/xz/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Library and command line tools for XZ and LZMA compressed files"
 url="https://tukaani.org/xz/"
 arch="all"
-license="custom"
+license="Public-Domain AND LGPL-2.1+"
 depends=""
 makedepends=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs"
diff --git a/system/zlib/APKBUILD b/system/zlib/APKBUILD
index 177299698..aeb0582d2 100644
--- a/system/zlib/APKBUILD
+++ b/system/zlib/APKBUILD
@@ -4,7 +4,7 @@ pkgver=1.2.11
 pkgrel=1
 pkgdesc="A compression/decompression Library"
 arch="all"
-license="zlib"
+license="Zlib"
 url="http://zlib.net"
 depends=""
 subpackages="$pkgname-dev $pkgname-doc"
-- 
cgit v1.2.3-60-g2f50