Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Omnibus lint pass for SPDX issues, most packages starting with "J"
@ 2021-04-29  6:13 heliocat
  2021-05-04  5:54 ` [PR PATCH] [Updated] " heliocat
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: heliocat @ 2021-04-29  6:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1621 bytes --]

There is a new pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages lint_j
https://github.com/void-linux/void-packages/pull/30575

Omnibus lint pass for SPDX issues, most packages starting with "J"
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/30575.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lint_j-30575.patch --]
[-- Type: text/x-diff, Size: 5777 bytes --]

From 91a62d6c5159ff2c69aca6c0a757ed0829c4f590 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <abc@pompel.me>"
-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 266a8c637a8ae86498b1122dd702209a3a7b704f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <mr.leino@gmail.com>"
-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 dd2df87e1594e6f91832a0864209bd41ac4c20ed Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <leah@vuxu.org>"
-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 5d6169902b81e4adddcf2c90fd12efe6ec1034c2 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <diogo@diogoleal.com>"
-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 7a3733979017780713be1021b6a9e48e4f7c7042 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 28 Apr 2021 23:11:33 -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 <piraty1@inbox.ru>"
-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"
 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] Omnibus lint pass for SPDX issues, most packages starting with "J"
  2021-04-29  6:13 [PR PATCH] Omnibus lint pass for SPDX issues, most packages starting with "J" heliocat
@ 2021-05-04  5:54 ` heliocat
  2021-05-04  5:59 ` heliocat
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: heliocat @ 2021-05-04  5:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1626 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages lint_j
https://github.com/void-linux/void-packages/pull/30575

Omnibus lint pass for SPDX issues, most packages starting with "J"
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/30575.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lint_j-30575.patch --]
[-- Type: text/x-diff, Size: 5800 bytes --]

From 6069907ae9c96eb3d16c8345aef08e1f6023af66 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <abc@pompel.me>"
-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 <colin@heliocat.net>
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 <mr.leino@gmail.com>"
-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 <colin@heliocat.net>
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 <leah@vuxu.org>"
-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 <colin@heliocat.net>
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 <diogo@diogoleal.com>"
-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 e54f2b9da86161048c8cd23fb1894c2c4e3941d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 28 Apr 2021 23:11:33 -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 <piraty1@inbox.ru>"
-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"
 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] Omnibus lint pass for SPDX issues, most packages starting with "J"
  2021-04-29  6:13 [PR PATCH] Omnibus lint pass for SPDX issues, most packages starting with "J" heliocat
  2021-05-04  5:54 ` [PR PATCH] [Updated] " heliocat
@ 2021-05-04  5:59 ` heliocat
  2021-05-04  6:00 ` heliocat
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: heliocat @ 2021-05-04  5:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages lint_j
https://github.com/void-linux/void-packages/pull/30575

Omnibus lint pass for SPDX issues, most packages starting with "J"
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/30575.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lint_j-30575.patch --]
[-- Type: text/x-diff, Size: 5799 bytes --]

From 6069907ae9c96eb3d16c8345aef08e1f6023af66 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <abc@pompel.me>"
-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 <colin@heliocat.net>
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 <mr.leino@gmail.com>"
-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 <colin@heliocat.net>
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 <leah@vuxu.org>"
-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 <colin@heliocat.net>
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 <diogo@diogoleal.com>"
-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?= <erico.erc@gmail.com>
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 <piraty1@inbox.ru>"
-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"
 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] Omnibus lint pass for SPDX issues, most packages starting with "J"
  2021-04-29  6:13 [PR PATCH] Omnibus lint pass for SPDX issues, most packages starting with "J" heliocat
  2021-05-04  5:54 ` [PR PATCH] [Updated] " heliocat
  2021-05-04  5:59 ` heliocat
@ 2021-05-04  6:00 ` heliocat
  2021-05-04  6:01 ` heliocat
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: heliocat @ 2021-05-04  6:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages lint_j
https://github.com/void-linux/void-packages/pull/30575

Omnibus lint pass for SPDX issues, most packages starting with "J"
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/30575.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lint_j-30575.patch --]
[-- Type: text/x-diff, Size: 5799 bytes --]

From d04ba19c6089924e978dcdf8a507f081469dd93e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <abc@pompel.me>"
-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 0451e107c783e905f317af15c44b0fa27b24bb36 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <mr.leino@gmail.com>"
-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 ab31b9d97b5bd18ec98c30d64cc559e690571c83 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <leah@vuxu.org>"
-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 64c5d206a61e7ae68ad709097120623e7d045774 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <diogo@diogoleal.com>"
-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 2c9e40c8898b670ac4bf36b91d2f928c37f4ed20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
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 <piraty1@inbox.ru>"
-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"
 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] Omnibus lint pass for SPDX issues, most packages starting with "J"
  2021-04-29  6:13 [PR PATCH] Omnibus lint pass for SPDX issues, most packages starting with "J" heliocat
                   ` (2 preceding siblings ...)
  2021-05-04  6:00 ` heliocat
@ 2021-05-04  6:01 ` heliocat
  2021-05-05  6:16 ` heliocat
  2021-05-17  3:45 ` [PR PATCH] [Merged]: " ericonr
  5 siblings, 0 replies; 7+ messages in thread
From: heliocat @ 2021-05-04  6:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages lint_j
https://github.com/void-linux/void-packages/pull/30575

Omnibus lint pass for SPDX issues, most packages starting with "J"
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/30575.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lint_j-30575.patch --]
[-- Type: text/x-diff, Size: 5776 bytes --]

From d04ba19c6089924e978dcdf8a507f081469dd93e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <abc@pompel.me>"
-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 0451e107c783e905f317af15c44b0fa27b24bb36 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <mr.leino@gmail.com>"
-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 ab31b9d97b5bd18ec98c30d64cc559e690571c83 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <leah@vuxu.org>"
-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 64c5d206a61e7ae68ad709097120623e7d045774 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <diogo@diogoleal.com>"
-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 7afabd436a69ecdfe1989b0b76730b4346db1168 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 3 May 2021 23:01:17 -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 <piraty1@inbox.ru>"
-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"
 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] Omnibus lint pass for SPDX issues, most packages starting with "J"
  2021-04-29  6:13 [PR PATCH] Omnibus lint pass for SPDX issues, most packages starting with "J" heliocat
                   ` (3 preceding siblings ...)
  2021-05-04  6:01 ` heliocat
@ 2021-05-05  6:16 ` heliocat
  2021-05-17  3:45 ` [PR PATCH] [Merged]: " ericonr
  5 siblings, 0 replies; 7+ messages in thread
From: heliocat @ 2021-05-05  6:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages lint_j
https://github.com/void-linux/void-packages/pull/30575

Omnibus lint pass for SPDX issues, most packages starting with "J"
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/30575.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lint_j-30575.patch --]
[-- Type: text/x-diff, Size: 5776 bytes --]

From 91dfb17e0c3e6d0476b7939949db98d15c4e7ab1 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <abc@pompel.me>"
-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 63c47b8cb306a5443baf8b05a36ea63d0275fb2a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <mr.leino@gmail.com>"
-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 df48704309db8652834e73ff91d54195e5ebc09f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <leah@vuxu.org>"
-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 ff5376825664d2c2feeb60b96da60d9c0d830ddc Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <diogo@diogoleal.com>"
-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 5d131b28e176372078c77cd676498b930345cb1b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 3 May 2021 23:01:17 -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 <piraty1@inbox.ru>"
-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"
 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Merged]: Omnibus lint pass for SPDX issues, most packages starting with "J"
  2021-04-29  6:13 [PR PATCH] Omnibus lint pass for SPDX issues, most packages starting with "J" heliocat
                   ` (4 preceding siblings ...)
  2021-05-05  6:16 ` heliocat
@ 2021-05-17  3:45 ` ericonr
  5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-05-17  3:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1466 bytes --]

There's a merged pull request on the void-packages repository

Omnibus lint pass for SPDX issues, most packages starting with "J"
https://github.com/void-linux/void-packages/pull/30575

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl



^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2021-05-17  3:45 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-29  6:13 [PR PATCH] Omnibus lint pass for SPDX issues, most packages starting with "J" heliocat
2021-05-04  5:54 ` [PR PATCH] [Updated] " heliocat
2021-05-04  5:59 ` heliocat
2021-05-04  6:00 ` heliocat
2021-05-04  6:01 ` heliocat
2021-05-05  6:16 ` heliocat
2021-05-17  3:45 ` [PR PATCH] [Merged]: " ericonr

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git