From 6069907ae9c96eb3d16c8345aef08e1f6023af66 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 28 Apr 2021 22:24:53 -0700 Subject: [PATCH 1/5] jbigkit: fix license --- srcpkgs/jbigkit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jbigkit/template b/srcpkgs/jbigkit/template index 1b0514bea947..05358207e07d 100644 --- a/srcpkgs/jbigkit/template +++ b/srcpkgs/jbigkit/template @@ -1,14 +1,14 @@ # Template file for 'jbigkit' pkgname=jbigkit version=2.2 -revision=1 +revision=2 wrksrc="${pkgname}-shared-${version}" build_style=gnu-configure hostmakedepends="automake libtool pkg-config" checkdepends="check-devel" short_desc="Data compression library/utilities for bi-level high-resolution images" maintainer="Andrea Brancaleoni " -license="GPL-3" +license="GPL-2.0-only" homepage="http://www.cl.cam.ac.uk/~mgk25/jbigkit" distfiles="https://github.com/void-linux/jbigkit-shared/archive/v${version}.tar.gz" checksum=5cccbfb3bd7daf224a244ce0578dbcf706e4f39962426ceede873262b29b9931 From cfcf991c76ac417a3561f4b771537296c466a0b6 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 28 Apr 2021 22:28:38 -0700 Subject: [PATCH 2/5] jeti-filemanager: fix license --- srcpkgs/jeti-filemanager/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jeti-filemanager/template b/srcpkgs/jeti-filemanager/template index 95e2a6167e82..1416863a8a65 100644 --- a/srcpkgs/jeti-filemanager/template +++ b/srcpkgs/jeti-filemanager/template @@ -1,12 +1,12 @@ # Template file for 'jeti-filemanager' pkgname=jeti-filemanager version=2.0.1 -revision=2 +revision=3 build_style=gnu-makefile makedepends="ncurses-devel" short_desc="Total Commander filemanager ncurses clone" maintainer="Harri Leino " -license="GPL-3" +license="GPL-3.0-only" homepage="https://github.com/mrshampoo/jeti-filemanager/" distfiles="https://github.com/mrshampoo/jeti-filemanager/archive/${version}.tar.gz" checksum=4da4ddee8fe6774b91ea473810d6c6898777c9bbcb8816996d72095dc0e18691 From ef6e755cc8408cb5cf2297b144c85b776f62f1d1 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 28 Apr 2021 22:37:43 -0700 Subject: [PATCH 3/5] jnettop: fix license --- srcpkgs/jnettop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jnettop/template b/srcpkgs/jnettop/template index 1ac2fb805937..1bfc21eda36d 100644 --- a/srcpkgs/jnettop/template +++ b/srcpkgs/jnettop/template @@ -1,7 +1,7 @@ # Template file for 'jnettop' pkgname=jnettop version=0.13.0 -revision=1 +revision=2 create_wrksrc=yes build_wrksrc="${pkgname}-${version}" build_style=gnu-configure @@ -9,7 +9,7 @@ hostmakedepends="pkg-config" makedepends="glib-devel libpcap-devel ncurses-devel" short_desc="View hosts/ports taking up the most network traffic" maintainer="Leah Neukirchen " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://packages.debian.org/sid/net/jnettop" distfiles="${DEBIAN_SITE}/main/j/${pkgname}/${pkgname}_${version}.orig.tar.gz ${DEBIAN_SITE}/main/j/${pkgname}/${pkgname}_${version}-1.debian.tar.gz" From 16cf4c2f58f95c811b885fe7001979a4f8f555f7 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 28 Apr 2021 22:42:31 -0700 Subject: [PATCH 4/5] joe: fix license, other lint JOE is technically GPL 1.0-or-later but the COPYING file is the GPL 2 one, so I'm sticking with that. --- srcpkgs/joe/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/joe/template b/srcpkgs/joe/template index b68d886982a8..b31fa139153e 100644 --- a/srcpkgs/joe/template +++ b/srcpkgs/joe/template @@ -1,7 +1,7 @@ # Template file for 'joe' pkgname=joe version=4.6 -revision=1 +revision=2 build_style=gnu-configure conf_files=" /etc/joe/ftyperc @@ -13,10 +13,10 @@ conf_files=" /etc/joe/rjoerc /etc/joe/shell.csh /etc/joe/shell.sh" -short_desc="The world-famous Wordstar like text editor" +short_desc="World-famous Wordstar like text editor" maintainer="Diogo Leal " -license="GPL-2" -conflicts="jupp>=0" +license="GPL-2.0-or-later" homepage="http://joe-editor.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/joe-editor/JOE%20sources/joe-${version}/joe-${version}.tar.gz" checksum=495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de +conflicts="jupp>=0" From 3ffa7e5a0f74dd7a9a947ba97d8b2b52e8a72bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Mon, 3 May 2021 22:59:22 -0700 Subject: [PATCH 5/5] john: fix license, verify and adjust python version --- srcpkgs/john/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/john/template b/srcpkgs/john/template index fc807f4e7c84..8b288e0ce2e3 100644 --- a/srcpkgs/john/template +++ b/srcpkgs/john/template @@ -1,7 +1,7 @@ # Template file for 'john' pkgname=john version=1.9.0 -revision=4 +revision=5 _jumbover=1 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}" build_wrksrc="src" @@ -10,11 +10,11 @@ configure_args="--with-systemwide $(vopt_enable simd)" makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel" short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)" maintainer="Piraty " -license="GPL-2.0-or-later with OpenSSL-exception" +license="custom:GPL-2.0-or-later with OpenSSL-exception" homepage="https://www.openwall.com/john/" distfiles="$homepage/k/$pkgname-${version}-jumbo-${_jumbover}.tar.xz" checksum=f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3b -python_version=2 #unverified +python_version=3 build_options="simd"