From 495969d338cb16ac4507ea8c238483dd9d72602c Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 24 Mar 2021 18:41:00 -0700 Subject: [PATCH 01/15] liba52: fix license, import patch to fix globals test --- .../liba52/patches/disable-globals-test.patch | 17 +++++++++++++++++ srcpkgs/liba52/template | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/liba52/patches/disable-globals-test.patch diff --git a/srcpkgs/liba52/patches/disable-globals-test.patch b/srcpkgs/liba52/patches/disable-globals-test.patch new file mode 100644 index 000000000000..3a22a7c26041 --- /dev/null +++ b/srcpkgs/liba52/patches/disable-globals-test.patch @@ -0,0 +1,17 @@ +Description: Disable globals test + The tests makes sense during development to check for erroneously added global + symbols, but on a packing level we will catch the using symbols file. So we + disable the test. Especially since the test is not able to handle -fPIE as + default. +Author: Sebastian Ramacher +Forwarded: not-needed +Last-Update: 2017-02-04 + +--- test/Makefile.am ++++ test/Makefile.am +@@ -3,4 +3,4 @@ compare_SOURCES = compare.c + compare_LDADD = -lm + + EXTRA_DIST = regression tests compile globals +-TESTS = regression compile globals ++TESTS = regression compile diff --git a/srcpkgs/liba52/template b/srcpkgs/liba52/template index f0ae78985cb6..f94b04c876d1 100644 --- a/srcpkgs/liba52/template +++ b/srcpkgs/liba52/template @@ -1,14 +1,14 @@ # Template file for 'liba52' pkgname=liba52 version=0.7.4 -revision=8 +revision=9 wrksrc="a52dec-${version}" build_style=gnu-configure configure_args="--enable-shared" hostmakedepends="automake libtool" short_desc="Free ATSC A/52 stream decoder" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://liba52.sourceforge.net/" distfiles="http://liba52.sourceforge.net/files/a52dec-${version}.tar.gz" checksum=a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33 From a6f0f4cfe277a9fe3ec7ae27216cc4f82c7e635b Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 24 Mar 2021 18:46:48 -0700 Subject: [PATCH 02/15] 9base: fix license, note LPL exceptions, fix download URL --- srcpkgs/9base/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/9base/template b/srcpkgs/9base/template index feade2c2eb4f..5ae9c4916a20 100644 --- a/srcpkgs/9base/template +++ b/srcpkgs/9base/template @@ -1,7 +1,7 @@ -# Template file for '9base'. +# Template file for '9base' pkgname=9base version=6.0.20190911 -revision=1 +revision=2 _githash=63916da7bd6d73d9a405ce83fc4ca34845667cce wrksrc="9base-${_githash}" build_style=gnu-makefile @@ -9,10 +9,10 @@ build_style=gnu-makefile hostmakedepends="byacc" short_desc="Revived minimalist port of Plan 9 userland to Unix" maintainer='Tai Chi Minh Ralph Eastwood ' -license="custom" +license="MIT, custom:LPL-1.02 with exceptions" homepage="http://git.suckless.org/9base" # Checked out from http://git.suckless.org/9base/ and created tarball with 'git archive'. -distfiles="https://distfiles.voidlinux.de/9base-${_githash}.tar.gz" +distfiles="https://sources.voidlinux.org/9base-${version}/9base-${_githash}.tar.gz" checksum=bb8cd1e0060824914839fd090353971862a1025ae4b8ea5d1e99618ddd1b160f conflicts="plan9port" provides="plan9port-20160418_4" From 0b71a9a0916b46d5956865ad45267e49d4cb0d06 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 24 Mar 2021 18:51:56 -0700 Subject: [PATCH 03/15] aalib: fix license --- srcpkgs/aalib/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/aalib/template b/srcpkgs/aalib/template index 5181baec748b..7102b7e95f6c 100644 --- a/srcpkgs/aalib/template +++ b/srcpkgs/aalib/template @@ -1,14 +1,14 @@ # Template file for 'aalib' pkgname=aalib version=1.4rc5 -revision=1 +revision=2 wrksrc="aalib-1.4.0" build_style=gnu-configure hostmakedepends="automake libtool" short_desc="Portable ASCII art GFX library" maintainer="Orphaned " +license="LGPL-2.0-or-later" homepage="http://aa-project.sourceforge.net/aalib/" -license="LGPL-2" distfiles="${SOURCEFORGE_SITE}/aa-project/${pkgname}-${version}.tar.gz" checksum=fbddda9230cf6ee2a4f5706b4b11e2190ae45f5eda1f0409dc4f99b35e0a70ee From d597254ce7c6c88e5cf059a8f324706a27f83129 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 24 Mar 2021 18:54:50 -0700 Subject: [PATCH 04/15] abook: fix license --- srcpkgs/abook/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/abook/template b/srcpkgs/abook/template index 084c78f74ec5..9538e8d1f4da 100644 --- a/srcpkgs/abook/template +++ b/srcpkgs/abook/template @@ -1,14 +1,14 @@ # Template file for 'abook' pkgname=abook version=0.6.1 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool gettext gettext-devel tar" makedepends="ncurses-devel readline-devel" +short_desc="Text-based addressbook designed to use with mutt mail client" maintainer="Philipp Hirsch " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://abook.sourceforge.net/" -short_desc="Text-based addressbook designed to use with mutt mail client" distfiles="http://abook.sourceforge.net/devel/${pkgname}-${version}.tar.gz" checksum=f0a90df8694fb34685ecdd45d97db28b88046c15c95e7b0700596028bd8bc0f9 From fa4e722fc4ccd59274284185eb506edb8ffd7eeb Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 24 Mar 2021 18:59:10 -0700 Subject: [PATCH 05/15] abootimg: fix license, fix template ordering --- srcpkgs/abootimg/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/abootimg/template b/srcpkgs/abootimg/template index 8a39564185e5..e35e4fbb366f 100644 --- a/srcpkgs/abootimg/template +++ b/srcpkgs/abootimg/template @@ -1,14 +1,14 @@ # Template file for 'abootimg' pkgname=abootimg version=0.6.20160512 -revision=1 +revision=2 _commit="1ebeb393252ab5aeed62e34bc439b6728444f06e" -build_style=gnu-makefile wrksrc="abootimg-$_commit-$_commit" +build_style=gnu-makefile makedepends="libblkid-devel" short_desc="Manipulate Android Boot Images" maintainer="Andrea Brancaleoni " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://gitorious.org/ac100/abootimg" distfiles="https://gitlab.com/ajs124/abootimg/repository/archive.tar.gz?ref=$_commit>archive.tar.gz" checksum=36efff208101a8d04cc84085849cda3300cea71f062c8d425c534e5f85f6cc3f From e7f9dd7632e533c6727cba9296b3bbb6a008b2a3 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 24 Mar 2021 19:04:01 -0700 Subject: [PATCH 06/15] advancecomp: fix license, update short_desc --- srcpkgs/advancecomp/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/advancecomp/template b/srcpkgs/advancecomp/template index bca9d61ef55d..ac70d3fd7a89 100644 --- a/srcpkgs/advancecomp/template +++ b/srcpkgs/advancecomp/template @@ -1,12 +1,12 @@ # Template file for 'advancecomp' pkgname=advancecomp version=2.1 -revision=1 +revision=2 build_style=gnu-configure makedepends="zlib-devel" -short_desc="A collection of recompression utilities for ZIP/PNG/GZ" +short_desc="Command-line recompression utilities for ZIP/PNG/GZ" maintainer="Orphaned " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://www.advancemame.it/comp-readme.html" distfiles="https://github.com/amadvance/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" checksum=3ac0875e86a8517011976f04107186d5c60d434954078bc502ee731480933eb8 From 968a7fe76369d6b19d99972d86b7b8e25eb75e8a Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 24 Mar 2021 19:10:12 -0700 Subject: [PATCH 07/15] airspy: fix license --- srcpkgs/airspy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/airspy/template b/srcpkgs/airspy/template index 1665d72f6270..a81e3470d205 100644 --- a/srcpkgs/airspy/template +++ b/srcpkgs/airspy/template @@ -1,7 +1,7 @@ # Template file for 'airspy' pkgname=airspy version=1.0.9 -revision=1 +revision=2 wrksrc=airspyone_host-${version} build_style=cmake hostmakedepends="pkg-config" @@ -9,7 +9,7 @@ makedepends="libusb-devel" _desc="Tiny and efficient software defined radio (SDR)" short_desc="${_desc} - tools" maintainer="bra1nwave " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://airspy.com/" distfiles="https://github.com/airspy/airspyone_host/archive/v${version}.tar.gz" checksum=967ef256596d4527b81f007f77b91caec3e9f5ab148a8fec436a703db85234cc From d8014fd4b80bf9619d06da1e28f82a4cf553e970 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 24 Mar 2021 19:11:23 -0700 Subject: [PATCH 08/15] aldo: fix license --- srcpkgs/aldo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/aldo/template b/srcpkgs/aldo/template index b4b0a75498b5..7d2feccb68c6 100644 --- a/srcpkgs/aldo/template +++ b/srcpkgs/aldo/template @@ -1,12 +1,12 @@ # Template file for 'aldo' pkgname=aldo version=0.7.7 -revision=1 +revision=2 build_style=gnu-configure makedepends="libao-devel" short_desc="Morse code learning tool with four training methods" maintainer="Toyam Cox " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://www.nongnu.org/aldo/" distfiles="${NONGNU_SITE}/aldo/aldo-${version}.tar.bz2" checksum=f1b8849d09267fff3c1f5122097d90fec261291f51b1e075f37fad8f1b7d9f92 From f342825bcf0df937404e9e904774795febe45b29 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 24 Mar 2021 19:12:48 -0700 Subject: [PATCH 09/15] an: fix license --- srcpkgs/an/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/an/template b/srcpkgs/an/template index 85e94f7bc72c..28a6600f6492 100644 --- a/srcpkgs/an/template +++ b/srcpkgs/an/template @@ -1,13 +1,13 @@ # Template file for 'an' pkgname=an version=1.2 -revision=6 +revision=7 build_style=gnu-makefile makedepends="icu-devel" depends="words-en" short_desc="Very fast anagram generator" maintainer="Leah Neukirchen " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://packages.debian.org/sid/an" distfiles="${DEBIAN_SITE}/main/a/an/an_${version}.orig.tar.xz" checksum=b925d57d80bd0d83b755f5b8d78e6d5bf05eb059ec84a7d8fbb77b18c73b17a5 From f21b2dd0bb377afd5cdd3df65e4239ed5be1c85c Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 24 Mar 2021 19:24:40 -0700 Subject: [PATCH 10/15] aoeui: fix license --- srcpkgs/aoeui/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/aoeui/template b/srcpkgs/aoeui/template index 52bc1a822bd7..603c89d6cd72 100644 --- a/srcpkgs/aoeui/template +++ b/srcpkgs/aoeui/template @@ -1,14 +1,14 @@ # Template file for 'aoeui' pkgname=aoeui version=1.7 -revision=6 +revision=7 _githash=4e5dee93ebbaf5bd7bd7da80ce34b2eef196cd08 wrksrc="${pkgname}-${_githash}" build_style=gnu-makefile hostmakedepends="m4" short_desc="Lightweight UNIX-friendly text editor" maintainer="Leah Neukirchen " -license="GPL-2" +license="GPL-2.0-only" homepage="https://github.com/pklausler/aoeui" distfiles="https://github.com/pklausler/aoeui/archive/${_githash}.tar.gz" checksum=3b06c7950b0fcbdfe57e78de8cb9b9d7af141932459a32d72a029f96839d667f From 9db62e2273ed2e8184766415559664278e484aff Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 24 Mar 2021 20:07:26 -0700 Subject: [PATCH 11/15] armagetronad: verify python version, fix license --- srcpkgs/armagetronad/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/armagetronad/template b/srcpkgs/armagetronad/template index b6c02bdf7fba..54dbe663f39c 100644 --- a/srcpkgs/armagetronad/template +++ b/srcpkgs/armagetronad/template @@ -1,7 +1,7 @@ # Template file for 'armagetronad' pkgname=armagetronad version=0.2.8.3.5 -revision=1 +revision=2 build_style=gnu-configure conf_files="/etc/games/${pkgname}/*.cfg /etc/games/${pkgname}/*.srv" @@ -11,11 +11,11 @@ makedepends="libX11-devel libxml2-devel libICE-devel libpng-devel glu-devel libjpeg-turbo-devel SDL_image-devel SDL_mixer-devel" short_desc="3D Lightcycle game from the movie Tron with advanced capabilities" maintainer="Toyam Cox " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://armagetronad.org" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.src.tar.bz2" checksum=1dc3962fc77f4fd64a795ff4e3c02518e2a79bb57f9ed599ba43eff8eb51d2ef -python_version=2 #unverified +python_version=2 do_configure() { mkdir build_dedicated From 0a699797d490f8a0630f2cfcb4d6a9320cde30a0 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 24 Mar 2021 20:22:53 -0700 Subject: [PATCH 12/15] arpwatch: fix license --- srcpkgs/arpwatch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/arpwatch/template b/srcpkgs/arpwatch/template index 5eb0da24e5d7..84c9624a49ec 100644 --- a/srcpkgs/arpwatch/template +++ b/srcpkgs/arpwatch/template @@ -1,12 +1,12 @@ # Template file for 'arpwatch' pkgname=arpwatch version=2.1a15 -revision=2 +revision=3 build_style=gnu-configure makedepends="libpcap-devel" short_desc="Ethernet/FDDI station activity monitor" maintainer="Andrea Brancaleoni " -license="BSD" +license="BSD-3-Clause-LBNL" homepage="ftp://ftp.ee.lbl.gov" distfiles="ftp://ftp.ee.lbl.gov/$pkgname-$version.tar.gz" checksum=c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898 From 4093f77492aa6824de6c6cd8102ceaeebadd3a64 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 24 Mar 2021 20:25:44 -0700 Subject: [PATCH 13/15] ascii: fix license --- srcpkgs/ascii/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ascii/template b/srcpkgs/ascii/template index 0e391d49b21a..87d8edd27fe8 100644 --- a/srcpkgs/ascii/template +++ b/srcpkgs/ascii/template @@ -1,10 +1,10 @@ # Template file for 'ascii' pkgname=ascii version=3.18 -revision=1 +revision=2 short_desc="List ASCII idiomatic names and octal/decimal code-point forms" maintainer="Orphaned " -license="BSD" +license="BSD-2-Clause" homepage="http://www.catb.org/~esr/ascii" distfiles="http://www.catb.org/~esr/ascii/ascii-${version}.tar.gz" checksum=728422d5f4da61a37a17b4364d06708e543297de0a5f70305243236d80df072d From 9d3735d3e5e2d0e70fa46c8b239b88e0b494876d Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 24 Mar 2021 20:32:44 -0700 Subject: [PATCH 14/15] assimp: fix license, reorder template --- srcpkgs/assimp/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/assimp/template b/srcpkgs/assimp/template index 4dbfa000916e..f521d3922e05 100644 --- a/srcpkgs/assimp/template +++ b/srcpkgs/assimp/template @@ -1,18 +1,18 @@ # Template file for 'assimp' pkgname=assimp version=5.0.1 -revision=1 +revision=2 build_style=cmake configure_args="-DASSIMP_BUILD_SAMPLES=OFF" hostmakedepends="pkg-config" makedepends="boost-devel libgomp-devel devil-devel minizip-devel zziplib-devel" +depends="libassimp>=${version}_${revision}" short_desc="Import library for various well-known 3D model formats" maintainer="Jürgen Buchmüller " -license="3-clause-BSD" +license="BSD-3-Clause" homepage="http://assimp.sourceforge.net/" distfiles="https://github.com/assimp/assimp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc -depends="libassimp>=${version}_${revision}" post_install() { vlicense LICENSE From 38f65e69ecef3c3302c8c578aaa8ad712c1ed1ac Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 24 Mar 2021 20:36:46 -0700 Subject: [PATCH 15/15] at: fix license, reorder template --- srcpkgs/at/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/at/template b/srcpkgs/at/template index 9caa1a53e63f..172ab638ee48 100644 --- a/srcpkgs/at/template +++ b/srcpkgs/at/template @@ -1,21 +1,21 @@ # Template file for 'at' pkgname=at version=3.1.23 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-jobdir=/var/spool/atd --with-atspool=/var/spool/atd --sbindir=/usr/bin --with-daemon_username=at --with-daemon_groupname=at SENDMAIL=/usr/sbin/sendmail" -disable_parallel_build=yes hostmakedepends="flex" makedepends="pam-devel libfl-devel" depends="virtual?smtp-server" short_desc="Run commands at a specified time" maintainer="Leah Neukirchen " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://packages.qa.debian.org/a/at.html" distfiles="${DEBIAN_SITE}/main/a/${pkgname}/${pkgname}_${version}.orig.tar.gz" checksum=97450aa954aaa8a70218cc8e61a33df9fee9f86527e9f861de302fb7a3c81710 +disable_parallel_build=yes conf_files="/etc/at.deny" system_accounts="at"