summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSertonix <sertonix@posteo.net>2024-02-12 22:34:38 +0100
committerKevin Daudt <kdaudt@alpinelinux.org>2024-02-25 15:59:05 +0000
commit49eaddc4f7264d97ca4565c5075752b10b3a9dcb (patch)
tree3c7a6c9859ed67b5e5c70a90c0c026d6df1ae109
parent76e99f92c5d5df689439b47f13ef5e7e4f02eda1 (diff)
downloadaports-49eaddc4f7264d97ca4565c5075752b10b3a9dcb.zip
main/*: improve license identifiers
-rw-r--r--main/clang14/APKBUILD4
-rw-r--r--main/clang15/APKBUILD4
-rw-r--r--main/cyrus-sasl/APKBUILD4
-rw-r--r--main/font-adobe-100dpi/APKBUILD4
-rw-r--r--main/font-adobe-75dpi/APKBUILD4
-rw-r--r--main/font-adobe-utopia-100dpi/APKBUILD4
-rw-r--r--main/font-adobe-utopia-75dpi/APKBUILD4
-rw-r--r--main/font-bitstream-100dpi/APKBUILD4
-rw-r--r--main/font-bitstream-75dpi/APKBUILD4
-rw-r--r--main/font-bitstream-type1/APKBUILD4
-rw-r--r--main/gd/APKBUILD4
-rw-r--r--main/linenoise/APKBUILD4
-rw-r--r--main/openjpeg/APKBUILD4
-rw-r--r--main/opennhrp/APKBUILD4
-rw-r--r--main/opensp/APKBUILD4
-rw-r--r--main/openvpn-ad-check/APKBUILD4
-rw-r--r--main/openvpn/APKBUILD4
-rw-r--r--main/ortp/APKBUILD4
-rw-r--r--main/pcmciautils/APKBUILD4
-rw-r--r--main/perl-cache-simple-timedexpiry/APKBUILD4
-rw-r--r--main/perl-cgi-session/APKBUILD4
-rw-r--r--main/perl-class-accessor/APKBUILD4
-rw-r--r--main/perl-class-returnvalue/APKBUILD4
-rw-r--r--main/perl-convert-binhex/APKBUILD4
-rw-r--r--main/perl-convert-tnef/APKBUILD4
-rw-r--r--main/perl-convert-uulib/APKBUILD4
-rw-r--r--main/perl-crypt-des/APKBUILD4
-rw-r--r--main/perl-crypt-openssl-random/APKBUILD4
-rw-r--r--main/perl-css-squish/APKBUILD4
-rw-r--r--main/perl-datetime-format-mail/APKBUILD4
-rw-r--r--main/perl-datetime-format-w3cdtf/APKBUILD4
-rw-r--r--main/perl-dbix-dbschema/APKBUILD4
-rw-r--r--main/perl-devel-stacktrace-ashtml/APKBUILD4
-rw-r--r--main/perl-device-serialport/APKBUILD4
-rw-r--r--main/perl-digest-sha1/APKBUILD4
-rw-r--r--main/perl-email-address-list/APKBUILD4
-rw-r--r--main/perl-fcgi-procmanager/APKBUILD4
-rw-r--r--main/perl-hash-multivalue/APKBUILD4
-rw-r--r--main/perl-html-quoted/APKBUILD4
-rw-r--r--main/perl-http-body/APKBUILD4
-rw-r--r--main/perl-http-negotiate/APKBUILD4
-rw-r--r--main/perl-importer/APKBUILD4
-rw-r--r--main/perl-io-multiplex/APKBUILD4
-rw-r--r--main/perl-io-stringy/APKBUILD4
-rw-r--r--main/perl-ipc-run3/APKBUILD4
-rw-r--r--main/perl-locale-maketext-fuzzy/APKBUILD4
-rw-r--r--main/perl-locale-maketext-lexicon/APKBUILD4
-rw-r--r--main/perl-mail-domainkeys/APKBUILD4
-rw-r--r--main/perl-math-round/APKBUILD4
-rw-r--r--main/perl-module-versions-report/APKBUILD4
-rw-r--r--main/perl-net-dns-resolver-programmable/APKBUILD4
-rw-r--r--main/perl-net-ip/APKBUILD4
-rw-r--r--main/perl-net-libidn/APKBUILD4
-rw-r--r--main/perl-net-rblclient/APKBUILD4
-rw-r--r--main/perl-netaddr-ip/APKBUILD4
-rw-r--r--main/perl-parse-recdescent/APKBUILD4
-rw-r--r--main/perl-pod-coverage/APKBUILD4
-rw-r--r--main/perl-regexp-ipv6/APKBUILD4
-rw-r--r--main/perl-scope-guard/APKBUILD4
-rw-r--r--main/perl-snmp-session/APKBUILD4
-rw-r--r--main/perl-sub-uplevel/APKBUILD4
-rw-r--r--main/perl-switch/APKBUILD4
-rw-r--r--main/perl-test-cpan-meta/APKBUILD4
-rw-r--r--main/perl-test-deep/APKBUILD4
-rw-r--r--main/perl-test-longstring/APKBUILD4
-rw-r--r--main/perl-test-pod-coverage/APKBUILD4
-rw-r--r--main/perl-text-password-pronounceable/APKBUILD4
-rw-r--r--main/perl-text-reform/APKBUILD4
-rw-r--r--main/perl-tk/APKBUILD4
-rw-r--r--main/perl-www-robotrules/APKBUILD4
-rw-r--r--main/policyd-spf-fs/APKBUILD4
-rw-r--r--main/postfix-policyd-spf-perl/APKBUILD4
-rw-r--r--main/powerpc-utils/APKBUILD4
-rw-r--r--main/proxychains-ng/APKBUILD4
-rw-r--r--main/pstree/APKBUILD4
-rw-r--r--main/rdfind/APKBUILD4
-rw-r--r--main/rtapd/APKBUILD4
-rw-r--r--main/rtnppd/APKBUILD4
-rw-r--r--main/sbsigntool/APKBUILD4
-rw-r--r--main/scstadmin/APKBUILD4
-rw-r--r--main/sharutils/APKBUILD4
-rw-r--r--main/skytraq-datalogger/APKBUILD4
-rw-r--r--main/ssmtp/APKBUILD4
-rw-r--r--main/u-boot/APKBUILD4
-rw-r--r--main/uwsgi/APKBUILD4
-rw-r--r--main/v86d/APKBUILD4
-rw-r--r--main/which/APKBUILD4
-rw-r--r--main/wipe/APKBUILD4
-rw-r--r--main/xtables-addons-lts/APKBUILD4
-rw-r--r--main/zd1211-firmware/APKBUILD4
-rw-r--r--main/zsh/APKBUILD5
91 files changed, 183 insertions, 182 deletions
diff --git a/main/clang14/APKBUILD b/main/clang14/APKBUILD
index e14b64b1e41..39850df37f2 100644
--- a/main/clang14/APKBUILD
+++ b/main/clang14/APKBUILD
@@ -5,12 +5,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=clang14
pkgver=14.0.6
-pkgrel=7
+pkgrel=8
_llvmver=${pkgver%%.*}
pkgdesc="A C language family front-end for LLVM"
arch="all"
url="https://llvm.org/"
-license="Apache-2.0 WITH LLVM-Exception"
+license="Apache-2.0 WITH LLVM-exception"
options="!check" # fail to build
makedepends="
cmake
diff --git a/main/clang15/APKBUILD b/main/clang15/APKBUILD
index 84e7afa29df..cb5cba6274b 100644
--- a/main/clang15/APKBUILD
+++ b/main/clang15/APKBUILD
@@ -5,12 +5,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=clang15
pkgver=15.0.7
-pkgrel=18
+pkgrel=19
_llvmver=${pkgver%%.*}
pkgdesc="C language family front-end for LLVM"
arch="all"
url="https://llvm.org/"
-license="Apache-2.0 WITH LLVM-Exception"
+license="Apache-2.0 WITH LLVM-exception"
options="!check" # fail to build
makedepends="
cmake
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 597c6b187e5..9fe8ab791c0 100644
--- a/main/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cyrus-sasl
pkgver=2.1.28
-pkgrel=5
+pkgrel=6
pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
url="https://www.cyrusimap.org/sasl/"
arch="all"
-license="custom"
+license="BSD-3-Clause-Attribution AND BSD-4-Clause"
options="!check" # No test suite.
subpackages="
$pkgname-static
diff --git a/main/font-adobe-100dpi/APKBUILD b/main/font-adobe-100dpi/APKBUILD
index 256313e924a..3b0bed883df 100644
--- a/main/font-adobe-100dpi/APKBUILD
+++ b/main/font-adobe-100dpi/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-adobe-100dpi
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="X.org adobe 100dpi font"
url="https://xorg.freedesktop.org/"
arch="noarch"
-license="custom"
+license="MIT"
options="!check"
depends="encodings font-alias mkfontscale fontconfig"
makedepends="font-util-dev bdftopcf"
diff --git a/main/font-adobe-75dpi/APKBUILD b/main/font-adobe-75dpi/APKBUILD
index 5cfdf0150b4..ed7c2973c28 100644
--- a/main/font-adobe-75dpi/APKBUILD
+++ b/main/font-adobe-75dpi/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-adobe-75dpi
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="X.org adobe 75dpi font"
url="https://xorg.freedesktop.org/"
arch="noarch"
-license="custom"
+license="MIT"
options="!check"
depends="encodings font-alias mkfontscale fontconfig"
makedepends="font-util-dev bdftopcf"
diff --git a/main/font-adobe-utopia-100dpi/APKBUILD b/main/font-adobe-utopia-100dpi/APKBUILD
index 3d8d128b171..12351bd9d89 100644
--- a/main/font-adobe-utopia-100dpi/APKBUILD
+++ b/main/font-adobe-utopia-100dpi/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-adobe-utopia-100dpi
pkgver=1.0.5
-pkgrel=1
+pkgrel=2
pkgdesc="X.org adobe 100dpi font"
url="https://xorg.freedesktop.org/"
arch="noarch"
-license="custom"
+license="Adobe-Utopia"
options="!check"
depends="encodings font-alias mkfontscale fontconfig"
makedepends="font-util-dev bdftopcf"
diff --git a/main/font-adobe-utopia-75dpi/APKBUILD b/main/font-adobe-utopia-75dpi/APKBUILD
index ab50d0f3362..9fe6f7a2096 100644
--- a/main/font-adobe-utopia-75dpi/APKBUILD
+++ b/main/font-adobe-utopia-75dpi/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-adobe-utopia-75dpi
pkgver=1.0.5
-pkgrel=1
+pkgrel=2
pkgdesc="X.org adobe 75dpi font"
url="https://xorg.freedesktop.org/"
arch="noarch"
-license="custom"
+license="Adobe-Utopia"
options="!check"
depends="encodings font-alias mkfontscale fontconfig"
makedepends="font-util-dev bdftopcf"
diff --git a/main/font-bitstream-100dpi/APKBUILD b/main/font-bitstream-100dpi/APKBUILD
index 377fbc2d4ee..5a5dcb2bd71 100644
--- a/main/font-bitstream-100dpi/APKBUILD
+++ b/main/font-bitstream-100dpi/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-bitstream-100dpi
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="X.Org Bitstream bitmap fonts"
url="https://xorg.freedesktop.org/"
arch="noarch"
-license="custom"
+license="MIT"
options="!check"
depends="encodings font-alias mkfontscale fontconfig"
makedepends="font-util-dev bdftopcf"
diff --git a/main/font-bitstream-75dpi/APKBUILD b/main/font-bitstream-75dpi/APKBUILD
index 465a652f9ee..e8332a0605d 100644
--- a/main/font-bitstream-75dpi/APKBUILD
+++ b/main/font-bitstream-75dpi/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-bitstream-75dpi
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="X.Org Bitstream bitmap fonts"
url="https://xorg.freedesktop.org/"
arch="noarch"
-license="custom"
+license="MIT"
options="!check"
depends="encodings font-alias mkfontscale fontconfig"
makedepends="font-util-dev bdftopcf"
diff --git a/main/font-bitstream-type1/APKBUILD b/main/font-bitstream-type1/APKBUILD
index 5b2ae848bea..dcb64fa0ecb 100644
--- a/main/font-bitstream-type1/APKBUILD
+++ b/main/font-bitstream-type1/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-bitstream-type1
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="X.org bitstream Type1 fonts"
url="https://xorg.freedesktop.org/"
arch="noarch"
-license="custom"
+license="Bitstream-Charter"
options="!check"
depends="encodings font-alias mkfontscale fontconfig"
makedepends="font-util-dev bdftopcf"
diff --git a/main/gd/APKBUILD b/main/gd/APKBUILD
index 1bdc5f03dee..fa00ee67f18 100644
--- a/main/gd/APKBUILD
+++ b/main/gd/APKBUILD
@@ -3,12 +3,12 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=gd
pkgver=2.3.3
-pkgrel=8
+pkgrel=9
_pkgreal=lib$pkgname
pkgdesc="Library for the dynamic creation of images by programmers"
url="https://libgd.github.io/"
arch="all"
-license="custom"
+license="GD"
makedepends="
fontconfig-dev
freetype-dev
diff --git a/main/linenoise/APKBUILD b/main/linenoise/APKBUILD
index 51e21ff4070..d484162f687 100644
--- a/main/linenoise/APKBUILD
+++ b/main/linenoise/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=linenoise
pkgver=1.0
-pkgrel=4
+pkgrel=5
pkgdesc="Minimal replacement for readline"
url="https://github.com/antirez/linenoise"
arch="all"
options="!check" # No test suite.
-license="BSD-2-Clause-NetBSD"
+license="BSD-2-Clause"
makedepends="$depends_dev"
subpackages="$pkgname-dev"
source="linenoise-$pkgver.tar.gz::https://github.com/antirez/linenoise/archive/$pkgver.tar.gz
diff --git a/main/openjpeg/APKBUILD b/main/openjpeg/APKBUILD
index ade3eb8624a..e8779d79e6f 100644
--- a/main/openjpeg/APKBUILD
+++ b/main/openjpeg/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=openjpeg
pkgver=2.5.0
-pkgrel=3
+pkgrel=4
pkgdesc="Open-source implementation of JPEG2000 image codec"
url="https://www.openjpeg.org/"
arch="all"
options="!check" # No test suite.
-license="BSD-2-Clause-NetBSD"
+license="BSD-2-Clause"
# Some of the development CMake files installed by -dev depend on tools provided by the -tools subpackage
depends_dev="$pkgname-tools"
makedepends="libpng-dev tiff-dev lcms2-dev doxygen cmake samurai"
diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index 30be712f532..9efd33be303 100644
--- a/main/opennhrp/APKBUILD
+++ b/main/opennhrp/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=opennhrp
pkgver=0.14.1
-pkgrel=11
+pkgrel=12
pkgdesc="NBMA Next Hop Resolution Protocol daemon"
url="https://sourceforge.net/projects/opennhrp/"
arch="all"
-license="GPL-2.0"
+license="MIT AND (BSD-2-Clause OR GPL-2.0-or-later)"
makedepends="c-ares-dev linux-headers"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://downloads.sourceforge.net/opennhrp/opennhrp-$pkgver.tar.bz2
diff --git a/main/opensp/APKBUILD b/main/opensp/APKBUILD
index d9dda7536cb..b0a408498a1 100644
--- a/main/opensp/APKBUILD
+++ b/main/opensp/APKBUILD
@@ -4,11 +4,11 @@
pkgname=opensp
_realname=OpenSP
pkgver=1.5.2
-pkgrel=4
+pkgrel=5
pkgdesc="Implementation of the DSSSL style language"
url="https://openjade.sourceforge.net/"
arch="all"
-license="custom"
+license="ICU"
makedepends="$depends_dev xmlto"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://prdownloads.sourceforge.net/openjade/$_realname-$pkgver.tar.gz
diff --git a/main/openvpn-ad-check/APKBUILD b/main/openvpn-ad-check/APKBUILD
index 3ee5bcbab8d..7b69602e44b 100644
--- a/main/openvpn-ad-check/APKBUILD
+++ b/main/openvpn-ad-check/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
pkgname=openvpn-ad-check
pkgver=1.1
-pkgrel=3
+pkgrel=4
pkgdesc="Authenticate OpenVPN users against AD server and verify if they are member of a specific group."
url="https://sourceforge.net/p/openvpnadcheck"
arch="noarch"
-license="GPL"
+license="GPL-3.0-only"
depends="openvpn lua-ldap"
source="https://sourceforge.net/projects/openvpnadcheck/files/openvpn-ad-check-$pkgver.tgz"
builddir="$srcdir/openvpn-ad-check"
diff --git a/main/openvpn/APKBUILD b/main/openvpn/APKBUILD
index 2e4634119c9..91f540df453 100644
--- a/main/openvpn/APKBUILD
+++ b/main/openvpn/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=openvpn
pkgver=2.6.9
-pkgrel=0
+pkgrel=1
pkgdesc="Robust, and highly configurable VPN (Virtual Private Network)"
url="https://openvpn.net/"
arch="all"
-license="custom"
+license="GPL-2.0-only WITH openvpn-openssl-exception"
subpackages="$pkgname-doc $pkgname-dev $pkgname-openrc $pkgname-auth-pam:pam"
depends="iproute2-minimal" # needs just /sbin/ip
depends_dev="openssl-dev" # openvpn-plugin.h includes openssl/x509.h
diff --git a/main/ortp/APKBUILD b/main/ortp/APKBUILD
index 14b0a74c313..29aa3bf0e87 100644
--- a/main/ortp/APKBUILD
+++ b/main/ortp/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=ortp
pkgver=5.2.86
-pkgrel=0
+pkgrel=1
pkgdesc="oRTP is a library implemeting Real-time Transport Protocol (RFC3550), licensed under LGPL"
url="https://www.linphone.org/technical-corner/ortp"
arch="all"
options="!check" #no test avail
-license="LGPL-2.0-or-later VSL"
+license="LGPL-2.0-or-later"
makedepends="cmake bctoolbox-dev samurai"
subpackages="$pkgname-doc $pkgname-dev"
source="https://gitlab.linphone.org/BC/public/ortp/-/archive/$pkgver/ortp-$pkgver.tar.gz"
diff --git a/main/pcmciautils/APKBUILD b/main/pcmciautils/APKBUILD
index c946cc003dc..cd2979ed083 100644
--- a/main/pcmciautils/APKBUILD
+++ b/main/pcmciautils/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=pcmciautils
pkgver=018
-pkgrel=3
+pkgrel=4
pkgdesc="Utilities for inserting and removing PCMCIA cards"
url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
arch="all"
-license="GPL"
+license="GPL-2.0-only"
subpackages="$pkgname-doc"
makedepends="sysfsutils-dev bison flex"
options="!check"
diff --git a/main/perl-cache-simple-timedexpiry/APKBUILD b/main/perl-cache-simple-timedexpiry/APKBUILD
index 546bfedc99c..5552afffd53 100644
--- a/main/perl-cache-simple-timedexpiry/APKBUILD
+++ b/main/perl-cache-simple-timedexpiry/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-cache-simple-timedexpiry
_pkgreal=Cache-Simple-TimedExpiry
pkgver=0.27
-pkgrel=4
+pkgrel=5
pkgdesc="Cache::Simple::TimedExpiry perl module"
url="https://metacpan.org/release/Cache-Simple-TimedExpiry/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
makedepends="perl-module-install"
subpackages="$pkgname-doc"
diff --git a/main/perl-cgi-session/APKBUILD b/main/perl-cgi-session/APKBUILD
index 25489c9b05c..5cee68102c8 100644
--- a/main/perl-cgi-session/APKBUILD
+++ b/main/perl-cgi-session/APKBUILD
@@ -2,11 +2,11 @@
pkgname=perl-cgi-session
_pkgreal=CGI-Session
pkgver=4.48
-pkgrel=4
+pkgrel=5
pkgdesc="perl module for persistent session data in CGI applications"
url="https://metacpan.org/pod/CGI::Session"
arch="noarch"
-license="PerlArtistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
options="!check" # failing test
subpackages="$pkgname-doc"
diff --git a/main/perl-class-accessor/APKBUILD b/main/perl-class-accessor/APKBUILD
index 3b0b83f81ad..a9d458c96da 100644
--- a/main/perl-class-accessor/APKBUILD
+++ b/main/perl-class-accessor/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-class-accessor
pkgver=0.51
-pkgrel=3
+pkgrel=4
pkgdesc="Class::Accessor perl module"
url="https://metacpan.org/pod/Class::Accessor"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/K/KA/KASEI/Class-Accessor-$pkgver.tar.gz"
diff --git a/main/perl-class-returnvalue/APKBUILD b/main/perl-class-returnvalue/APKBUILD
index 78a41614f97..e9229f3bfe9 100644
--- a/main/perl-class-returnvalue/APKBUILD
+++ b/main/perl-class-returnvalue/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-class-returnvalue
pkgver=0.55
-pkgrel=4
+pkgrel=5
pkgdesc="Class::ReturnValue perl module"
url="https://metacpan.org/release/Class-ReturnValue/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl"
depends="perl perl-devel-stacktrace"
makedepends="perl-module-install"
subpackages="$pkgname-doc"
diff --git a/main/perl-convert-binhex/APKBUILD b/main/perl-convert-binhex/APKBUILD
index 80e897b3bdf..a9dae023d4b 100644
--- a/main/perl-convert-binhex/APKBUILD
+++ b/main/perl-convert-binhex/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-convert-binhex
_pkgreal=Convert-BinHex
pkgver=1.125
-pkgrel=6
+pkgrel=7
pkgdesc="Extract data from Macintosh BinHex files"
url="https://metacpan.org/release/Convert-BinHex/"
arch="noarch"
-license="Artistic-1.0 GPL+"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
checkdepends="perl-file-slurp perl-test-most"
subpackages="$pkgname-doc"
diff --git a/main/perl-convert-tnef/APKBUILD b/main/perl-convert-tnef/APKBUILD
index 5de471ca587..f3ebb5b9327 100644
--- a/main/perl-convert-tnef/APKBUILD
+++ b/main/perl-convert-tnef/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-convert-tnef
_pkgreal=Convert-TNEF
pkgver=0.18
-pkgrel=6
+pkgrel=7
pkgdesc="Perl module to read TNEF files"
url="https://metacpan.org/release/Convert-TNEF"
arch="noarch"
-license="Artistic-Perl-1.0 GPL+"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
checkdepends="perl-io-stringy perl-mime-tools"
subpackages="$pkgname-doc"
diff --git a/main/perl-convert-uulib/APKBUILD b/main/perl-convert-uulib/APKBUILD
index f4382402c93..47e18407bcb 100644
--- a/main/perl-convert-uulib/APKBUILD
+++ b/main/perl-convert-uulib/APKBUILD
@@ -5,11 +5,11 @@ pkgname=perl-convert-uulib
#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
_pkgreal=Convert-UUlib
pkgver=1.8
-pkgrel=2
+pkgrel=3
pkgdesc="Perl module for Convert-UUlib"
url="https://metacpan.org/release/Convert-UUlib/"
arch="all"
-license="(GPL-2.0-or-later OR Artistic-1.0-Perl) AND GPL-2.0-or-later AND ZLib"
+license="(GPL-1.0-or-later OR Artistic-1.0-Perl) AND GPL-2.0-or-later AND Zlib"
depends="perl perl-common-sense"
makedepends="perl-dev perl-canary-stability"
subpackages="$pkgname-doc"
diff --git a/main/perl-crypt-des/APKBUILD b/main/perl-crypt-des/APKBUILD
index 549a33eefc0..2d937c3fbb5 100644
--- a/main/perl-crypt-des/APKBUILD
+++ b/main/perl-crypt-des/APKBUILD
@@ -2,11 +2,11 @@
pkgname=perl-crypt-des
_pkgreal=Crypt-DES
pkgver=2.07
-pkgrel=13
+pkgrel=14
pkgdesc="Perl DES encryption module"
url="https://metacpan.org/release/Crypt-DES/"
arch="all"
-license="GPL PerlArtistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/D/DP/DPARIS/$_pkgreal-$pkgver.tar.gz
diff --git a/main/perl-crypt-openssl-random/APKBUILD b/main/perl-crypt-openssl-random/APKBUILD
index 5dd3ea5fade..fe8f9de35ff 100644
--- a/main/perl-crypt-openssl-random/APKBUILD
+++ b/main/perl-crypt-openssl-random/APKBUILD
@@ -2,11 +2,11 @@
pkgname=perl-crypt-openssl-random
_pkgreal=Crypt-OpenSSL-Random
pkgver=0.15
-pkgrel=14
+pkgrel=15
pkgdesc="OpenSSL/LibreSSL pseudo-random number generator access"
url="https://metacpan.org/pod/Crypt::OpenSSL::Random"
arch="all"
-license="Artistic-1.0 GPL+"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
makedepends="perl-dev openssl-dev>3 perl-crypt-openssl-guess"
subpackages="$pkgname-doc"
diff --git a/main/perl-css-squish/APKBUILD b/main/perl-css-squish/APKBUILD
index 43a8c27f792..6c11bd55488 100644
--- a/main/perl-css-squish/APKBUILD
+++ b/main/perl-css-squish/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-css-squish
pkgver=0.10
-pkgrel=4
+pkgrel=5
pkgdesc="CSS::Squish perl module"
url="https://metacpan.org/release/CSS-Squish/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl perl-uri perl-test-longstring"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/T/TS/TSIBLEY/CSS-Squish-$pkgver.tar.gz"
diff --git a/main/perl-datetime-format-mail/APKBUILD b/main/perl-datetime-format-mail/APKBUILD
index 28e6547a99b..37862306528 100644
--- a/main/perl-datetime-format-mail/APKBUILD
+++ b/main/perl-datetime-format-mail/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-datetime-format-mail
pkgver=0.403
-pkgrel=3
+pkgrel=4
pkgdesc="DateTime::Format::Mail perl module"
url="https://metacpan.org/release/DateTime-Format-Mail/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl perl-datetime perl-params-validate"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/B/BO/BOOK/DateTime-Format-Mail-$pkgver.tar.gz"
diff --git a/main/perl-datetime-format-w3cdtf/APKBUILD b/main/perl-datetime-format-w3cdtf/APKBUILD
index a20cca8838b..90a4ca3b563 100644
--- a/main/perl-datetime-format-w3cdtf/APKBUILD
+++ b/main/perl-datetime-format-w3cdtf/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-datetime-format-w3cdtf
pkgver=0.08
-pkgrel=3
+pkgrel=4
pkgdesc="DateTime::Format::W3CDTF perl module"
url="https://metacpan.org/release/DateTime-Format-W3CDTF/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl perl-datetime"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-$pkgver.tar.gz"
diff --git a/main/perl-dbix-dbschema/APKBUILD b/main/perl-dbix-dbschema/APKBUILD
index 76ac63411d3..3c040594180 100644
--- a/main/perl-dbix-dbschema/APKBUILD
+++ b/main/perl-dbix-dbschema/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-dbix-dbschema
pkgver=0.47
-pkgrel=1
+pkgrel=2
pkgdesc="DBIx::DBSchema perl module"
url="https://metacpan.org/release/DBIx-DBSchema/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl perl-dbi"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/I/IV/IVAN/DBIx-DBSchema-$pkgver.tar.gz"
diff --git a/main/perl-devel-stacktrace-ashtml/APKBUILD b/main/perl-devel-stacktrace-ashtml/APKBUILD
index a06ab4f82af..b9da6801d30 100644
--- a/main/perl-devel-stacktrace-ashtml/APKBUILD
+++ b/main/perl-devel-stacktrace-ashtml/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-devel-stacktrace-ashtml
pkgver=0.15
-pkgrel=3
+pkgrel=4
pkgdesc="Devel::StackTrace::AsHTML perl module"
url="https://metacpan.org/release/Devel-StackTrace-AsHTML/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl perl-devel-stacktrace"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-$pkgver.tar.gz"
diff --git a/main/perl-device-serialport/APKBUILD b/main/perl-device-serialport/APKBUILD
index c85b08a94ad..d75652bbff9 100644
--- a/main/perl-device-serialport/APKBUILD
+++ b/main/perl-device-serialport/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-device-serialport
_pkgreal=Device-SerialPort
pkgver=1.04
-pkgrel=20
+pkgrel=21
pkgdesc="Linux/POSIX emulation of Win32::SerialPort functions."
url="https://metacpan.org/dist/Device-SerialPort"
arch="all"
-license="GPL PerlArtistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
makedepends="perl-dev"
subpackages="$pkgname-doc"
diff --git a/main/perl-digest-sha1/APKBUILD b/main/perl-digest-sha1/APKBUILD
index 0ac7af21226..090239ae6b2 100644
--- a/main/perl-digest-sha1/APKBUILD
+++ b/main/perl-digest-sha1/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-digest-sha1
_pkgreal=Digest-SHA1
pkgver=2.13
-pkgrel=17
+pkgrel=18
pkgdesc="Perl interface to the SHA-1 algorithm"
url="https://metacpan.org/release/Digest-SHA1/"
arch="all"
-license="GPL PerlArtistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
makedepends="perl-dev"
subpackages="$pkgname-doc"
diff --git a/main/perl-email-address-list/APKBUILD b/main/perl-email-address-list/APKBUILD
index 5e1f7e53eaa..b2af7054341 100644
--- a/main/perl-email-address-list/APKBUILD
+++ b/main/perl-email-address-list/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=perl-email-address-list
pkgver=0.06
-pkgrel=3
+pkgrel=4
pkgdesc="RFC close address list parsing"
url="https://metacpan.org/release/Email-Address-List/"
arch="noarch"
-license="GPL+ or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl perl-email-address"
makedepends="perl-json perl-module-install"
subpackages="$pkgname-doc"
diff --git a/main/perl-fcgi-procmanager/APKBUILD b/main/perl-fcgi-procmanager/APKBUILD
index 3a562aab052..6284ed6e1a0 100644
--- a/main/perl-fcgi-procmanager/APKBUILD
+++ b/main/perl-fcgi-procmanager/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-fcgi-procmanager
_pkgreal=FCGI-ProcManager
pkgver=0.28
-pkgrel=3
+pkgrel=4
pkgdesc="Functions for managing FastCGI applications"
url="https://metacpan.org/release/FCGI-ProcManager/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/A/AR/ARODLAND/FCGI-ProcManager-$pkgver.tar.gz"
diff --git a/main/perl-hash-multivalue/APKBUILD b/main/perl-hash-multivalue/APKBUILD
index e97b617fc79..3887772783c 100644
--- a/main/perl-hash-multivalue/APKBUILD
+++ b/main/perl-hash-multivalue/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-hash-multivalue
pkgver=0.16
-pkgrel=3
+pkgrel=4
pkgdesc="Hash::MultiValue perl module"
url="https://metacpan.org/release/Hash-MultiValue/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/A/AR/ARISTOTLE/Hash-MultiValue-$pkgver.tar.gz"
diff --git a/main/perl-html-quoted/APKBUILD b/main/perl-html-quoted/APKBUILD
index 883a0b6ac19..2b335088305 100644
--- a/main/perl-html-quoted/APKBUILD
+++ b/main/perl-html-quoted/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-html-quoted
pkgver=0.05
-pkgrel=0
+pkgrel=1
pkgdesc="HTML::Quoted perl module"
url="https://metacpan.org/release/HTML-Quoted/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl perl-html-parser"
makedepends="perl-module-install"
subpackages="$pkgname-doc"
diff --git a/main/perl-http-body/APKBUILD b/main/perl-http-body/APKBUILD
index 69758a9b11e..4cb36db46d2 100644
--- a/main/perl-http-body/APKBUILD
+++ b/main/perl-http-body/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-http-body
pkgver=1.22
-pkgrel=3
+pkgrel=4
pkgdesc="HTTP::Body perl module"
url="https://metacpan.org/dist/HTTP-Body"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl perl-http-message perl-uri"
makedepends="perl-test-deep"
subpackages="$pkgname-doc"
diff --git a/main/perl-http-negotiate/APKBUILD b/main/perl-http-negotiate/APKBUILD
index cd9e0eaa1a7..2e3d17b56ba 100644
--- a/main/perl-http-negotiate/APKBUILD
+++ b/main/perl-http-negotiate/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-http-negotiate
pkgver=6.01
-pkgrel=4
+pkgrel=5
pkgdesc="HTTP::Negotiate perl module"
url="https://metacpan.org/release/HTTP-Negotiate/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl perl-http-message"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/G/GA/GAAS/HTTP-Negotiate-$pkgver.tar.gz"
diff --git a/main/perl-importer/APKBUILD b/main/perl-importer/APKBUILD
index dc4322a78f2..8fa49d9a540 100644
--- a/main/perl-importer/APKBUILD
+++ b/main/perl-importer/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=perl-importer
pkgver=0.026
-pkgrel=2
+pkgrel=3
pkgdesc="Alternative but compatible interface to modules that export symbols."
url="https://metacpan.org/release/Importer"
arch="noarch"
-license="PerlArtistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Importer-$pkgver.tar.gz"
diff --git a/main/perl-io-multiplex/APKBUILD b/main/perl-io-multiplex/APKBUILD
index 12bec60cbdc..a72795d889f 100644
--- a/main/perl-io-multiplex/APKBUILD
+++ b/main/perl-io-multiplex/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-io-multiplex
_pkgreal=IO-Multiplex
pkgver=1.16
-pkgrel=4
+pkgrel=5
pkgdesc="Perl module to manage IO on many file handles"
url="https://metacpan.org/pod/IO::Multiplex"
arch="noarch"
-license="Artistic-Perl-1.0 OR GPL-1.0-or-later"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/B/BB/BBB/IO-Multiplex-$pkgver.tar.gz"
diff --git a/main/perl-io-stringy/APKBUILD b/main/perl-io-stringy/APKBUILD
index 6eac39ccac7..c202e5d06df 100644
--- a/main/perl-io-stringy/APKBUILD
+++ b/main/perl-io-stringy/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-io-stringy
_pkgreal=IO-Stringy
pkgver=2.113
-pkgrel=2
+pkgrel=3
pkgdesc="A Perl module for I/O on in-core objects like strings and arrays"
url="https://metacpan.org/pod/IO::Stringy"
arch="noarch"
-license="Artistic-Perl-1.0 OR GPL-1.0-or-later"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/C/CA/CAPOEIRAB/IO-Stringy-$pkgver.tar.gz"
diff --git a/main/perl-ipc-run3/APKBUILD b/main/perl-ipc-run3/APKBUILD
index 7bd85c5d4ae..ef9fb9a8e0f 100644
--- a/main/perl-ipc-run3/APKBUILD
+++ b/main/perl-ipc-run3/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-ipc-run3
pkgver=0.049
-pkgrel=0
+pkgrel=1
pkgdesc="IPC::Run3 perl module"
url="https://metacpan.org/pod/IPC::Run3"
arch="noarch"
-license="GPL-2.0 or Artistic-1.0-Perl"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/IPC-Run3-$pkgver.tar.gz"
diff --git a/main/perl-locale-maketext-fuzzy/APKBUILD b/main/perl-locale-maketext-fuzzy/APKBUILD
index 7a77d96489d..16c7da875e2 100644
--- a/main/perl-locale-maketext-fuzzy/APKBUILD
+++ b/main/perl-locale-maketext-fuzzy/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-locale-maketext-fuzzy
pkgver=0.11
-pkgrel=4
+pkgrel=5
pkgdesc="Locale::Maketext::Fuzzy perl module"
url="https://metacpan.org/release/Locale-Maketext-Fuzzy/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/A/AU/AUDREYT/Locale-Maketext-Fuzzy-$pkgver.tar.gz
diff --git a/main/perl-locale-maketext-lexicon/APKBUILD b/main/perl-locale-maketext-lexicon/APKBUILD
index 304d48404f6..e01e924a6a5 100644
--- a/main/perl-locale-maketext-lexicon/APKBUILD
+++ b/main/perl-locale-maketext-lexicon/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-locale-maketext-lexicon
pkgver=1.00
-pkgrel=5
+pkgrel=6
pkgdesc="Locale::Maketext::Lexicon perl module"
url="https://metacpan.org/release/Locale-Maketext-Lexicon/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/D/DR/DRTECH/Locale-Maketext-Lexicon-$pkgver.tar.gz"
diff --git a/main/perl-mail-domainkeys/APKBUILD b/main/perl-mail-domainkeys/APKBUILD
index abfd86fd0b5..c2b9c49e2d6 100644
--- a/main/perl-mail-domainkeys/APKBUILD
+++ b/main/perl-mail-domainkeys/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-mail-domainkeys
_pkgreal=Mail-DomainKeys
pkgver=1.0
-pkgrel=4
+pkgrel=5
pkgdesc="A perl implementation of DomainKeys"
url="https://metacpan.org/dist/Mail-DomainKeys"
arch="noarch"
-license="Artistic-Perl-1.0 GPL+"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
checkdepends="perl-crypt-openssl-rsa perl-mailtools perl-net-dns"
subpackages="$pkgname-doc"
diff --git a/main/perl-math-round/APKBUILD b/main/perl-math-round/APKBUILD
index 6b188c116b7..c81c2c43423 100644
--- a/main/perl-math-round/APKBUILD
+++ b/main/perl-math-round/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-math-round
pkgver=0.08
-pkgrel=0
+pkgrel=1
pkgdesc="Math::Round perl module"
url="https://metacpan.org/release/Math-Round/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Math-Round-$pkgver.tar.gz"
diff --git a/main/perl-module-versions-report/APKBUILD b/main/perl-module-versions-report/APKBUILD
index c76a235cc8f..2ebf669438a 100644
--- a/main/perl-module-versions-report/APKBUILD
+++ b/main/perl-module-versions-report/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-module-versions-report
pkgver=1.06
-pkgrel=4
+pkgrel=5
pkgdesc="Module::Versions::Report perl module"
url="https://metacpan.org/release/Module-Versions-Report/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/J/JE/JESSE/Module-Versions-Report-$pkgver.tar.gz"
diff --git a/main/perl-net-dns-resolver-programmable/APKBUILD b/main/perl-net-dns-resolver-programmable/APKBUILD
index 874f2c64417..de92fc2b991 100644
--- a/main/perl-net-dns-resolver-programmable/APKBUILD
+++ b/main/perl-net-dns-resolver-programmable/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-net-dns-resolver-programmable
_pkgreal=Net-DNS-Resolver-Programmable
pkgver=0.009
-pkgrel=3
+pkgrel=4
pkgdesc="Programmable DNS resolver perl class for offline emulation of DNS"
url="https://metacpan.org/pod/Net::DNS::Resolver::Programmable"
arch="noarch"
-license="Perl Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl perl-net-dns"
makedepends="perl-module-build"
subpackages="$pkgname-doc"
diff --git a/main/perl-net-ip/APKBUILD b/main/perl-net-ip/APKBUILD
index 27773cbc467..a4b9255ac85 100644
--- a/main/perl-net-ip/APKBUILD
+++ b/main/perl-net-ip/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-net-ip
_pkgreal=Net-IP
pkgver=1.26
-pkgrel=6
+pkgrel=7
pkgdesc="Perl extension for manipulating IPv4/IPv6 addresses"
url="https://metacpan.org/dist/Net-IP"
arch="noarch"
-license="Artistic-Perl-1.0 GPL+"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/M/MA/MANU/Net-IP-$pkgver.tar.gz"
diff --git a/main/perl-net-libidn/APKBUILD b/main/perl-net-libidn/APKBUILD
index 96cb78dea71..fd9f9f56198 100644
--- a/main/perl-net-libidn/APKBUILD
+++ b/main/perl-net-libidn/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-net-libidn
_pkgreal=Net-LibIDN
pkgver=0.12
-pkgrel=14
+pkgrel=15
pkgdesc="Perl bindings for GNU Libidn"
url="http://www.net-dns.org/"
arch="all"
-license="Artistic-Perl-1.0 GPL+"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
makedepends="libidn-dev perl-dev"
subpackages="$pkgname-doc"
diff --git a/main/perl-net-rblclient/APKBUILD b/main/perl-net-rblclient/APKBUILD
index 9dc91b7a3bc..32a67da9bfe 100644
--- a/main/perl-net-rblclient/APKBUILD
+++ b/main/perl-net-rblclient/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-net-rblclient
_pkgreal=Net-RBLClient
pkgver=0.5
-pkgrel=7
+pkgrel=8
pkgdesc="Queries multiple Realtime Blackhole Lists in parallel"
url="https://metacpan.org/release/Net-RBLClient/"
arch="noarch"
-license="Artistic GPL-2.0"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/A/AB/ABLUM/Net-RBLClient-$pkgver.tar.gz"
diff --git a/main/perl-netaddr-ip/APKBUILD b/main/perl-netaddr-ip/APKBUILD
index 8a247fb1340..8ce665d209b 100644
--- a/main/perl-netaddr-ip/APKBUILD
+++ b/main/perl-netaddr-ip/APKBUILD
@@ -2,11 +2,11 @@
pkgname=perl-netaddr-ip
_pkgreal=NetAddr-IP
pkgver=4.079
-pkgrel=11
+pkgrel=12
pkgdesc="Perl extension for managing IPv4 and IPv6 addresses and subnets"
url="https://metacpan.org/dist/NetAddr-IP"
arch="all"
-license="GPL-2.0 and Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
makedepends="perl-dev"
subpackages="$pkgname-doc"
diff --git a/main/perl-parse-recdescent/APKBUILD b/main/perl-parse-recdescent/APKBUILD
index 3f6d3ee0e24..cecf19f18a9 100644
--- a/main/perl-parse-recdescent/APKBUILD
+++ b/main/perl-parse-recdescent/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-parse-recdescent
_pkgreal=Parse-RecDescent
pkgver=1.967015
-pkgrel=5
+pkgrel=6
pkgdesc="Generate Recursive-Descent Parsers"
url="https://metacpan.org/dist/Parse-RecDescent"
arch="noarch"
-license="Artistic-Perl-1.0 GPL+"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
checkdepends="perl-test-pod perl-test-warn"
subpackages="$pkgname-doc"
diff --git a/main/perl-pod-coverage/APKBUILD b/main/perl-pod-coverage/APKBUILD
index 704d7818480..1cce09d8c9b 100644
--- a/main/perl-pod-coverage/APKBUILD
+++ b/main/perl-pod-coverage/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-pod-coverage
_pkgreal=Pod-Coverage
pkgver=0.23
-pkgrel=5
+pkgrel=6
pkgdesc="Perl - Checks if the documentation of a module is comprehensive"
url="https://metacpan.org/dist/Pod-Coverage"
arch="noarch"
-license="Artistic-1.0-Perl or GPL-1.0-or-later"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl perl-devel-symdump perl-test-pod perl-pod-parser"
source="https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/Pod-Coverage-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-regexp-ipv6/APKBUILD b/main/perl-regexp-ipv6/APKBUILD
index 7a7ed88bf50..0c1124c3fac 100644
--- a/main/perl-regexp-ipv6/APKBUILD
+++ b/main/perl-regexp-ipv6/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-regexp-ipv6
pkgver=0.03
-pkgrel=4
+pkgrel=5
pkgdesc="Regexp::IPv6 perl module"
url="https://metacpan.org/release/Regexp-IPv6/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/S/SA/SALVA/Regexp-IPv6-$pkgver.tar.gz"
diff --git a/main/perl-scope-guard/APKBUILD b/main/perl-scope-guard/APKBUILD
index 5b20d3489d1..1422dac3013 100644
--- a/main/perl-scope-guard/APKBUILD
+++ b/main/perl-scope-guard/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-scope-guard
pkgver=0.21
-pkgrel=4
+pkgrel=5
pkgdesc="Scope::Guard perl module"
url="https://metacpan.org/release/Scope-Guard/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/C/CH/CHOCOLATE/Scope-Guard-$pkgver.tar.gz"
diff --git a/main/perl-snmp-session/APKBUILD b/main/perl-snmp-session/APKBUILD
index 424cc95fdea..5379bdc8bd2 100644
--- a/main/perl-snmp-session/APKBUILD
+++ b/main/perl-snmp-session/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-snmp-session
pkgver=1.16
-pkgrel=1
+pkgrel=2
pkgdesc="A SNMP Perl Module"
url="https://github.com/sleinen/snmp-session"
arch="noarch"
-license="PerlArtistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
options="!check" # no testsuite
depends="perl"
subpackages="$pkgname-doc"
diff --git a/main/perl-sub-uplevel/APKBUILD b/main/perl-sub-uplevel/APKBUILD
index 86ccabe8c6f..a73a7e10af7 100644
--- a/main/perl-sub-uplevel/APKBUILD
+++ b/main/perl-sub-uplevel/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-sub-uplevel
_pkgreal=Sub-Uplevel
pkgver=0.2800
-pkgrel=4
+pkgrel=5
pkgdesc="Perl - Apparently run a function in a higher stack frame"
url="https://metacpan.org/dist/Sub-Uplevel"
arch="noarch"
-license="Artistic GPL"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-$pkgver.tar.gz"
diff --git a/main/perl-switch/APKBUILD b/main/perl-switch/APKBUILD
index cf278b3fa8f..872ecfc65e0 100644
--- a/main/perl-switch/APKBUILD
+++ b/main/perl-switch/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-switch
pkgver=2.17
-pkgrel=4
+pkgrel=5
pkgdesc="A switch statement for Perl"
url="https://metacpan.org/release/Switch/"
arch="noarch"
-license="Perl"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/C/CH/CHORNY/Switch-$pkgver.tar.gz"
diff --git a/main/perl-test-cpan-meta/APKBUILD b/main/perl-test-cpan-meta/APKBUILD
index 33fe90155fc..fb8ec21dc98 100644
--- a/main/perl-test-cpan-meta/APKBUILD
+++ b/main/perl-test-cpan-meta/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-test-cpan-meta
_pkgreal=Test-CPAN-Meta
pkgver=0.25
-pkgrel=3
+pkgrel=4
pkgdesc="Validate your CPAN META.json files"
url="https://metacpan.org/release/Test-CPAN-Meta/"
arch="noarch"
-license="Artistic-2"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/B/BA/BARBIE/$_pkgreal-$pkgver.tar.gz"
diff --git a/main/perl-test-deep/APKBUILD b/main/perl-test-deep/APKBUILD
index 7c7bd19e839..4d3b86a4100 100644
--- a/main/perl-test-deep/APKBUILD
+++ b/main/perl-test-deep/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-test-deep
pkgver=1.204
-pkgrel=1
+pkgrel=2
pkgdesc="Test::Deep perl module"
url="https://metacpan.org/release/Test-Deep/"
arch="noarch"
-license="GPL-1.0-or-later or Artistic-1.0-Perl"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl perl-test-simple perl-test-nowarnings"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Test-Deep-$pkgver.tar.gz"
diff --git a/main/perl-test-longstring/APKBUILD b/main/perl-test-longstring/APKBUILD
index d8157a0d634..ddf8c9d34e4 100644
--- a/main/perl-test-longstring/APKBUILD
+++ b/main/perl-test-longstring/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-test-longstring
_pkgreal=Test-LongString
pkgver=0.17
-pkgrel=3
+pkgrel=4
pkgdesc="Tests strings for equality"
url="https://metacpan.org/release/Test-LongString/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/R/RG/RGARCIA/Test-LongString-$pkgver.tar.gz"
diff --git a/main/perl-test-pod-coverage/APKBUILD b/main/perl-test-pod-coverage/APKBUILD
index 259e5238179..7125dad7606 100644
--- a/main/perl-test-pod-coverage/APKBUILD
+++ b/main/perl-test-pod-coverage/APKBUILD
@@ -3,11 +3,11 @@
pkgname=perl-test-pod-coverage
_pkgreal=Test-Pod-Coverage
pkgver=1.10
-pkgrel=4
+pkgrel=5
pkgdesc="Perl - Check for pod coverage in your distribution."
url="https://metacpan.org/release/Test-Pod-Coverage/"
arch="noarch"
-license="Artistic GPL"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl perl-pod-coverage perl-test-pod perl-devel-symdump"
source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Test-Pod-Coverage-$pkgver.tar.gz"
diff --git a/main/perl-text-password-pronounceable/APKBUILD b/main/perl-text-password-pronounceable/APKBUILD
index 93c3a4e458e..d20f75d4c8d 100644
--- a/main/perl-text-password-pronounceable/APKBUILD
+++ b/main/perl-text-password-pronounceable/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-text-password-pronounceable
pkgver=0.30
-pkgrel=4
+pkgrel=5
pkgdesc="Text::Password::Pronounceable perl module"
url="https://metacpan.org/release/Text-Password-Pronounceable/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
makedepends="perl-module-install"
subpackages="$pkgname-doc"
diff --git a/main/perl-text-reform/APKBUILD b/main/perl-text-reform/APKBUILD
index a84eee1b3ee..ba249c3820d 100644
--- a/main/perl-text-reform/APKBUILD
+++ b/main/perl-text-reform/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-text-reform
pkgver=1.20
-pkgrel=3
+pkgrel=4
pkgdesc="Text::Reform perl module"
url="https://metacpan.org/release/Text-Reform"
arch="noarch"
-license="GPL-1.0-or-later or Artistic-1.0-Perl"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/C/CH/CHORNY/Text-Reform-$pkgver.tar.gz"
diff --git a/main/perl-tk/APKBUILD b/main/perl-tk/APKBUILD
index 62f446fe47e..216fc8e127b 100644
--- a/main/perl-tk/APKBUILD
+++ b/main/perl-tk/APKBUILD
@@ -5,11 +5,11 @@ pkgname=perl-tk
#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
_pkgreal=Tk
pkgver=804.036
-pkgrel=4
+pkgrel=5
pkgdesc="Tk - a Graphical User Interface Toolkit"
url="https://metacpan.org/release/Tk/"
arch="all"
-license="unrestricted"
+license="TCL AND HPND-Pbmplus AND CC-BY-SA-3.0 AND MIT-open-group AND MIT"
depends="perl"
makedepends="perl-dev libx11-dev libpng-dev"
subpackages="$pkgname-doc"
diff --git a/main/perl-www-robotrules/APKBUILD b/main/perl-www-robotrules/APKBUILD
index 9a9a5a4b940..c0d58e3940c 100644
--- a/main/perl-www-robotrules/APKBUILD
+++ b/main/perl-www-robotrules/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=perl-www-robotrules
pkgver=6.02
-pkgrel=4
+pkgrel=5
pkgdesc="WWW::RobotRules perl module"
url="https://metacpan.org/release/WWW-RobotRules/"
arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
depends="perl perl-uri"
replaces="perl-libwww"
subpackages="$pkgname-doc"
diff --git a/main/policyd-spf-fs/APKBUILD b/main/policyd-spf-fs/APKBUILD
index 6d9b7dc500b..1a849883480 100644
--- a/main/policyd-spf-fs/APKBUILD
+++ b/main/policyd-spf-fs/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=policyd-spf-fs
pkgver=23
-pkgrel=7
+pkgrel=8
pkgdesc="Policy daemon for checking SPF records in postfix"
url="https://www.freestone.net/software/policyd-spf-fs/"
arch="all"
-license="GPL"
+license="LGPL-2.1-or-later OR BSD-2-Clause"
makedepends="libspf2-dev"
source="https://www.freestone.net/ftp/policyd-spf-fs/policyd-spf-fs_$pkgver.tar.gz
format-security.patch
diff --git a/main/postfix-policyd-spf-perl/APKBUILD b/main/postfix-policyd-spf-perl/APKBUILD
index c37945ff422..67d203601cf 100644
--- a/main/postfix-policyd-spf-perl/APKBUILD
+++ b/main/postfix-policyd-spf-perl/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=postfix-policyd-spf-perl
pkgver=2.011
-pkgrel=1
+pkgrel=2
pkgdesc="A Sender Policy Framework implementation"
url="http://www.openspf.org/Software"
arch="all"
-license="GPL"
+license="GPL-2.0-or-later"
options="!check"
depends="perl perl-mail-spf perl-netaddr-ip perl-sys-hostname-long"
source="https://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz"
diff --git a/main/powerpc-utils/APKBUILD b/main/powerpc-utils/APKBUILD
index 1f771f1d0b4..7a27182b821 100644
--- a/main/powerpc-utils/APKBUILD
+++ b/main/powerpc-utils/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
pkgname=powerpc-utils
pkgver=1.3.6
-pkgrel=0
+pkgrel=1
pkgdesc="Maintenance utilities for PowerPC platforms"
url="https://github.com/nfont/powerpc-utils"
arch="ppc ppc64 ppc64le"
options="!check" # No test suite.
-license="GPL-2.0+"
+license="GPL-2.0-or-later"
makedepends="autoconf automake zlib-dev"
depends="bash bc"
subpackages="$pkgname-doc"
diff --git a/main/proxychains-ng/APKBUILD b/main/proxychains-ng/APKBUILD
index 4233733c57f..8dca750a763 100644
--- a/main/proxychains-ng/APKBUILD
+++ b/main/proxychains-ng/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=proxychains-ng
pkgver=4.17
-pkgrel=0
+pkgrel=1
pkgdesc="This tool provides proxy server support to any app."
url="https://github.com/rofl0r/proxychains-ng"
arch="all"
-license="GPL-2.0"
+license="GPL-2.0-only"
options="!check"
source="https://github.com/rofl0r/proxychains-ng/releases/download/v$pkgver/proxychains-ng-$pkgver.tar.xz"
diff --git a/main/pstree/APKBUILD b/main/pstree/APKBUILD
index 687efebeb7e..84916c88958 100644
--- a/main/pstree/APKBUILD
+++ b/main/pstree/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=pstree
pkgver=2.40
-pkgrel=1
+pkgrel=2
pkgdesc="A small tool to list processes as a tree"
url="https://github.com/FredHucht/pstree"
arch="all"
-license="GPL"
+license="GPL-3.0-or-later"
depends="!psmisc" # also provides pstree
subpackages="$pkgname-doc"
options="!check" # no test suite
diff --git a/main/rdfind/APKBUILD b/main/rdfind/APKBUILD
index 3d2a55315d1..396c0bc75f3 100644
--- a/main/rdfind/APKBUILD
+++ b/main/rdfind/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=rdfind
pkgver=1.6.0
-pkgrel=0
+pkgrel=1
pkgdesc="Redundant data find - a program that finds duplicate files"
url="http://rdfind.pauldreik.se"
arch="all"
-license="GPL-2.0 "
+license="GPL-2.0-or-later"
makedepends="nettle-dev automake autoconf libtool"
subpackages="$pkgname-doc"
source="https://rdfind.pauldreik.se/rdfind-$pkgver.tar.gz
diff --git a/main/rtapd/APKBUILD b/main/rtapd/APKBUILD
index a73eeced107..575f8d8f53f 100644
--- a/main/rtapd/APKBUILD
+++ b/main/rtapd/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=rtapd
pkgver=1.7
-pkgrel=9
+pkgrel=10
pkgdesc="daemon for routing packets to rtnppd"
url="https://sourceforge.net/projects/rtnppd/"
arch="all"
-license="GPL"
+license="BSD-2-Clause"
depends="rtnppd"
makedepends="libpq-dev"
subpackages="$pkgname-dbg $pkgname-openrc"
diff --git a/main/rtnppd/APKBUILD b/main/rtnppd/APKBUILD
index ffc68e56490..c3a3846d227 100644
--- a/main/rtnppd/APKBUILD
+++ b/main/rtnppd/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=rtnppd
pkgver=1.7b
-pkgrel=11
+pkgrel=12
pkgdesc="A program route TNPP 3.8 (Telocator Network Paging Protocol) packets between serial and other links"
url="https://sourceforge.net/projects/rtnppd/"
arch="all"
-license="GPL"
+license="BSD-2-Clause"
makedepends="libpq-dev"
install="$pkgname.pre-install"
subpackages="$pkgname-dbg $pkgname-openrc"
diff --git a/main/sbsigntool/APKBUILD b/main/sbsigntool/APKBUILD
index 9b53e76eb20..c28aa66021f 100644
--- a/main/sbsigntool/APKBUILD
+++ b/main/sbsigntool/APKBUILD
@@ -3,12 +3,12 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=sbsigntool
pkgver=0.9.5
-pkgrel=1
+pkgrel=2
_ccancommit=b1f28e17227f2320d07fe052a8a48942fe17caa5
pkgdesc="Secure Boot signing tools"
url="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/"
arch="all !armhf !s390x !ppc64le !mips !mips64" # limited by gnu-efi
-license="GPL-3.0-only WITH OpenSSL-Exception"
+license="GPL-3.0-or-later WITH cryptsetup-OpenSSL-exception"
makedepends="autoconf automake bash binutils-dev gnu-efi-dev help2man openssl-dev>3 util-linux-dev"
options="!check" # testsuite is not functional
subpackages="$pkgname-doc"
diff --git a/main/scstadmin/APKBUILD b/main/scstadmin/APKBUILD
index b3fac9c96ea..638a602928e 100644
--- a/main/scstadmin/APKBUILD
+++ b/main/scstadmin/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer:
pkgname=scstadmin
pkgver=2.2.0
-pkgrel=6
+pkgrel=7
pkgdesc="SCST administration tool written in perl"
url="https://scst.sourceforge.net/"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
options="!check" # no testsuite
depends="perl"
makedepends="perl-dev"
diff --git a/main/sharutils/APKBUILD b/main/sharutils/APKBUILD
index 3b18d5e8f4d..e078a5fafd9 100644
--- a/main/sharutils/APKBUILD
+++ b/main/sharutils/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Will Sinatra <wpsinatra@gmail.com>
pkgname=sharutils
pkgver=4.15.2
-pkgrel=5
+pkgrel=6
pkgdesc="Utilities for manipulating shell archives"
url="https://www.gnu.org/software/sharutils/"
arch="all"
-license="GPL-3.0+"
+license="GPL-3.0-or-later"
depends="bzip2 xz"
makedepends="gettext-dev texinfo"
checkdepends="diffutils"
diff --git a/main/skytraq-datalogger/APKBUILD b/main/skytraq-datalogger/APKBUILD
index 98b54a4c154..16563746b37 100644
--- a/main/skytraq-datalogger/APKBUILD
+++ b/main/skytraq-datalogger/APKBUILD
@@ -3,11 +3,11 @@
pkgname=skytraq-datalogger
pkgver=0.5.1
_pkgver=0.5-1
-pkgrel=3
+pkgrel=4
pkgdesc="Configuration and download tool for GPS data loggers based on Skytraq Venus 5 and 6 chipsets"
url="https://code.google.com/p/skytraq-datalogger/"
arch="all"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
depends_dev="curl-dev"
makedepends="$depends_dev"
source="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/skytraq-datalogger/skytraq-datalogger_$_pkgver.tar.gz
diff --git a/main/ssmtp/APKBUILD b/main/ssmtp/APKBUILD
index d164d254de8..fff903b57c5 100644
--- a/main/ssmtp/APKBUILD
+++ b/main/ssmtp/APKBUILD
@@ -3,12 +3,12 @@
pkgname=ssmtp
pkgver=2.64
-pkgrel=20
+pkgrel=21
pkgdesc="Extremely simple MTA to get mail off the system to a mail hub"
subpackages="$pkgname-doc"
arch="all"
url="https://packages.debian.org/stable/mail/ssmtp"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
makedepends="openssl-dev>3 autoconf"
options="!check"
source="https://deb.debian.org/debian/pool/main/s/ssmtp/ssmtp_$pkgver.orig.tar.bz2
diff --git a/main/u-boot/APKBUILD b/main/u-boot/APKBUILD
index 927f55d2a63..82c4db9a774 100644
--- a/main/u-boot/APKBUILD
+++ b/main/u-boot/APKBUILD
@@ -3,11 +3,11 @@
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=u-boot
pkgver=2024.01
-pkgrel=3
+pkgrel=4
pkgdesc="u-boot bootloader common files"
url="https://www.denx.de/wiki/U-Boot/"
arch="all !s390x !ppc64le"
-license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs
+license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause WITH eCos-exception-2.0 IBM-pibs
ISC LGPL-2.0-only LGPL-2.1-only X11"
options="!check" # no tests
makedepends="
diff --git a/main/uwsgi/APKBUILD b/main/uwsgi/APKBUILD
index 527a24cf7a4..c5cf24be623 100644
--- a/main/uwsgi/APKBUILD
+++ b/main/uwsgi/APKBUILD
@@ -4,11 +4,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=uwsgi
pkgver=2.0.24
-pkgrel=0
+pkgrel=1
pkgdesc="uWSGI application container server"
url="https://projects.unbit.it/uwsgi/"
arch="all"
-license="custom" # GPL-2.0-only + linking exception
+license="GPL-2.0-only WITH GCC-exception-2.0"
depends="mailcap"
install="$pkgname.pre-install $pkgname.post-upgrade"
pkgusers="uwsgi"
diff --git a/main/v86d/APKBUILD b/main/v86d/APKBUILD
index 84e34e97f7e..6f2e41a9b6f 100644
--- a/main/v86d/APKBUILD
+++ b/main/v86d/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=v86d
pkgver=0.1.10
-pkgrel=3
+pkgrel=4
pkgdesc="Userspace helper for uvesafb that runs x86 code in an emulated environment"
url="https://github.com/mjanusz/v86d"
arch="x86 x86_64"
-license="GPL-2.0"
+license="GPL-2.0-only"
makedepends="bash linux-headers"
source="v86d-$pkgver.tar.gz::https://github.com/mjanusz/v86d/archive/v86d-$pkgver.tar.gz
modprobe.uvesafb"
diff --git a/main/which/APKBUILD b/main/which/APKBUILD
index b0e10644a15..fdcc2022850 100644
--- a/main/which/APKBUILD
+++ b/main/which/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=which
pkgver=2.21
-pkgrel=4
+pkgrel=5
pkgdesc="A utility to show the full path of commands"
url="https://savannah.gnu.org/projects/which"
arch="all"
-license="GPL-3.0"
+license="GPL-2.0-or-later"
subpackages="$pkgname-doc"
source="https://ftp.gnu.org/gnu/which/which-$pkgver.tar.gz"
diff --git a/main/wipe/APKBUILD b/main/wipe/APKBUILD
index 8fed73381ef..5c6fc73736e 100644
--- a/main/wipe/APKBUILD
+++ b/main/wipe/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=wipe
pkgver=2.3.1
-pkgrel=3
+pkgrel=4
pkgdesc="Secure file wiping utility"
url="https://wipe.sourceforge.net/"
arch="all"
-license="GPL-2.0"
+license="GPL-2.0-only"
makedepends="linux-headers"
subpackages="$pkgname-doc"
source="https://downloads.sourceforge.net/wipe/wipe-$pkgver.tar.bz2
diff --git a/main/xtables-addons-lts/APKBUILD b/main/xtables-addons-lts/APKBUILD
index ef26618bf69..d86fe65a5ca 100644
--- a/main/xtables-addons-lts/APKBUILD
+++ b/main/xtables-addons-lts/APKBUILD
@@ -3,7 +3,7 @@
# when changing _ver we *must* bump _rel
_name=xtables-addons
_ver=3.25
-_rel=0
+_rel=1
# when changing _kver make sure _krel=0 & _rel=0
_flavor=${FLAVOR:-lts}
_kpkg=linux-$_flavor
@@ -20,7 +20,7 @@ pkgrel=$(( _krel + _rel ))
pkgdesc="Iptables extensions kernel modules"
url="https://inai.de/projects/xtables-addons/"
arch="all !armhf !mips64 !riscv64"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
depends="$_kpkg=$_kpkgver"
makedepends="$_kpkg-dev=$_kpkgver iptables-dev linux-headers"
install_if="$_kpkg=$_kpkgver $_name"
diff --git a/main/zd1211-firmware/APKBUILD b/main/zd1211-firmware/APKBUILD
index c04fe697316..6912ffb2226 100644
--- a/main/zd1211-firmware/APKBUILD
+++ b/main/zd1211-firmware/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=zd1211-firmware
pkgver=1.5
-pkgrel=1
+pkgrel=2
pkgdesc="Firmware for ZyDAS ZD1211 USB-WLAN devices supported by the zd1211rw driver"
url="https://sourceforge.net/projects/zd1211/"
arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
source="https://downloads.sourceforge.net/project/zd1211/zd1211-firmware/$pkgver/zd1211-firmware-$pkgver.tar.bz2"
builddir="$srcdir/zd1211-firmware"
options="!check"
diff --git a/main/zsh/APKBUILD b/main/zsh/APKBUILD
index d761a32d432..a51ab1fbe7f 100644
--- a/main/zsh/APKBUILD
+++ b/main/zsh/APKBUILD
@@ -13,11 +13,12 @@
#
pkgname=zsh
pkgver=5.9
-pkgrel=2
+pkgrel=3
pkgdesc="Very advanced and programmable command interpreter (shell)"
url="https://www.zsh.org/"
arch="all"
-license="custom"
+# GPL-2.0-only: license of Completion/Linux/Command/_qdbus
+license="MIT-Modern-Variant AND GPL-2.0-only"
makedepends="
autoconf
diffutils