diff --git a/admin/gkrellmd/Makefile b/admin/gkrellmd/Makefile index a89d838d6..073a616c9 100644 --- a/admin/gkrellmd/Makefile +++ b/admin/gkrellmd/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gkrellmd PKG_VERSION:=2.3.10 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=gkrellm-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://gkrellm.srcbox.net/releases PKG_HASH:=8b9ec8baadcd5830c6aff04ba86dc9ed317a15c1c3787440bd1e680fb2fcd766 PKG_MAINTAINER:=Peter Denison -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_BUILD_DIR:=$(BUILD_DIR)/gkrellm-$(PKG_VERSION) diff --git a/admin/muninlite/Makefile b/admin/muninlite/Makefile index 2d98cf34e..522f534ed 100644 --- a/admin/muninlite/Makefile +++ b/admin/muninlite/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=muninlite PKG_VERSION:=1.0.4 -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) PKG_HASH:=736482dd6d6849d014d975b1f5794f20dda6e123dbba2d8c2f169c8e787e6f7e -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile index 48d71b7da..911b4d035 100644 --- a/devel/autoconf/Makefile +++ b/devel/autoconf/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autoconf PKG_VERSION:=2.69 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_URL:=@GNU/autoconf PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_HASH:=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 PKG_MAINTAINER:=Heinrich Schuchardt -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later PKG_INSTALL:=1 diff --git a/devel/automake/Makefile b/devel/automake/Makefile index b864f6eeb..d49f3e2b3 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=automake PKG_VERSION:=1.15.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=@GNU/automake PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_HASH:=af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf PKG_MAINTAINER:=Heinrich Schuchardt -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later PKG_INSTALL:=1 diff --git a/devel/libtool-bin/Makefile b/devel/libtool-bin/Makefile index efcee5c66..fcaf51388 100644 --- a/devel/libtool-bin/Makefile +++ b/devel/libtool-bin/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtool PKG_VERSION:=2.4.6 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/libtool PKG_HASH:=7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f PKG_MAINTAINER:=Heinrich Schuchardt -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_BUILD_DIR = $(BUILD_DIR)/libtool-bin/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL:=1 diff --git a/devel/lpc21isp/Makefile b/devel/lpc21isp/Makefile index daaf05ff4..63ea54cd0 100644 --- a/devel/lpc21isp/Makefile +++ b/devel/lpc21isp/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lpc21isp PKG_VERSION:=197 -PKG_RELEASE:=2 -PKG_LICENSE:=LGPL-3.0+ +PKG_RELEASE:=3 +PKG_LICENSE:=LGPL-3.0-or-later PKG_LICENSE_FILES:=README gpl.txt lgpl-3.0.txt PKG_BUILD_DIR:=$(BUILD_DIR)/lpc21isp_$(PKG_VERSION) diff --git a/devel/m4/Makefile b/devel/m4/Makefile index 1a42f4b17..16dbb69d2 100644 --- a/devel/m4/Makefile +++ b/devel/m4/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=m4 PKG_VERSION:=1.4.18 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=@GNU/m4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_HASH:=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07 PKG_MAINTAINER:=Heinrich Schuchardt -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later PKG_INSTALL:=1 diff --git a/devel/make/Makefile b/devel/make/Makefile index c3dde4def..9de2bbbf7 100644 --- a/devel/make/Makefile +++ b/devel/make/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=make PKG_VERSION:=4.2.1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL:=@GNU/make PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_HASH:=d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 PKG_MAINTAINER:=Heinrich Schuchardt -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later PKG_INSTALL:=1 diff --git a/devel/patch/Makefile b/devel/patch/Makefile index 8f1472c76..5ea67c7a8 100644 --- a/devel/patch/Makefile +++ b/devel/patch/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=patch PKG_VERSION:=2.7.6 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/patch PKG_HASH:=ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:gnu:patch diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile index 70d2d7ca4..5bfebd28e 100644 --- a/devel/pkg-config/Makefile +++ b/devel/pkg-config/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pkg-config PKG_VERSION:=0.29.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://pkg-config.freedesktop.org/releases/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_HASH:=6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591 PKG_MAINTAINER:=Heinrich Schuchardt -PKG_LICENSE:=GPL-2+ +PKG_LICENSE:=GPL-2.0-or-later PKG_ASLR_PIE:=1 PKG_INSTALL:=1 diff --git a/lang/perl-authen-sasl-xs/Makefile b/lang/perl-authen-sasl-xs/Makefile index e7e0083fd..1201299bf 100644 --- a/lang/perl-authen-sasl-xs/Makefile +++ b/lang/perl-authen-sasl-xs/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-authen-sasl-xs PKG_VERSION:=1.00 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_NAME:=Authen-SASL-XS PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GB/GBARR/ PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz PKG_HASH:=1b0eaa0e7ac3a45857147d837e3d34c80c6eca1d9fdcb826a213c2a105454234 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Philip Prindeville PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_SOURCE_NAME)-$(PKG_VERSION) diff --git a/lang/perl-authen-sasl/Makefile b/lang/perl-authen-sasl/Makefile index 434ec088b..ed1fae123 100644 --- a/lang/perl-authen-sasl/Makefile +++ b/lang/perl-authen-sasl/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-authen-sasl PKG_VERSION:=2.16 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_NAME:=Authen-SASL PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GB/GBARR/ PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz PKG_HASH:=6614fa7518f094f853741b63c73f3627168c5d3aca89b1d02b1016dc32854e09 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Philip Prindeville PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_SOURCE_NAME)-$(PKG_VERSION) diff --git a/lang/perl-compress-bzip2/Makefile b/lang/perl-compress-bzip2/Makefile index 1d9342d03..5f3b52cf1 100644 --- a/lang/perl-compress-bzip2/Makefile +++ b/lang/perl-compress-bzip2/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-compress-bzip2 PKG_VERSION:=2.24 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/R/RU/RURBAN/ PKG_SOURCE:=Compress-Bzip2-$(PKG_VERSION).tar.gz PKG_HASH:=7956ac627fb373fae6effede3d21b3157122800224491b124afdd7bb426c8c3f -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Compress-Bzip2-$(PKG_VERSION) diff --git a/lang/perl-dbi/Makefile b/lang/perl-dbi/Makefile index eef2b3454..07af61035 100644 --- a/lang/perl-dbi/Makefile +++ b/lang/perl-dbi/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-dbi PKG_VERSION:=1.634 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/T/TI/TIMB/ PKG_SOURCE:=DBI-$(PKG_VERSION).tar.gz PKG_HASH:=250712f385864818abfba409420d16d9ee61f1cc73ac85159d054a5ee86d1450 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/DBI-$(PKG_VERSION) diff --git a/lang/perl-device-serialport/Makefile b/lang/perl-device-serialport/Makefile index 97b46e850..505d356cd 100644 --- a/lang/perl-device-serialport/Makefile +++ b/lang/perl-device-serialport/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-device-serialport PKG_VERSION:=1.04 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/C/CO/COOK/ PKG_SOURCE:=Device-SerialPort-$(PKG_VERSION).tar.gz PKG_HASH:=d392567cb39b4ea606c0e0acafd8ed72320311b995336ece5fcefcf9b150e9d7 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Paul Oranje PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Device-SerialPort-$(PKG_VERSION) diff --git a/lang/perl-encode-locale/Makefile b/lang/perl-encode-locale/Makefile index 48eafa81f..2f173f914 100644 --- a/lang/perl-encode-locale/Makefile +++ b/lang/perl-encode-locale/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-encode-locale PKG_VERSION:=1.05 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS PKG_SOURCE:=Encode-Locale-$(PKG_VERSION).tar.gz PKG_HASH:=176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Encode-Locale-$(PKG_VERSION) diff --git a/lang/perl-file-listing/Makefile b/lang/perl-file-listing/Makefile index 2725cedb6..63a6a7f3a 100644 --- a/lang/perl-file-listing/Makefile +++ b/lang/perl-file-listing/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-file-listing PKG_VERSION:=6.04 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS PKG_SOURCE:=File-Listing-$(PKG_VERSION).tar.gz PKG_HASH:=1e0050fcd6789a2179ec0db282bf1e90fb92be35d1171588bd9c47d52d959cf5 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/File-Listing-$(PKG_VERSION) diff --git a/lang/perl-file-sharedir-install/Makefile b/lang/perl-file-sharedir-install/Makefile index f37d41afb..d04be3de6 100644 --- a/lang/perl-file-sharedir-install/Makefile +++ b/lang/perl-file-sharedir-install/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-file-sharedir-install PKG_VERSION:=0.10 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GW/GWYN PKG_SOURCE:=File-ShareDir-Install-$(PKG_VERSION).tar.gz PKG_HASH:=708af71dec4dfb5a8cf9a5e863b566714c3f65f0a76722302de5a07ee202e6f7 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/File-ShareDir-Install-$(PKG_VERSION) diff --git a/lang/perl-html-form/Makefile b/lang/perl-html-form/Makefile index 022c3b7c1..286d14d2a 100644 --- a/lang/perl-html-form/Makefile +++ b/lang/perl-html-form/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-html-form PKG_VERSION:=6.03 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS PKG_SOURCE:=HTML-Form-$(PKG_VERSION).tar.gz PKG_HASH:=68c01d94f005d5ca9c4d55ad2a1bf3a8d034a5fc6db187d91a4c42f3fdc9fc36 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Form-$(PKG_VERSION) diff --git a/lang/perl-html-parser/Makefile b/lang/perl-html-parser/Makefile index c769ccc9b..82e1a4883 100644 --- a/lang/perl-html-parser/Makefile +++ b/lang/perl-html-parser/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-html-parser PKG_VERSION:=3.72 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS/ PKG_SOURCE:=HTML-Parser-$(PKG_VERSION).tar.gz PKG_HASH:=ec28c7e1d9e67c45eca197077f7cdc41ead1bb4c538c7f02a3296a4bb92f608b -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Parser-$(PKG_VERSION) diff --git a/lang/perl-html-tagset/Makefile b/lang/perl-html-tagset/Makefile index 01410585a..a2b6dcf51 100644 --- a/lang/perl-html-tagset/Makefile +++ b/lang/perl-html-tagset/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-html-tagset PKG_VERSION:=3.20 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/P/PE/PETDANCE/ PKG_SOURCE:=HTML-Tagset-$(PKG_VERSION).tar.gz PKG_HASH:=adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Tagset-$(PKG_VERSION) diff --git a/lang/perl-html-tree/Makefile b/lang/perl-html-tree/Makefile index 20839e62c..eff72d920 100644 --- a/lang/perl-html-tree/Makefile +++ b/lang/perl-html-tree/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-html-tree PKG_VERSION:=3.23 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/P/PE/PETEK/ PKG_SOURCE:=HTML-Tree-$(PKG_VERSION).tar.gz PKG_HASH:=f5175acf262f3710dce899796ea3e353049939400b100706d03df2f08803c8de -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Tree-$(PKG_VERSION) diff --git a/lang/perl-http-cookies/Makefile b/lang/perl-http-cookies/Makefile index 712cfbd21..31dfa3d5e 100644 --- a/lang/perl-http-cookies/Makefile +++ b/lang/perl-http-cookies/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-http-cookies PKG_VERSION:=6.01 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS PKG_SOURCE:=HTTP-Cookies-$(PKG_VERSION).tar.gz PKG_HASH:=f5d3ade383ce6389d80cb0d0356b643af80435bb036afd8edce335215ec5eb20 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTTP-Cookies-$(PKG_VERSION) diff --git a/lang/perl-http-daemon/Makefile b/lang/perl-http-daemon/Makefile index ed9d29254..e64e41e2a 100644 --- a/lang/perl-http-daemon/Makefile +++ b/lang/perl-http-daemon/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-http-daemon PKG_VERSION:=6.01 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS PKG_SOURCE:=HTTP-Daemon-$(PKG_VERSION).tar.gz PKG_HASH:=43fd867742701a3f9fcc7bd59838ab72c6490c0ebaf66901068ec6997514adc2 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTTP-Daemon-$(PKG_VERSION) diff --git a/lang/perl-http-date/Makefile b/lang/perl-http-date/Makefile index 4801ac1f2..e0acdef86 100644 --- a/lang/perl-http-date/Makefile +++ b/lang/perl-http-date/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-http-date PKG_VERSION:=6.02 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS PKG_SOURCE:=HTTP-Date-$(PKG_VERSION).tar.gz PKG_HASH:=e8b9941da0f9f0c9c01068401a5e81341f0e3707d1c754f8e11f42a7e629e333 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTTP-Date-$(PKG_VERSION) diff --git a/lang/perl-http-message/Makefile b/lang/perl-http-message/Makefile index c6a2469d3..7293a1a20 100644 --- a/lang/perl-http-message/Makefile +++ b/lang/perl-http-message/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-http-message PKG_VERSION:=6.11 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER PKG_SOURCE:=HTTP-Message-$(PKG_VERSION).tar.gz PKG_HASH:=e7b368077ae6a188d99920411d8f52a8e5acfb39574d4f5c24f46fd22533d81b -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTTP-Message-$(PKG_VERSION) diff --git a/lang/perl-http-negotiate/Makefile b/lang/perl-http-negotiate/Makefile index 6503e3946..dbb5e185b 100644 --- a/lang/perl-http-negotiate/Makefile +++ b/lang/perl-http-negotiate/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-http-negotiate PKG_VERSION:=6.01 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS PKG_SOURCE:=HTTP-Negotiate-$(PKG_VERSION).tar.gz PKG_HASH:=1c729c1ea63100e878405cda7d66f9adfd3ed4f1d6cacaca0ee9152df728e016 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTTP-Negotiate-$(PKG_VERSION) diff --git a/lang/perl-http-server-simple/Makefile b/lang/perl-http-server-simple/Makefile index aab1dfd6a..e4997609a 100644 --- a/lang/perl-http-server-simple/Makefile +++ b/lang/perl-http-server-simple/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-http-server-simple PKG_VERSION:=0.51 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/B/BP/BPS PKG_SOURCE:=HTTP-Server-Simple-$(PKG_VERSION).tar.gz PKG_HASH:=b9dc5c9f12c16ca39a96f0ede1e27a18a5594274ff8f583000788a7fca136dfb -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTTP-Server-Simple-$(PKG_VERSION) diff --git a/lang/perl-io-html/Makefile b/lang/perl-io-html/Makefile index 1e280d84c..34e9a3a16 100644 --- a/lang/perl-io-html/Makefile +++ b/lang/perl-io-html/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-io-html PKG_VERSION:=1.001 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/C/CJ/CJM PKG_SOURCE:=IO-HTML-$(PKG_VERSION).tar.gz PKG_HASH:=ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/IO-HTML-$(PKG_VERSION) diff --git a/lang/perl-lockfile-simple/Makefile b/lang/perl-lockfile-simple/Makefile index 1bd5aca19..ca55b2cfd 100644 --- a/lang/perl-lockfile-simple/Makefile +++ b/lang/perl-lockfile-simple/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-lockfile-simple PKG_VERSION:=0.208 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/S/SC/SCHWIGON/lockfile-simple/ PKG_SOURCE:=LockFile-Simple-$(PKG_VERSION).tar.gz PKG_HASH:=45c77896b2a5a0a45f6202a6f813f437ff8b283f84a1c60d0c4f3730802af3a2 -PKG_LICENSE:=GPL-2.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-2.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/LockFile-Simple-$(PKG_VERSION) diff --git a/lang/perl-lwp-mediatypes/Makefile b/lang/perl-lwp-mediatypes/Makefile index 375b3a4e8..634864c87 100644 --- a/lang/perl-lwp-mediatypes/Makefile +++ b/lang/perl-lwp-mediatypes/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-lwp-mediatypes PKG_VERSION:=6.02 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS PKG_SOURCE:=LWP-MediaTypes-$(PKG_VERSION).tar.gz PKG_HASH:=18790b0cc5f0a51468495c3847b16738f785a2d460403595001e0b932e5db676 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/LWP-MediaTypes-$(PKG_VERSION) diff --git a/lang/perl-net-http/Makefile b/lang/perl-net-http/Makefile index 8bd32e7d0..359838dfa 100644 --- a/lang/perl-net-http/Makefile +++ b/lang/perl-net-http/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-net-http PKG_VERSION:=6.09 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER PKG_SOURCE:=Net-HTTP-$(PKG_VERSION).tar.gz PKG_HASH:=52762b939d84806908ba544581c5708375f7938c3c0e496c128ca3fbc425e58d -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Net-HTTP-$(PKG_VERSION) diff --git a/lang/perl-net-telnet/Makefile b/lang/perl-net-telnet/Makefile index d3b4cfa37..f94297a56 100644 --- a/lang/perl-net-telnet/Makefile +++ b/lang/perl-net-telnet/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-net-telnet PKG_VERSION:=3.04 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/J/JR/JROGERS/ PKG_SOURCE:=Net-Telnet-$(PKG_VERSION).tar.gz PKG_HASH:=e64d567a4e16295ecba949368e7a6b8b5ae2a16b3ad682121d9b007dc5d2a37a -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Net-Telnet-$(PKG_VERSION) diff --git a/lang/perl-parse-recdescent/Makefile b/lang/perl-parse-recdescent/Makefile index a9eb3dc9a..d041a6afd 100644 --- a/lang/perl-parse-recdescent/Makefile +++ b/lang/perl-parse-recdescent/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-parse-recdescent PKG_VERSION:=1.967015 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://www.cpan.org/authors/id/J/JT/JTBRAUN PKG_SOURCE:=Parse-RecDescent-$(PKG_VERSION).tar.gz PKG_HASH:=1943336a4cb54f1788a733f0827c0c55db4310d5eae15e542639c9dd85656e37 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/Parse-RecDescent-$(PKG_VERSION) diff --git a/lang/perl-sub-uplevel/Makefile b/lang/perl-sub-uplevel/Makefile index f078f77ed..3eed290ca 100644 --- a/lang/perl-sub-uplevel/Makefile +++ b/lang/perl-sub-uplevel/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-sub-uplevel PKG_VERSION:=0.25 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/D/DA/DAGOLDEN PKG_SOURCE:=Sub-Uplevel-$(PKG_VERSION).tar.gz PKG_HASH:=2dcca582a7ea5bada576eb27c4be1d1b064fb22175bdbd6d696c45d083560505 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Sub-Uplevel-$(PKG_VERSION) diff --git a/lang/perl-test-harness/Makefile b/lang/perl-test-harness/Makefile index 36a00545e..449d50175 100644 --- a/lang/perl-test-harness/Makefile +++ b/lang/perl-test-harness/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-test-harness PKG_VERSION:=3.36 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/L/LE/LEONT/ PKG_SOURCE:=Test-Harness-$(PKG_VERSION).tar.gz PKG_HASH:=e7566f13b041d028b56f184b77ec2545ec6f0bb5a0f8f5368f7e4a08b496b63e -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Test-Harness-$(PKG_VERSION) diff --git a/lang/perl-test-warn/Makefile b/lang/perl-test-warn/Makefile index 94409e1f8..79da1aad5 100644 --- a/lang/perl-test-warn/Makefile +++ b/lang/perl-test-warn/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-test-warn PKG_VERSION:=0.30 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/C/CH/CHORNY PKG_SOURCE:=Test-Warn-$(PKG_VERSION).tar.gz PKG_HASH:=8197555b94189d919349a03f7058f83861f145af9bee59f505bfe47562144e41 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Test-Warn-$(PKG_VERSION) diff --git a/lang/perl-text-csv_xs/Makefile b/lang/perl-text-csv_xs/Makefile index 9b7d046d0..fa3ad61cb 100644 --- a/lang/perl-text-csv_xs/Makefile +++ b/lang/perl-text-csv_xs/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-text-csv_xs PKG_VERSION:=1.39 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://www.cpan.org/authors/id/H/HM/HMBRAND/ PKG_SOURCE:=Text-CSV_XS-$(PKG_VERSION).tgz PKG_HASH:=aa4e424eaf68bea0d0e8c16b961c942b64926e6183ce1dbbc6c799eafb0a9ebd -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Philip Prindeville PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Text-CSV_XS-$(PKG_VERSION) diff --git a/lang/perl-uri/Makefile b/lang/perl-uri/Makefile index 3f043e4ff..299b09554 100644 --- a/lang/perl-uri/Makefile +++ b/lang/perl-uri/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-uri PKG_VERSION:=1.72 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER/ PKG_SOURCE:=URI-$(PKG_VERSION).tar.gz PKG_HASH:=35f14431d4b300de4be1163b0b5332de2d7fbda4f05ff1ed198a8e9330d40a32 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/URI-$(PKG_VERSION) diff --git a/lang/perl-www-curl/Makefile b/lang/perl-www-curl/Makefile index 9a7ad5fa5..10c2e7d2e 100644 --- a/lang/perl-www-curl/Makefile +++ b/lang/perl-www-curl/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-www-curl PKG_VERSION:=4.17 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/S/SZ/SZBALINT/ PKG_SOURCE:=WWW-Curl-$(PKG_VERSION).tar.gz PKG_HASH:=52ffab110e32348d775f241c973eb56f96b08eedbc110d77d257cdb0a24ab7ba -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Marcel Denia diff --git a/lang/perl-www-mechanize/Makefile b/lang/perl-www-mechanize/Makefile index a193a6b90..a52f3be49 100644 --- a/lang/perl-www-mechanize/Makefile +++ b/lang/perl-www-mechanize/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-www-mechanize PKG_VERSION:=1.75 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=WWW-Mechanize-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER/ PKG_HASH:=5310051feb66c6ef9f7a4c070c66ec6092932129fc9cd18bba009ce999b7930b -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/WWW-Mechanize-$(PKG_VERSION) diff --git a/lang/perl-www-robotrules/Makefile b/lang/perl-www-robotrules/Makefile index ccbb7fa67..bccf44ca6 100644 --- a/lang/perl-www-robotrules/Makefile +++ b/lang/perl-www-robotrules/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-www-robotrules PKG_VERSION:=6.02 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS PKG_SOURCE:=WWW-RobotRules-$(PKG_VERSION).tar.gz PKG_HASH:=46b502e7a288d559429891eeb5d979461dd3ecc6a5c491ead85d165b6e03a51e -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/WWW-RobotRules-$(PKG_VERSION) diff --git a/lang/perl-www/Makefile b/lang/perl-www/Makefile index 563e51c89..5ff021972 100644 --- a/lang/perl-www/Makefile +++ b/lang/perl-www/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-www PKG_VERSION:=6.15 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER/ PKG_SOURCE:=libwww-perl-$(PKG_VERSION).tar.gz PKG_HASH:=6f349d45c21b1ec0501c4437dfcb70570940e6c3d5bff783bd91d4cddead8322 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/libwww-perl-$(PKG_VERSION) diff --git a/lang/perl-xml-parser/Makefile b/lang/perl-xml-parser/Makefile index 3a6ebcae8..1c65358c2 100644 --- a/lang/perl-xml-parser/Makefile +++ b/lang/perl-xml-parser/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-xml-parser PKG_VERSION:=2.44 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/T/TO/TODDR/ PKG_SOURCE:=XML-Parser-$(PKG_VERSION).tar.gz PKG_HASH:=1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216 -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/XML-Parser-$(PKG_VERSION) diff --git a/lang/perl/Makefile b/lang/perl/Makefile index 4c0d625ab..af881d198 100644 --- a/lang/perl/Makefile +++ b/lang/perl/Makefile @@ -11,7 +11,7 @@ include perlver.mk PKG_NAME:=perl PKG_VERSION:=$(PERL_VERSION) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=\ https://cpan.metacpan.org/src/5.0 \ @@ -23,7 +23,7 @@ PKG_SOURCE_URL:=\ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_HASH:=fea7162d4cca940a387f0587b93f6737d884bf74d8a9d7cfd978bc12cd0b202d -PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl PKG_LICENSE_FILES:=Copying Artistic README PKG_MAINTAINER:=Marcel Denia , \ Philip Prindeville diff --git a/lang/python/python-gmpy2/Makefile b/lang/python/python-gmpy2/Makefile index df6a30fca..4d730f87a 100644 --- a/lang/python/python-gmpy2/Makefile +++ b/lang/python/python-gmpy2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-gmpy2 PKG_VERSION:=2.0.8 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=gmpy2-$(PKG_VERSION).zip PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/g/gmpy2 @@ -17,7 +17,7 @@ PKG_HASH:=dd233e3288b90f21b0bb384bcc7a7e73557bb112ccf0032ad52aa614eb373d3f PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-gmpy2-$(PKG_VERSION) -PKG_LICENSE:=LGPL-3.0+ +PKG_LICENSE:=LGPL-3.0-or-later PKG_LICENSE_FILES:=COPYING.LESSER PKG_MAINTAINER:=Jeffery To diff --git a/lang/python/python-gnupg/Makefile b/lang/python/python-gnupg/Makefile index 4aa835a23..d180d6c99 100644 --- a/lang/python/python-gnupg/Makefile +++ b/lang/python/python-gnupg/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-gnupg PKG_VERSION:=0.4.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/p/python-gnupg PKG_HASH:=45daf020b370bda13a1429c859fcdff0b766c0576844211446f9266cae97fb0e -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Daniel Golle diff --git a/lang/python/python-psycopg2/Makefile b/lang/python/python-psycopg2/Makefile index 5a16e08ab..1aa024690 100644 --- a/lang/python/python-psycopg2/Makefile +++ b/lang/python/python-psycopg2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-psycopg2 PKG_VERSION:=2.7.6.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=psycopg2-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/p/psycopg2 @@ -17,7 +17,7 @@ PKG_HASH:=27959abe64ca1fc6d8cd11a71a1f421d8287831a3262bd4cacd43bbf43cc3c82 PKG_BUILD_DIR:=$(BUILD_DIR)/psycopg2-$(PKG_VERSION) PKG_MAINTAINER:=Dmitry Trefilov -PKG_LICENSE:=LGPL-3.0+ +PKG_LICENSE:=LGPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE PKG_BUILD_DEPENDS:=python/host diff --git a/libs/check/Makefile b/libs/check/Makefile index 2e0429686..cead30e08 100644 --- a/libs/check/Makefile +++ b/libs/check/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=check PKG_VERSION:=0.12.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/libcheck/check/releases/download/$(PKG_VERSION) PKG_HASH:=464201098bee00e90f5c4bdfa94a5d3ead8d641f9025b560a27755a83b824234 -PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING.LESSER PKG_MAINTAINER:=Eduardo Abinader diff --git a/libs/fftw3/Makefile b/libs/fftw3/Makefile index 6e23625fd..ee57a522b 100644 --- a/libs/fftw3/Makefile +++ b/libs/fftw3/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fftw3 PKG_VERSION:=3.3.8 -PKG_RELEASE:=1 -PKG_LICENSE:=GPL-2.0+ +PKG_RELEASE:=2 +PKG_LICENSE:=GPL-2.0-or-later PKG_SOURCE:=fftw-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.fftw.org diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index 61312207e..bc1ddd350 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnutls PKG_VERSION:=3.6.9 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6 PKG_HASH:=4331fca55817ecdd74450b908a6c29b4f05bb24dd13144c6284aa34d872e1fcb #PKG_FIXUP:=autoreconf gettext-version PKG_MAINTAINER:=Nikos Mavrogiannopoulos -PKG_LICENSE:=LGPLv2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_CPE_ID:=cpe:/a:gnu:gnutls PKG_INSTALL:=1 diff --git a/libs/libavl/Makefile b/libs/libavl/Makefile index 3d7325f20..da093da04 100644 --- a/libs/libavl/Makefile +++ b/libs/libavl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libavl PKG_VERSION:=0.3.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_HASH:=4497b9e22cdd61ae2fa893b9d5fd6213dc306726d7c4be08c29e173622dca8a0 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz @@ -18,7 +18,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/avl-$(PKG_VERSION) PKG_INSTALL:=1 PKG_MAINTAINER:=Espen Jürgensen -PKG_LICENSE:=LGPL-2.0+ +PKG_LICENSE:=LGPL-2.0-or-later PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk diff --git a/libs/libcanfestival/Makefile b/libs/libcanfestival/Makefile index 29594699b..062c8082b 100644 --- a/libs/libcanfestival/Makefile +++ b/libs/libcanfestival/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libcanfestival -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE_VERSION:=8bfe0ac00cdb PKG_SOURCE_URL:=http://dev.automforge.net/CanFestival-3/archive/$(PKG_SOURCE_VERSION).tar.bz2?_dummyfilename= @@ -18,7 +18,7 @@ PKG_SOURCE_SUBDIR:=CanFestival-3-$(PKG_SOURCE_VERSION) PKG_MAINTAINER:=Anton Glukhov -PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=LICENCE PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) diff --git a/libs/libcoap/Makefile b/libs/libcoap/Makefile index 43f7cbb3b..f8a820874 100644 --- a/libs/libcoap/Makefile +++ b/libs/libcoap/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libcoap PKG_VERSION:=4.2.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/obgm/libcoap/tar.gz/v$(PKG_VERSION)? PKG_HASH:=9523e38da6ee8b2a8f5ce83ded64107dd1e514c7ad00cd74ccfe3454b679c271 PKG_MAINTAINER:=Anton Glukhov -PKG_LICENSE:=GPL-2.0+ BSD-2-Clause +PKG_LICENSE:=GPL-2.0-or-later BSD-2-Clause PKG_LICENSE_FILES:=COPYING LICENSE.GPL LICENSE.BSD PKG_FIXUP:=autoreconf diff --git a/libs/libesmtp/Makefile b/libs/libesmtp/Makefile index 148721ff7..843e55a93 100644 --- a/libs/libesmtp/Makefile +++ b/libs/libesmtp/Makefile @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libesmtp PKG_VERSION:=1.0.6 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_MAINTAINER:=Othmar Truniger -PKG_LICENSE:=LGPL-2.0+ +PKG_LICENSE:=LGPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/libs/libestr/Makefile b/libs/libestr/Makefile index d2fc56735..07a1ce73a 100644 --- a/libs/libestr/Makefile +++ b/libs/libestr/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libestr PKG_VERSION:=0.1.11 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://libestr.adiscon.com/files/download/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_HASH:=46632b2785ff4a231dcf241eeb0dcb5fc0c7d4da8ee49cf5687722cdbe8b2024 PKG_MAINTAINER:=Rosen Penev -PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf diff --git a/libs/libgcrypt/Makefile b/libs/libgcrypt/Makefile index 42c1e9dee..6babd34f5 100644 --- a/libs/libgcrypt/Makefile +++ b/libs/libgcrypt/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgcrypt PKG_VERSION:=1.8.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/ PKG_HASH:=f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227 PKG_MAINTAINER:=W. Michael Petullo -PKG_LICENSE:=LGPL-2.1+ GPL-2.0+ +PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:gnupg:libgcrypt diff --git a/libs/libidn/Makefile b/libs/libidn/Makefile index 5d1e810d6..ea32aab9a 100644 --- a/libs/libidn/Makefile +++ b/libs/libidn/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libidn PKG_VERSION:=1.35 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/libidn PKG_HASH:=f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e -PKG_LICENSE:=GPL-2.0+ GPL-3.0+ LGPL-2.1+ LGPL-3.0+ Apache-2.0 +PKG_LICENSE:=GPL-2.0-or-later GPL-3.0-or-later LGPL-2.1-or-later LGPL-3.0-or-later Apache-2.0 PKG_LICENSE_FILES:=COPYING COPYINGv2 COPYINGv3 COPYING.LESSERv2 COPYING.LESSERv3 java/LICENSE-2.0.txt PKG_INSTALL:=1 diff --git a/libs/libimobiledevice/Makefile b/libs/libimobiledevice/Makefile index ae33b568e..6eba622d5 100644 --- a/libs/libimobiledevice/Makefile +++ b/libs/libimobiledevice/Makefile @@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libimobiledevice PKG_SOURCE_DATE:=2019-02-16 PKG_SOURCE_VERSION:=0584aa90c93ff6ce46927b8d67887cb987ab9545 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:= -PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING.LESSER PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz diff --git a/libs/liblo/Makefile b/libs/liblo/Makefile index 1fd093eca..27b4f658a 100644 --- a/libs/liblo/Makefile +++ b/libs/liblo/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liblo PKG_VERSION:=0.30 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/liblo PKG_HASH:=30a7c9de49a25ed7f2425a7a7415f5b14739def62431423d3419ea26fb978d1b PKG_MAINTAINER:= -PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING PKG_INSTALL:=1 diff --git a/libs/libmodbus/Makefile b/libs/libmodbus/Makefile index bfa1d73e1..c1dddb5ff 100644 --- a/libs/libmodbus/Makefile +++ b/libs/libmodbus/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmodbus PKG_VERSION:=3.1.4 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://libmodbus.org/releases @@ -17,7 +17,7 @@ PKG_HASH:=c8c862b0e9a7ba699a49bc98f62bdffdfafd53a5716c0e162696b4bf108d3637 PKG_MAINTAINER:=Michael Heimpold -PKG_LICENSE:=GPL-3.0+ LGPL-2.1+ +PKG_LICENSE:=GPL-3.0-or-later LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING COPYING.LESSER PKG_FIXUP:=autoreconf diff --git a/libs/libnetfilter-acct/Makefile b/libs/libnetfilter-acct/Makefile index ad29c1c99..272295eec 100644 --- a/libs/libnetfilter-acct/Makefile +++ b/libs/libnetfilter-acct/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnetfilter_acct PKG_VERSION:=1.0.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://netfilter.org/projects/libnetfilter_acct/files PKG_HASH:=4250ceef3efe2034f4ac05906c3ee427db31b9b0a2df41b2744f4bf79a959a1a -PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Nicolas Thill diff --git a/libs/liboping/Makefile b/libs/liboping/Makefile index a04cbafc9..8ef66bc7d 100644 --- a/libs/liboping/Makefile +++ b/libs/liboping/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liboping PKG_VERSION:=1.10.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Jo-Philipp Wich -PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://noping.cc/files diff --git a/libs/libp11/Makefile b/libs/libp11/Makefile index 9c6eda998..f575b2fa4 100644 --- a/libs/libp11/Makefile +++ b/libs/libp11/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libp11 PKG_VERSION:=0.4.10 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://github.com/OpenSC/libp11/releases/download/$(PKG_NAME)-$(PKG_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_HASH:=639ea43c3341e267214b712e1e5e12397fd2d350899e673dd1220f3c6b8e3db4 PKG_MAINTAINER:=Daniel Golle -PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING PKG_BUILD_PARALLEL:=1 diff --git a/libs/libplist/Makefile b/libs/libplist/Makefile index c69c73317..846b6ae44 100644 --- a/libs/libplist/Makefile +++ b/libs/libplist/Makefile @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libplist PKG_VERSION:=2.0.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_MAINTAINER:=Lukasz Baj -PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING.LESSER PKG_SOURCE_PROTO:=git diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile index da15375da..685a43b5d 100644 --- a/libs/libpng/Makefile +++ b/libs/libpng/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpng PKG_VERSION:=1.6.37 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/libpng PKG_HASH:=505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca PKG_MAINTAINER:=Jo-Philipp Wich -PKG_LICENSE:=Libpng GPL-2.0+ BSD-3-Clause +PKG_LICENSE:=Libpng GPL-2.0-or-later BSD-3-Clause PKC_LICENSE_FILES:=LICENSE contrib/gregbook/COPYING contrib/gregbook/LICENSE PKG_CPE_ID:=cpe:/a:libpng:libpng diff --git a/libs/libssh/Makefile b/libs/libssh/Makefile index 7f85982fb..b7143c02a 100644 --- a/libs/libssh/Makefile +++ b/libs/libssh/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk -PKG_LICENSE:=LGPL-2.1+ BSD-2-Clause +PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause PKG_MAINTAINER:=Mislav Novakovic PKG_NAME:=libssh PKG_VERSION:=0.7.6 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.libssh.org/files/0.7/ diff --git a/libs/libtalloc/Makefile b/libs/libtalloc/Makefile index 5c0e4917c..f09ece1c2 100644 --- a/libs/libtalloc/Makefile +++ b/libs/libtalloc/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=talloc PKG_VERSION:=2.1.14 MAJOR_VERSION:=2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.samba.org/ftp/talloc PKG_HASH:=b185602756a628bac507fa8af8b9df92ace69d27c0add5dab93190ad7c3367ce PKG_MAINTAINER:=Ted Hess -PKG_LICENSE:=LGPL-3.0+ +PKG_LICENSE:=LGPL-3.0-or-later PKG_BUILD_PARALLEL:=0 diff --git a/libs/libtasn1/Makefile b/libs/libtasn1/Makefile index 039580ae4..992f16bae 100644 --- a/libs/libtasn1/Makefile +++ b/libs/libtasn1/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtasn1 PKG_VERSION:=4.14 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) PKG_HASH:=9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08 PKG_MAINTAINER:=Nikos Mavrogiannopoulos -PKG_LICENSE:=LGPLv2.1-or-later +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING.LIB #PKG_FIXUP:=autoreconf diff --git a/libs/libugpio/Makefile b/libs/libugpio/Makefile index e7a1e874f..e88f4ff70 100644 --- a/libs/libugpio/Makefile +++ b/libs/libugpio/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libugpio PKG_VERSION:=0.0.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://github.com/mhei/libugpio/releases/download/v$(PKG_VERSION) PKG_HASH:=07d96b46560f42843e46869f45f53d48afee71f9bbcf06f43267fafad0d50b05 -PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING.LESSER PKG_MAINTAINER:=Michael Heimpold diff --git a/libs/libusbmuxd/Makefile b/libs/libusbmuxd/Makefile index 01b4c704e..851833aa9 100644 --- a/libs/libusbmuxd/Makefile +++ b/libs/libusbmuxd/Makefile @@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libusbmuxd PKG_SOURCE_DATE:=2019-03-23 PKG_SOURCE_VERSION:=873252dc8b4e469c7dc692064ac616104fca5f65 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Lukasz Baj -PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING.LGPLv2.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz diff --git a/libs/libyang/Makefile b/libs/libyang/Makefile index 6e3547b7d..6d5cba997 100644 --- a/libs/libyang/Makefile +++ b/libs/libyang/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libyang PKG_VERSION:=0.16-r3 -PKG_RELEASE:=3 +PKG_RELEASE:=4 -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_MAINTAINER:=Mislav Novakovic PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/libs/psqlodbc/Makefile b/libs/psqlodbc/Makefile index 1b6e24f75..4bb3b8588 100644 --- a/libs/psqlodbc/Makefile +++ b/libs/psqlodbc/Makefile @@ -6,14 +6,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=psqlodbc PKG_VERSION:=11.00.0000 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://ftp.postgresql.org/pub/odbc/versions/src PKG_HASH:=703e6b87022f95ffa00d9f86c8f0a877f8a55b9b3be0942081f382e794112a86 PKG_MAINTAINER:= -PKG_LICENSE:=LGPL-2.0+ +PKG_LICENSE:=LGPL-2.0-or-later PKG_LICENSE_FILES:=license.txt PKG_BUILD_DEPENDS:=unixodbc/host diff --git a/libs/qrencode/Makefile b/libs/qrencode/Makefile index 01bd1cf15..be69f7b2a 100644 --- a/libs/qrencode/Makefile +++ b/libs/qrencode/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qrencode PKG_VERSION:=4.0.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://fukuchi.org/works/qrencode PKG_HASH:=c9cb278d3b28dcc36b8d09e8cad51c0eca754eb004cb0247d4703cb4472b58b4 PKG_MAINTAINER:=Jonathan Bennett -PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 diff --git a/libs/sbc/Makefile b/libs/sbc/Makefile index 5cb9bf5c7..95f2b8c10 100644 --- a/libs/sbc/Makefile +++ b/libs/sbc/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sbc PKG_VERSION:=1.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/bluetooth/ PKG_HASH:=518bf46e6bb3dc808a95e1eabad26fdebe8a099c1e781c27ed7fca6c2f4a54c9 -PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING.LIB PKG_MAINTAINER:= diff --git a/libs/slang2/Makefile b/libs/slang2/Makefile index 9b9fb08fd..fcb0793ed 100644 --- a/libs/slang2/Makefile +++ b/libs/slang2/Makefile @@ -11,14 +11,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=slang PKG_VERSION:=2.3.2 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.jedsoft.org/releases/slang \ https://www.jedsoft.org/releases/slang/old PKG_HASH:=fc9e3b0fc4f67c3c1f6d43c90c16a5c42d117b8e28457c5b46831b8b5d3ae31a -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Jeffery To diff --git a/libs/vips/Makefile b/libs/vips/Makefile index fd4507d74..ee07d6e85 100644 --- a/libs/vips/Makefile +++ b/libs/vips/Makefile @@ -7,14 +7,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vips PKG_VERSION:=8.7.4 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/libvips/libvips/releases/download/v$(PKG_VERSION) PKG_HASH:=ce7518a8f31b1d29a09b3d7c88e9852a5a2dcb3ee1501524ab477e433383f205 PKG_MAINTAINER:=W. Michael Petullo -PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index 3f3796bb4..d1c41ac25 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mailman PKG_VERSION:=2.1.29 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) PKG_HASH:=838872713601e8a124146e550f53709482c1ef168f1e16d201465c651cbf0d2c PKG_MAINTAINER:=Denis Shulyaka -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=gnu-COPYING-GPL PKG_CPE_ID:=cpe:2.3:a:gnu:mailman diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile index f6322cf61..3010132e5 100644 --- a/mail/ssmtp/Makefile +++ b/mail/ssmtp/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ssmtp PKG_VERSION:=2.64 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_MAINTAINER:=Dirk Brenken -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.bz2 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/s/ssmtp diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 2f8ae44d6..5d60a50ed 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ffmpeg PKG_VERSION:=3.4.6 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://ffmpeg.org/releases/ @@ -18,7 +18,7 @@ PKG_HASH:=3572279cb139d9e39dcfbc23edf438ff5311ec3fc5d0dcb3558e49591e5cb83e PKG_MAINTAINER:=Ted Hess , \ Ian Leonard -PKG_LICENSE:=LGPL-2.1+ GPL-2+ LGPL-3 +PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later LGPL-3 PKG_LICENSE_FILES:=COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 COPYING.LGPLv3 PKG_CPE_ID:=cpe:/a:ffmpeg:ffmpeg diff --git a/net/adblock/Makefile b/net/adblock/Makefile index 152e0dc8b..6b9d5a909 100644 --- a/net/adblock/Makefile +++ b/net/adblock/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock PKG_VERSION:=3.8.5 -PKG_RELEASE:=1 -PKG_LICENSE:=GPL-3.0+ +PKG_RELEASE:=2 +PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken include $(INCLUDE_DIR)/package.mk diff --git a/net/banip/Makefile b/net/banip/Makefile index 591f45b80..4bfe5d1a5 100644 --- a/net/banip/Makefile +++ b/net/banip/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=banip PKG_VERSION:=0.2.0 -PKG_RELEASE:=1 -PKG_LICENSE:=GPL-3.0+ +PKG_RELEASE:=2 +PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken include $(INCLUDE_DIR)/package.mk diff --git a/net/bcp38/Makefile b/net/bcp38/Makefile index 1ca8ab9b6..c5ca84191 100644 --- a/net/bcp38/Makefile +++ b/net/bcp38/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bcp38 PKG_VERSION:=5 -PKG_RELEASE:=5 -PKG_LICENCE:=GPL-3.0+ +PKG_RELEASE:=6 +PKG_LICENCE:=GPL-3.0-or-later include $(INCLUDE_DIR)/package.mk diff --git a/net/bridge-utils/Makefile b/net/bridge-utils/Makefile index 08b1e7f65..e9e3472dc 100644 --- a/net/bridge-utils/Makefile +++ b/net/bridge-utils/Makefile @@ -10,14 +10,14 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=bridge-utils PKG_VERSION:=1.6 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/$(PKG_NAME) PKG_HASH:=cc67efb5d5fb8928a6569b3fade2b4042ec17da04678dab127d96b46489e26c8 PKG_MAINTAINER:=Nikolay Martynov -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf diff --git a/net/cgi-io/Makefile b/net/cgi-io/Makefile index 5fff39f85..4c4725787 100644 --- a/net/cgi-io/Makefile +++ b/net/cgi-io/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cgi-io -PKG_RELEASE:=7 +PKG_RELEASE:=8 -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_MAINTAINER:=John Crispin diff --git a/net/dynapoint/Makefile b/net/dynapoint/Makefile index feb68888f..cb91f5113 100644 --- a/net/dynapoint/Makefile +++ b/net/dynapoint/Makefile @@ -8,10 +8,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dynapoint -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Tobias Ilte -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later include $(INCLUDE_DIR)/package.mk diff --git a/net/fakeidentd/Makefile b/net/fakeidentd/Makefile index e52c15287..ec799d162 100644 --- a/net/fakeidentd/Makefile +++ b/net/fakeidentd/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fakeidentd PKG_VERSION:=2.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).c PKG_SOURCE_URL:=http://distfiles.gentoo.org/distfiles/ PKG_HASH:=75b321e5d9dddcea2b38035b62ac30f2175ed43f3f187be6da19aaa67c4fe165 PKG_MAINTAINER:=Daniel Gimpelevich -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later UNPACK_CMD=$(CP) $(DL_DIR)/$(PKG_SOURCE) $(1)/ include $(INCLUDE_DIR)/package.mk diff --git a/net/fwknop/Makefile b/net/fwknop/Makefile index f48893c28..71077734e 100644 --- a/net/fwknop/Makefile +++ b/net/fwknop/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fwknop PKG_VERSION:=2.6.10 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.cipherdyne.org/fwknop/download PKG_HASH:=f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77 PKG_MAINTAINER:=Jonathan Bennett -PKG_LICENSE:=GPLv2+ +PKG_LICENSE:=GPL-2.0-or-later PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/net/geth/Makefile b/net/geth/Makefile index fb8e1929e..caef70b9a 100644 --- a/net/geth/Makefile +++ b/net/geth/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=go-ethereum PKG_VERSION:=1.9.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ethereum/go-ethereum/tar.gz/v${PKG_VERSION}? PKG_HASH:=7394ae0eeac4b2aafa4bd56eef18c077088770bbce0962b215607b44369a5430 PKG_MAINTAINER:=Mislav Novakovic -PKG_LICENSE:=GPL-3-or-later LGPL-3-or-later +PKG_LICENSE:=GPL-3.0-or-later LGPL-3.0-or-later PKG_LICENSE_FILES:=COPYING COPYING.LESSER PKG_BUILD_DEPENDS:=golang/host diff --git a/net/horst/Makefile b/net/horst/Makefile index b0184a441..a9dfc17a9 100644 --- a/net/horst/Makefile +++ b/net/horst/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=horst PKG_VERSION:=5.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/br101/horst/archive/v$(PKG_VERSION)/ PKG_HASH:=74b4cb1143d93c73c3b4bbbe0c36f89a790401bde9e894e94e2a27339ca384d9 PKG_MAINTAINER:=Bruno Randolf -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=LICENSE PKG_BUILD_PARALLEL:=1 diff --git a/net/htpdate/Makefile b/net/htpdate/Makefile index adf331a09..fa238a5c3 100644 --- a/net/htpdate/Makefile +++ b/net/htpdate/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=htpdate PKG_VERSION:=1.1.1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.vervest.org/htp/archive/c/ PKG_HASH:=0d75f91cb61f8869c8298d198fa52b9a139ae505b366e9d4d331af8bc1c04880 -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:= include $(INCLUDE_DIR)/package.mk diff --git a/net/keepalived/Makefile b/net/keepalived/Makefile index 9310b3078..a35f5194b 100644 --- a/net/keepalived/Makefile +++ b/net/keepalived/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=keepalived PKG_VERSION:=2.0.18 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.keepalived.org/software PKG_HASH:=1423a2b1b8e541211029b9e1e1452e683bbe5f4b0b287eddd609aaf5ff024fd0 PKG_CPE_ID:=cpe:/a:keepalived:keepalived -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Ben Kelly \ Florian Eckert diff --git a/net/knxd/Makefile b/net/knxd/Makefile index 89b0d24af..46c956276 100644 --- a/net/knxd/Makefile +++ b/net/knxd/Makefile @@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=knxd PKG_VERSION:=0.14.29 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/knxd/knxd/tar.gz/$(PKG_VERSION)? @@ -20,7 +20,7 @@ PKG_HASH:=4513328dd5ecfc17955e6884e938d652dbd33b82797893ae9ad768a247a0f63e PKG_MAINTAINER:=Othmar Truniger -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=LICENSE PKG_BUILD_PARALLEL:=1 diff --git a/net/kplex/Makefile b/net/kplex/Makefile index e1ff76fd2..1c0aae993 100644 --- a/net/kplex/Makefile +++ b/net/kplex/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kplex PKG_VERSION:=1.4 -PKG_RELEASE=1 +PKG_RELEASE=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=http://www.stripydog.com/download PKG_HASH:=8c2f1ccba4a22cb3b683b73b9dab6ce317e7d858764f1c2c695970f94c726fc1 -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Nuno Goncalves diff --git a/net/lftp/Makefile b/net/lftp/Makefile index 1dfe10508..2479ea600 100644 --- a/net/lftp/Makefile +++ b/net/lftp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lftp PKG_VERSION:=4.8.4 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://lftp.tech/ftp/ \ https://mirror.csclub.uwaterloo.ca/gentoo-distfiles/distfiles/ @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=http://lftp.tech/ftp/ \ PKG_HASH:=4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62 -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/uclibc++.mk diff --git a/net/mac-telnet/Makefile b/net/mac-telnet/Makefile index 31fb2c716..f21cfc7b1 100644 --- a/net/mac-telnet/Makefile +++ b/net/mac-telnet/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mac-telnet PKG_VERSION:=2015-09-02 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE=$(PKG_SOURCE_VERSION)+1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/jow-/MAC-Telnet.git @@ -15,7 +15,7 @@ PKG_SOURCE_VERSION:=37d83cbc9c07266d6c957d27bf75285b305eceab PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=13429f1a870121cdbbfb687e0581967904798000eca1f8f9c1e9dc87dee5669b -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_MAINTAINER:=Jo-Philipp Wich include $(INCLUDE_DIR)/package.mk diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 6743e190b..cd22f92c8 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mtr PKG_VERSION:=0.92 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.bitwizard.nl/mtr/files PKG_HASH:=f2979db9e2f41aa8e6574e7771767c9afe111d9213814eb47f5e1e71876e4382 PKG_MAINTAINER:=Jonathan McCrohan -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_INSTALL:=1 diff --git a/net/nbd/Makefile b/net/nbd/Makefile index 2523be473..9f67eb62c 100644 --- a/net/nbd/Makefile +++ b/net/nbd/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nbd PKG_VERSION:=3.19 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/nbd PKG_HASH:=b4466412f13e057659f25d35e1e8e181afd62c7179bff22a6add81445ecb8690 -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_MAINTAINER:=Marcin Jurkowski PKG_INSTALL:=1 diff --git a/net/netifyd/Makefile b/net/netifyd/Makefile index 4600abb40..656067e42 100644 --- a/net/netifyd/Makefile +++ b/net/netifyd/Makefile @@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netifyd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Darryl Sokoloski -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later PKG_BUILD_PARALLEL:=1 PKG_FIXUP:=autoreconf diff --git a/net/ntripcaster/Makefile b/net/ntripcaster/Makefile index 12b07c5d0..872a5c69d 100644 --- a/net/ntripcaster/Makefile +++ b/net/ntripcaster/Makefile @@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ntripcaster PKG_VERSION:=0.1.5 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/nunojpg/ntripcaster/tar.gz/v$(PKG_VERSION)? PKG_HASH:=2184af9821cf73bac1df229f1e61ca1d3e288c9de6087bee1ae218b54c588452 -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_MAINTAINER:=Nuno Goncalves diff --git a/net/ntripclient/Makefile b/net/ntripclient/Makefile index 09199516e..0c33b1f0e 100644 --- a/net/ntripclient/Makefile +++ b/net/ntripclient/Makefile @@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ntripclient PKG_VERSION:=1.51 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/nunojpg/ntripclient/tar.gz/v$(PKG_VERSION)? PKG_HASH:=d668e87b2260ef262e2066ac0ed217ec77478170deaf76ff48f2116a23c48ae5 -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_MAINTAINER:=Nuno Goncalves diff --git a/net/ntripserver/Makefile b/net/ntripserver/Makefile index d4b34d4d1..d964977b9 100644 --- a/net/ntripserver/Makefile +++ b/net/ntripserver/Makefile @@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ntripserver PKG_VERSION:=1.51 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/nunojpg/ntripserver/tar.gz/v$(PKG_VERSION)? PKG_HASH:=3878c13d1b56e14085ce995565a2113aa592e3aa0b0eacfc65b6e3f5bdfc07e7 -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_MAINTAINER:=Nuno Goncalves diff --git a/net/nut/Makefile b/net/nut/Makefile index 9f84ed26e..56cfd87a3 100644 --- a/net/nut/Makefile +++ b/net/nut/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nut PKG_VERSION:=2.7.4 -PKG_RELEASE:=16 +PKG_RELEASE:=17 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.7/ PKG_HASH:=980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7 PKG_MAINTAINER:=Daniel Dickinson -PKG_LICENSE:=GPL-2.0+ GPL-3.0+ GPL-1.0+ Artistic-1.0-Perl +PKG_LICENSE:=GPL-2.0-or-later GPL-3.0-or-later GPL-1.0-or-later Artistic-1.0-Perl PKG_LICENSE_FILES:=LICENSE-GPL2 LICENSE-GPL3 COPYING PKG_FIXUP:=autoreconf diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile index de56cbaf4..6729d0a72 100644 --- a/net/ocserv/Makefile +++ b/net/ocserv/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ocserv PKG_VERSION:=0.12.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_USE_MIPS16:=0 PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -17,7 +17,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/ocserv/ PKG_HASH:=05c01effa8a7c2f022616fcb62bade4df51aa7f0035248671da12819d62cb185 -PKG_LICENSE:=GPLv2+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING #PKG_FIXUP:=autoreconf diff --git a/net/ola/Makefile b/net/ola/Makefile index a76ea79a9..e6a701ebc 100644 --- a/net/ola/Makefile +++ b/net/ola/Makefile @@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ola PKG_VERSION:=0.10.7 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/OpenLightingProject/ola/tar.gz/$(PKG_VERSION)? PKG_HASH:=95b5e99775f700a9cdf6e2219eccfc8c037fa8841f87cb00344359c4b8c7bf26 -PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE:=LGPL-2.1-or-later PKG_FIXUP:=libtool diff --git a/net/pen/Makefile b/net/pen/Makefile index 66284f327..c444a938e 100644 --- a/net/pen/Makefile +++ b/net/pen/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pen PKG_VERSION:=0.34.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://siag.nu/pub/pen/ PKG_HASH:=2b640795029df9d1672e17202c109cc5d42538f6754a6070dc27da640881e864 -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:= diff --git a/net/pingcheck/Makefile b/net/pingcheck/Makefile index 4f3a711c2..dfd15995e 100644 --- a/net/pingcheck/Makefile +++ b/net/pingcheck/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pingcheck PKG_VERSION:=2017-10-02 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_MIRROR_HASH:=8c8d1743b8972ade6c75027346fc652f7a1c0f17e2f9bd2e65aad20013d9870e @@ -19,7 +19,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=12e65e2f3fd2a17db785d28756df43ccade29b1b PKG_MAINTAINER:=Bruno Randolf -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=LICENSE PKG_BUILD_PARALLEL:=1 diff --git a/net/quassel-irssi/Makefile b/net/quassel-irssi/Makefile index e1434db61..8b850be05 100644 --- a/net/quassel-irssi/Makefile +++ b/net/quassel-irssi/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=quassel-irssi PKG_SOURCE_DATE:=2017-11-30 PKG_SOURCE_VERSION:=079be662dde374a383646256108a4974c2bc7796 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/phhusson/quassel-irssi/tar.gz/$(PKG_SOURCE_VERSION)? @@ -18,7 +18,7 @@ PKG_HASH:=c276a92a47f8edf5ae1d9db0e72a69d078f2f3f80e055853fc6d06099d898966 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION) PKG_MAINTAINER:=Ben Rosser -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=core/COPYING PKG_BUILD_PARALLEL:=1 diff --git a/net/ratechecker/Makefile b/net/ratechecker/Makefile index 681c511df..befa38d67 100644 --- a/net/ratechecker/Makefile +++ b/net/ratechecker/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ratechecker PKG_VERSION:=0.0.20170609 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_REV:=4cd4e3c70d9832336af5ba157f2a272f9c0098dc PKG_MIRROR_HASH:=c6f02b273536738bbcf4b16e3859f733a02ada88b4078fc8a5b0ad8d1d184370 -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/net/remserial/Makefile b/net/remserial/Makefile index 333c903df..1bd812e25 100644 --- a/net/remserial/Makefile +++ b/net/remserial/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=remserial PKG_VERSION:=1.4 -PKG_RELEASE:=1 -PKG_LICENSE:=GPL-2.0+ +PKG_RELEASE:=2 +PKG_LICENSE:=GPL-2.0-or-later PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://lpccomp.bc.ca/remserial/ diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile index edfa732cf..4898037cd 100644 --- a/net/rp-pppoe/Makefile +++ b/net/rp-pppoe/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rp-pppoe PKG_VERSION:=3.12 -PKG_RELEASE:=6 -PKG_LICENSE:=LGPL-2.0+ +PKG_RELEASE:=7 +PKG_LICENSE:=LGPL-2.0-or-later PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://roaringpenguin.com/files/download diff --git a/net/ser2net/Makefile b/net/ser2net/Makefile index aaa99065b..0bbb9b4b0 100644 --- a/net/ser2net/Makefile +++ b/net/ser2net/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ser2net PKG_VERSION:=3.5.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/ser2net PKG_HASH:=02f5dd0abbef5a17b80836b0de1ef0588e257106fb5e269b86822bfd001dc862 -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Michael Heimpold diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile index 3532d3c7f..401a2b3e1 100644 --- a/net/shadowsocks-libev/Makefile +++ b/net/shadowsocks-libev/Makefile @@ -14,7 +14,7 @@ include $(TOPDIR)/rules.mk # PKG_NAME:=shadowsocks-libev PKG_VERSION:=3.3.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION) @@ -22,7 +22,7 @@ PKG_HASH:=afd25ae5e737be385fa53364c66095c354277e98cf141b54beb2be93d9228f4f PKG_MAINTAINER:=Yousong Zhou -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE PKG_FIXUP:=autoreconf diff --git a/net/shorewall-core/Makefile b/net/shorewall-core/Makefile index 46e8911fd..80e7766f0 100644 --- a/net/shorewall-core/Makefile +++ b/net/shorewall-core/Makefile @@ -14,7 +14,7 @@ PKG_BUGFIX_MAJOR_VERSION:=3 PKG_BUGFIX_MINOR_VERSION:=.4 PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION) PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ @@ -25,7 +25,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_HASH:=8fdc6e326d0c07df2a636634c510630e99f7a3ab70bb60fb735dd92a0d33d500 PKG_MAINTAINER:=Willem van den Akker -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk diff --git a/net/shorewall-lite/Makefile b/net/shorewall-lite/Makefile index 88b5b3bd5..f621c1c1e 100644 --- a/net/shorewall-lite/Makefile +++ b/net/shorewall-lite/Makefile @@ -14,7 +14,7 @@ PKG_BUGFIX_MAJOR_VERSION:=3 PKG_BUGFIX_MINOR_VERSION:=.4 PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION) PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ @@ -25,7 +25,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_HASH:=cf48465402eb5fee0886b7dfc4b0a78ec9c0850e8a2046874dee22154c6ee107 PKG_MAINTAINER:=Willem van den Akker -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk diff --git a/net/shorewall/Makefile b/net/shorewall/Makefile index 4171caa9b..0cc9e4e2d 100644 --- a/net/shorewall/Makefile +++ b/net/shorewall/Makefile @@ -14,7 +14,7 @@ PKG_BUGFIX_MAJOR_VERSION:=3 PKG_BUGFIX_MINOR_VERSION:=.4 PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION) PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ @@ -25,7 +25,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_HASH:=a6e1a1a6b20ea37695fe12d36233dacd461548ac67665664c8de3a99cf7aa23b PKG_MAINTAINER:=Willem van den Akker -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk diff --git a/net/shorewall6-lite/Makefile b/net/shorewall6-lite/Makefile index 5f9d8248f..7500cc32c 100644 --- a/net/shorewall6-lite/Makefile +++ b/net/shorewall6-lite/Makefile @@ -14,7 +14,7 @@ PKG_BUGFIX_MAJOR_VERSION:=3 PKG_BUGFIX_MINOR_VERSION:=.4 PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION) PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ @@ -25,7 +25,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_HASH:=af1a62397e8232bb4fb6c266a29df0063c339c94772d06a92e086a2e8f1ee70f PKG_MAINTAINER:=Willem van den Akker -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING diff --git a/net/shorewall6/Makefile b/net/shorewall6/Makefile index c3d1d8b78..48ac7c2a7 100644 --- a/net/shorewall6/Makefile +++ b/net/shorewall6/Makefile @@ -14,7 +14,7 @@ PKG_BUGFIX_MAJOR_VERSION:=3 PKG_BUGFIX_MINOR_VERSION:=.4 PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION) PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ @@ -25,7 +25,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_HASH:=c1fc1244bd68710aecd504841965ac7fbbb05fa7fb1b857b1ad43659bd81877b PKG_MAINTAINER:=Willem van den Akker -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk diff --git a/net/siit/Makefile b/net/siit/Makefile index c1f5a4107..e3d13005f 100644 --- a/net/siit/Makefile +++ b/net/siit/Makefile @@ -10,8 +10,8 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=siit PKG_VERSION:=1.2 -PKG_RELEASE:=2 -PKG_LICENSE:=GPLv2+ +PKG_RELEASE:=3 +PKG_LICENSE:=GPL-2.0-or-later include $(INCLUDE_DIR)/package.mk diff --git a/net/sshtunnel/Makefile b/net/sshtunnel/Makefile index f2c2e00cf..4512b5621 100644 --- a/net/sshtunnel/Makefile +++ b/net/sshtunnel/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sshtunnel PKG_VERSION:=4 -PKG_RELEASE:=2 -PKG_LICENSE:=GPL-2.0+ +PKG_RELEASE:=3 +PKG_LICENSE:=GPL-2.0-or-later PKG_MAINTAINER:=Nuno Goncalves diff --git a/net/sslh/Makefile b/net/sslh/Makefile index caf58a901..0a516fa6f 100644 --- a/net/sslh/Makefile +++ b/net/sslh/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sslh PKG_VERSION:=v1.19c -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://rutschle.net/tech/sslh/ PKG_HASH:=bb11dfa88b27ae1ec825a1b8156000c3f17f7e8f042311f19b7a249193c47bf3 -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 48ff454e3..ea2cfce04 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan PKG_VERSION:=5.8.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ PKG_HASH:=15b1e10c7dd6253ab5d791fe9b9cb84624e24c118aecd9b90251b4e60daa0933 -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_MAINTAINER:=Stijn Tintel PKG_MOD_AVAILABLE:= \ diff --git a/net/stunnel/Makefile b/net/stunnel/Makefile index b1984e042..c6858bfb5 100644 --- a/net/stunnel/Makefile +++ b/net/stunnel/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stunnel PKG_VERSION:=5.55 -PKG_RELEASE:=1 +PKG_RELEASE:=2 -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_MAINTAINER:=Florian Eckert PKG_LICENSE_FILES:=COPYING COPYRIGHT.GPL PKG_CPE_ID:=cpe:/a:stunnel:stunnel diff --git a/net/tcpproxy/Makefile b/net/tcpproxy/Makefile index 0e97965b8..e56e8ad87 100644 --- a/net/tcpproxy/Makefile +++ b/net/tcpproxy/Makefile @@ -13,13 +13,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tcpproxy PKG_VERSION:=1.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.spreadspace.org/tcpproxy/releases/ PKG_HASH:=446104b3abefda73b1255e5197702acbeb36b3aada251ad39e1e5ab55292683b PKG_MAINTAINER:=Christian Pointner -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk diff --git a/net/transmission/Makefile b/net/transmission/Makefile index bbe073e69..9c4265b7a 100644 --- a/net/transmission/Makefile +++ b/net/transmission/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=transmission PKG_VERSION:=2.94 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GITHUB/transmission/transmission-releases/master @@ -17,7 +17,7 @@ PKG_HASH:=35442cc849f91f8df982c3d0d479d650c6ca19310a994eccdaa79a4af3916b7d PKG_MAINTAINER:=Rosen Penev PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile index 2d961144d..328d33f49 100644 --- a/net/travelmate/Makefile +++ b/net/travelmate/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=travelmate PKG_VERSION:=1.4.12 -PKG_RELEASE:=1 -PKG_LICENSE:=GPL-3.0+ +PKG_RELEASE:=2 +PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken include $(INCLUDE_DIR)/package.mk diff --git a/net/uanytun/Makefile b/net/uanytun/Makefile index f8e5ea22b..cb85c38eb 100644 --- a/net/uanytun/Makefile +++ b/net/uanytun/Makefile @@ -13,14 +13,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uanytun PKG_VERSION:=0.3.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.anytun.org/download/ PKG_HASH:=076318c771c908386c4408dda0769171542da701785302903641ce23fd33a295 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Christian Pointner -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk diff --git a/net/vpnbypass/Makefile b/net/vpnbypass/Makefile index 2c0b545cf..28275ca9c 100644 --- a/net/vpnbypass/Makefile +++ b/net/vpnbypass/Makefile @@ -5,8 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vpnbypass PKG_VERSION:=1.3.1 -PKG_RELEASE:=1 -PKG_LICENSE:=GPL-3.0+ +PKG_RELEASE:=2 +PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin include $(INCLUDE_DIR)/package.mk diff --git a/net/wavemon/Makefile b/net/wavemon/Makefile index cb7141cc5..754bb1fbc 100644 --- a/net/wavemon/Makefile +++ b/net/wavemon/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wavemon PKG_VERSION:=0.9.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/uoaerg/wavemon/tar.gz/v$(PKG_VERSION)? PKG_HASH:=5823ef9459d6147a457b390b6744a77465584e93d37c2809fa7a0be557070166 PKG_MAINTAINER:=Jonathan McCrohan -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_BUILD_PARALLEL:=1 diff --git a/net/wget/Makefile b/net/wget/Makefile index 66a25f7dd..83c91374e 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) PKG_HASH:=31cccfc6630528db1c8e3a06f6decf2a370060b982841cfab2b8677400a5092e PKG_MAINTAINER:=Peter Wagner -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:gnu:wget diff --git a/sound/mpc/Makefile b/sound/mpc/Makefile index 4cc0d13ce..ff50bbce4 100644 --- a/sound/mpc/Makefile +++ b/sound/mpc/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mpc PKG_VERSION:=0.30 -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.musicpd.org/download/mpc/0 PKG_HASH:=65fc5b0a8430efe9acbe6e261127960682764b20ab994676371bdc797d867fce -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Ted Hess 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 -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 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 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 -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 -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 -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 -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 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 -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 -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 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 -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 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 -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 -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 -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 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 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 -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 , Hannu Nyman 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 -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 -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 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 -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 -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 -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 -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 -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 -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 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 -PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf