summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/ap51-flash/Makefile4
-rw-r--r--utils/at/Makefile4
-rw-r--r--utils/bash/Makefile4
-rw-r--r--utils/bluez/Makefile4
-rw-r--r--utils/canutils/Makefile4
-rw-r--r--utils/ccid/Makefile4
-rw-r--r--utils/ccrypt/Makefile4
-rw-r--r--utils/cryptsetup/Makefile4
-rw-r--r--utils/device-observatory/Makefile4
-rw-r--r--utils/dfu-util/Makefile4
-rw-r--r--utils/digitemp/Makefile4
-rw-r--r--utils/dosfstools/Makefile4
-rw-r--r--utils/gzip/Makefile4
-rw-r--r--utils/hfsprogs/Makefile4
-rw-r--r--utils/hplip/Makefile4
-rw-r--r--utils/hub-ctrl/Makefile4
-rw-r--r--utils/kmod/Makefile4
-rw-r--r--utils/lm-sensors/Makefile4
-rw-r--r--utils/lrzsz/Makefile4
-rw-r--r--utils/lxc/Makefile4
-rw-r--r--utils/macchanger/Makefile4
-rw-r--r--utils/mc/Makefile4
-rw-r--r--utils/nano/Makefile4
-rw-r--r--utils/oath-toolkit/Makefile4
-rw-r--r--utils/openobex/Makefile4
-rw-r--r--utils/opensc/Makefile4
-rw-r--r--utils/picocom/Makefile4
-rw-r--r--utils/sane-backends/Makefile4
-rw-r--r--utils/screen/Makefile4
-rw-r--r--utils/sispmctl/Makefile4
-rw-r--r--utils/smartmontools/Makefile4
-rw-r--r--utils/stm32flash/Makefile4
-rw-r--r--utils/tio/Makefile4
-rw-r--r--utils/wifitoggle/Makefile4
-rw-r--r--utils/xz/Makefile4
-rw-r--r--utils/zile/Makefile4
36 files changed, 72 insertions, 72 deletions
diff --git a/utils/ap51-flash/Makefile b/utils/ap51-flash/Makefile
index f1d77cba6..6ba1903b6 100644
--- a/utils/ap51-flash/Makefile
+++ b/utils/ap51-flash/Makefile
@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ap51-flash
PKG_VERSION:=2019.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/ap51-flash/ap51-flash/releases/download/v$(PKG_VERSION)
PKG_HASH:=e7992b2151721cc6f5db91f443ad7fc83cb5604c08cd11fca3e78ecd6b538e57
PKG_MAINTAINER:=Russell Senior <russell@personaltelco.net>
-PKG_LICENSE:=GPL-3.0+ CC0-1.0
+PKG_LICENSE:=GPL-3.0-or-later CC0-1.0
PKG_LICENSE_FILES:=LICENSES/GPL-3.0-or-later.txt LICENSES/CC0-1.0.txt
include $(INCLUDE_DIR)/package.mk
diff --git a/utils/at/Makefile b/utils/at/Makefile
index c37b6b07c..08a8b6121 100644
--- a/utils/at/Makefile
+++ b/utils/at/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=at
PKG_VERSION:=3.1.23
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/a/at
PKG_HASH:=97450aa954aaa8a70218cc8e61a33df9fee9f86527e9f861de302fb7a3c81710
-PKG_LICENSE:=GPL-2.0+ GPL-3.0+ ISC
+PKG_LICENSE:=GPL-2.0-or-later GPL-3.0-or-later ISC
PKG_LICENSE_FILES:=COPYING Copyright
PKG_MAINTAINER:=Phil Eichinger <phil@zankapfel.net>
diff --git a/utils/bash/Makefile b/utils/bash/Makefile
index 06c51382d..d825d6055 100644
--- a/utils/bash/Makefile
+++ b/utils/bash/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=bash
PKG_VERSION:=5.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/bash
PKG_HASH:=b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
diff --git a/utils/bluez/Makefile b/utils/bluez/Makefile
index 8a5a9e891..77a3dd74b 100644
--- a/utils/bluez/Makefile
+++ b/utils/bluez/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=bluez
PKG_VERSION:=5.50
-PKG_RELEASE:=4
+PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/bluetooth/
PKG_HASH:=5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=
diff --git a/utils/canutils/Makefile b/utils/canutils/Makefile
index 7781fd390..e06e38310 100644
--- a/utils/canutils/Makefile
+++ b/utils/canutils/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=canutils
-PKG_RELEASE=1
+PKG_RELEASE=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/linux-can/can-utils
@@ -17,7 +17,7 @@ PKG_SOURCE_VERSION:=cb33a55720716cbe01e6025a2bda74a1b7e492d3
PKG_MIRROR_HASH:=d9c01eeff3d81a28161ca5c3937ec005a1f49ca3eb97bee0164d53cc66365786
PKG_MAINTAINER:=Anton Glukhov <anton.a.glukhov@gmail.com>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
PKG_FIXUP:=autoreconf
diff --git a/utils/ccid/Makefile b/utils/ccid/Makefile
index 5ce1252f3..fc72f3996 100644
--- a/utils/ccid/Makefile
+++ b/utils/ccid/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ccid
PKG_VERSION:=1.4.30
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://ccid.apdu.fr/files/
PKG_HASH:=ac17087be08880a0cdf99a8a2799a4ef004dc6ffa08b4d9b0ad995f39a53ff7c
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=libtool
diff --git a/utils/ccrypt/Makefile b/utils/ccrypt/Makefile
index 2deda0256..f720562de 100644
--- a/utils/ccrypt/Makefile
+++ b/utils/ccrypt/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ccrypt
PKG_VERSION:=1.11
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/ccrypt
PKG_HASH:=b19c47500a96ee5fbd820f704c912f6efcc42b638c0a6aa7a4e3dc0a6b51a44f
PKG_MAINTAINER:=Hannu Nyman <hannu.nyman@iki.fi>
-PKG_LICENSE:=GPLv2+
+PKG_LICENSE:=GPL-2.0-or-later
PKG_FIXUP:=autoreconf
diff --git a/utils/cryptsetup/Makefile b/utils/cryptsetup/Makefile
index c6d2e992e..875084c03 100644
--- a/utils/cryptsetup/Makefile
+++ b/utils/cryptsetup/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=cryptsetup
PKG_VERSION:=2.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/cryptsetup/v2.1
@@ -17,7 +17,7 @@ PKG_HASH:=a3eeb2741f8f3376d16585191f3c60e067dd987e096c3c4b073fab7748b1c897
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=GPL-2.0+ LGPL-2.1+
+PKG_LICENSE:=GPL-2.0-or-later LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING COPYING.LGPL
include $(INCLUDE_DIR)/package.mk
diff --git a/utils/device-observatory/Makefile b/utils/device-observatory/Makefile
index cc9c57968..dc6d33a88 100644
--- a/utils/device-observatory/Makefile
+++ b/utils/device-observatory/Makefile
@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=device-observatory
PKG_VERSION:=1.2.0
-PKG_RELEASE:=4
+PKG_RELEASE:=5
PKG_SOURCE_URL:=https://codeload.github.com/mwarning/device-observatory/tar.gz/v$(PKG_VERSION)?
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_HASH:=83b3f362f154a427abbd3af31b3c2dda9983cdc15f6b833d804727ef0fbdc72e
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later
PKG_BUILD_DEPENDS:=vim/host
include $(INCLUDE_DIR)/package.mk
diff --git a/utils/dfu-util/Makefile b/utils/dfu-util/Makefile
index bd148dd7c..d6900ab36 100644
--- a/utils/dfu-util/Makefile
+++ b/utils/dfu-util/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dfu-util
PKG_VERSION:=0.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME)
PKG_MAINTAINER:=Bruno Randolf <br1@einfach.org>
PKG_HASH:=36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
include $(INCLUDE_DIR)/package.mk
diff --git a/utils/digitemp/Makefile b/utils/digitemp/Makefile
index 268d80024..c5e5f179d 100644
--- a/utils/digitemp/Makefile
+++ b/utils/digitemp/Makefile
@@ -11,14 +11,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=digitemp
PKG_VERSION:=3.7.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/bcl/digitemp/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=683df4ab5cc53a45fe4f860c698f148d34bcca91b3e0568a342f32d64d12ba24
PKG_MAINTAINER:=Jasper Scholte <NightNL@outlook.com>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
include $(INCLUDE_DIR)/package.mk
diff --git a/utils/dosfstools/Makefile b/utils/dosfstools/Makefile
index 39f6a8bc7..38ad39c28 100644
--- a/utils/dosfstools/Makefile
+++ b/utils/dosfstools/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dosfstools
PKG_VERSION:=4.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/dosfstools/dosfstools/releases/download/v$(PKG_VERSION)/ \
@@ -17,7 +17,7 @@ PKG_SOURCE_URL:=https://github.com/dosfstools/dosfstools/releases/download/v$(PK
PKG_HASH:=e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173
PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1
diff --git a/utils/gzip/Makefile b/utils/gzip/Makefile
index 532b905a1..67998f7f6 100644
--- a/utils/gzip/Makefile
+++ b/utils/gzip/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gzip
PKG_VERSION:=1.10
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/gzip
PKG_HASH:=8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
diff --git a/utils/hfsprogs/Makefile b/utils/hfsprogs/Makefile
index e5184280e..1c7cd97d4 100644
--- a/utils/hfsprogs/Makefile
+++ b/utils/hfsprogs/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=hfsprogs
PKG_VERSION:=332.25
-PKG_RELEASE:=2
+PKG_RELEASE:=3
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Florian Fainelli <florian@openwrt.org>
diff --git a/utils/hplip/Makefile b/utils/hplip/Makefile
index 7c93e5b73..842eb7b35 100644
--- a/utils/hplip/Makefile
+++ b/utils/hplip/Makefile
@@ -10,14 +10,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=hplip
PKG_VERSION:=3.19.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/hplip
PKG_HASH:=fcdaedee9ed17d2e70f3aff9558a452d99443d1b93d6623132faf3f3ae61d66d
PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
-PKG_LICENSE:=GPL-2.0 GPL-2.0+
+PKG_LICENSE:=GPL-2.0 GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING LICENSE
PKG_BUILD_PARALLEL:=1
diff --git a/utils/hub-ctrl/Makefile b/utils/hub-ctrl/Makefile
index a3a8a35d0..31ea2544b 100644
--- a/utils/hub-ctrl/Makefile
+++ b/utils/hub-ctrl/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=hub-ctrl
PKG_VERSION:=1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/codazoda/hub-ctrl.c.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=3eef0240fac90067d081551e9f73dfa741d94a9e
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
PKG_MAINTAINER:=Simon Peter <probono@puredarwin.org>
diff --git a/utils/kmod/Makefile b/utils/kmod/Makefile
index d54e4583c..b9e7b6068 100644
--- a/utils/kmod/Makefile
+++ b/utils/kmod/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=kmod
PKG_VERSION:=20
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/kmod/
PKG_HASH:=89c1a1a2193c31f9ebe582640bfa2bd401341dc24119f5a7f702588116fadaa0
PKG_MAINTAINER:=Jeff Waugh <jdub@bethesignal.org>
-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
diff --git a/utils/lm-sensors/Makefile b/utils/lm-sensors/Makefile
index a9567b8dd..591dd9f22 100644
--- a/utils/lm-sensors/Makefile
+++ b/utils/lm-sensors/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lm-sensors
PKG_VERSION:=3.5.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_VERSION_SUBST=$(subst .,-,$(PKG_VERSION))
PKG_SOURCE_URL:=https://codeload.github.com/lm-sensors/lm-sensors/tar.gz/V$(PKG_VERSION_SUBST)?
@@ -18,7 +18,7 @@ PKG_HASH:=f671c1d63a4cd8581b3a4a775fd7864a740b15ad046fe92038bcff5c5134d7e0
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION_SUBST)
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
-PKG_LICENSE:=GPL-2.0+ LGPL-2.1+
+PKG_LICENSE:=GPL-2.0-or-later LGPL-2.1-or-later
PKG_BUILD_PARALLEL:=1
diff --git a/utils/lrzsz/Makefile b/utils/lrzsz/Makefile
index 50374e53e..a1b959513 100644
--- a/utils/lrzsz/Makefile
+++ b/utils/lrzsz/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lrzsz
PKG_VERSION:=0.12.20
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://ohse.de/uwe/releases/
PKG_HASH:=c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1
PKG_MAINTAINER:=Hsing-Wang Liao <kuoruan@gmail.com>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1
diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile
index 8641775dd..a66d468c5 100644
--- a/utils/lxc/Makefile
+++ b/utils/lxc/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lxc
PKG_VERSION:=2.1.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
-PKG_LICENSE:=LGPL-2.1+ BSD-2-Clause GPL-2.0
+PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause GPL-2.0
PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/utils/macchanger/Makefile b/utils/macchanger/Makefile
index e0d9b7c29..c2ca58f1d 100644
--- a/utils/macchanger/Makefile
+++ b/utils/macchanger/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=macchanger
PKG_VERSION:=1.7.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/alobbs/macchanger/releases/download/$(PKG_VERSION)/
PKG_HASH:=dae2717c270fd5f62d790dbf80c19793c651b1b26b62c101b82d5fdf25a845bf
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
diff --git a/utils/mc/Makefile b/utils/mc/Makefile
index 0f962671d..f50f7da38 100644
--- a/utils/mc/Makefile
+++ b/utils/mc/Makefile
@@ -7,9 +7,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mc
PKG_VERSION:=4.8.23
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://ftp.midnight-commander.org/
diff --git a/utils/nano/Makefile b/utils/nano/Makefile
index 677f0a51e..5b1e3d817 100644
--- a/utils/nano/Makefile
+++ b/utils/nano/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nano
PKG_VERSION:=4.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/nano
PKG_HASH:=2af222e0354848ffaa3af31b5cd0a77917e9cb7742cd073d762f3c32f0f582c7
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz>, Hannu Nyman <hannu.nyman@iki.fi>
diff --git a/utils/oath-toolkit/Makefile b/utils/oath-toolkit/Makefile
index 84117757d..07a15fc08 100644
--- a/utils/oath-toolkit/Makefile
+++ b/utils/oath-toolkit/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=oath-toolkit
PKG_VERSION:=2.6.2
-PKG_RELEASE:=4
+PKG_RELEASE:=5
PKG_SOURCE:=oath-toolkit-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SAVANNAH/oath-toolkit
PKG_HASH:=b03446fa4b549af5ebe4d35d7aba51163442d255660558cd861ebce536824aa0
PKG_MAINTAINER:=Fam Zheng <fam@euphon.net>
-PKG_LICENSE:=LGPL-2.0+ GPL-3.0+
+PKG_LICENSE:=LGPL-2.0-or-later GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:nongnu:oath_toolkit
diff --git a/utils/openobex/Makefile b/utils/openobex/Makefile
index 88a2fa46c..b82d14d39 100644
--- a/utils/openobex/Makefile
+++ b/utils/openobex/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openobex
PKG_VERSION:=1.7.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-Source.tar.gz
PKG_SOURCE_URL:=@SF/openobex
@@ -17,7 +17,7 @@ PKG_HASH:=158860aaea52f0fce0c8e4b64550daaae06df2689e05834697b7e8c7d73dd4fc
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-Source
PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
-PKG_LICENSE:=GPL-2.0+ LGPL-2.1+
+PKG_LICENSE:=GPL-2.0-or-later LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:openobex:openobex
diff --git a/utils/opensc/Makefile b/utils/opensc/Makefile
index 2efe32f68..71231a384 100644
--- a/utils/opensc/Makefile
+++ b/utils/opensc/Makefile
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=opensc
PKG_VERSION:=0.19.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_HASH:=2c5a0e4df9027635290b9c0f3addbbf0d651db5ddb0ab789cb0e978f02fd5826
-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_SOURCE_URL:=https://github.com/OpenSC/OpenSC/releases/download/$(PKG_VERSION)/
diff --git a/utils/picocom/Makefile b/utils/picocom/Makefile
index dc8cf38ec..23aff9a60 100644
--- a/utils/picocom/Makefile
+++ b/utils/picocom/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=picocom
PKG_VERSION:=3.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/npat-efault/picocom/tar.gz/$(PKG_VERSION)?
PKG_HASH:=e6761ca932ffc6d09bd6b11ff018bdaf70b287ce518b3282d29e0270e88420bb
PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
include $(INCLUDE_DIR)/package.mk
diff --git a/utils/sane-backends/Makefile b/utils/sane-backends/Makefile
index 774428d7f..a67bae33f 100644
--- a/utils/sane-backends/Makefile
+++ b/utils/sane-backends/Makefile
@@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=sane-backends
PKG_VERSION:=1.0.27
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://fossies.org/linux/misc \
https://alioth.debian.org/frs/download.php/file/4146/
PKG_HASH:=293747bf37275c424ebb2c833f8588601a60b2f9653945d5a3194875355e36c9
PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
-PKG_LICENSE:=GPL-2.0 GPL-2.0+
+PKG_LICENSE:=GPL-2.0 GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING LICENSE
PKG_CPE_ID:=cpe:/a:sane-backends_project:sane-backends
diff --git a/utils/screen/Makefile b/utils/screen/Makefile
index c4244522f..20136ce1d 100644
--- a/utils/screen/Makefile
+++ b/utils/screen/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=screen
PKG_VERSION:=4.6.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/screen
PKG_HASH:=1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a
PKG_MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
diff --git a/utils/sispmctl/Makefile b/utils/sispmctl/Makefile
index 8ede4c2b3..56e4e6898 100644
--- a/utils/sispmctl/Makefile
+++ b/utils/sispmctl/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=sispmctl
PKG_VERSION:=4.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME)
PKG_HASH:=bf5177e085cb0168e18e4cfb69645c3095da149ed46f5659d6e757bde3548e40
PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
diff --git a/utils/smartmontools/Makefile b/utils/smartmontools/Makefile
index 34bc91517..6d0c912b5 100644
--- a/utils/smartmontools/Makefile
+++ b/utils/smartmontools/Makefile
@@ -10,14 +10,14 @@ include $(INCLUDE_DIR)/uclibc++.mk
PKG_NAME:=smartmontools
PKG_VERSION:=7.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/smartmontools
PKG_HASH:=e5e1ac2786bc87fdbd6f92d0ee751b799fbb3e1a09c0a6a379f9eb64b3e8f61c
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_BUILD_PARALLEL:=1
diff --git a/utils/stm32flash/Makefile b/utils/stm32flash/Makefile
index 6250dfe39..5621e9a46 100644
--- a/utils/stm32flash/Makefile
+++ b/utils/stm32flash/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=stm32flash
PKG_VERSION:=0.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME)
PKG_HASH:=97aa9422ef02e82f7da9039329e21a437decf972cb3919ad817f70ac9a49e306
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
PKG_MAINTAINER:=Christian Pointner <equinox@spreadspace.org>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=gpl-2.0.txt
include $(INCLUDE_DIR)/package.mk
diff --git a/utils/tio/Makefile b/utils/tio/Makefile
index a92083454..7fa987b9a 100644
--- a/utils/tio/Makefile
+++ b/utils/tio/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=tio
PKG_VERSION:=1.32
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/tio/tio/releases/download/v$(PKG_VERSION)
PKG_HASH:=a8f5ed6994cacb96780baa416b19e5a6d7d67e8c162a8ea4fd9eccd64984ae44
PKG_MAINTAINER:=
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
diff --git a/utils/wifitoggle/Makefile b/utils/wifitoggle/Makefile
index d9aa68d57..44919c89e 100644
--- a/utils/wifitoggle/Makefile
+++ b/utils/wifitoggle/Makefile
@@ -11,8 +11,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=wifitoggle
PKG_VERSION:=1
-PKG_RELEASE:=5
-PKG_LICENSE:=GPL-2.0+
+PKG_RELEASE:=6
+PKG_LICENSE:=GPL-2.0-or-later
PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
diff --git a/utils/xz/Makefile b/utils/xz/Makefile
index 3075b9d00..012c77d59 100644
--- a/utils/xz/Makefile
+++ b/utils/xz/Makefile
@@ -10,14 +10,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=xz
PKG_VERSION:=5.2.4
-PKG_RELEASE:=4
+PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/lzmautils
PKG_HASH:=3313fd2a95f43d88e44264e6b015e7d03053e681860b0d5d3f9baca79c57b7bf
PKG_MAINTAINER:=
-PKG_LICENSE:=Public-Domain LGPL-2.1+ GPL-2.0+ GPL-3.0+
+PKG_LICENSE:=Public-Domain LGPL-2.1-or-later GPL-2.0-or-later GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:tukaani:xz
diff --git a/utils/zile/Makefile b/utils/zile/Makefile
index 06d5d2ff6..6669dd2f5 100644
--- a/utils/zile/Makefile
+++ b/utils/zile/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=zile
PKG_VERSION:=2.3.24
-PKG_RELEASE:=4
+PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/zile
PKG_HASH:=218bb2af414c6a168101656631a5b2da92f20a965895e1006658cc658b0b7e89
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf