[PATCH] passt.1, qrap.1: align license description with SPDX identifier

[PATCH] passt.1, qrap.1: align license description with SPDX identifier

[Danish Prakash]

The SPDX identifier states GPL-2.0-or-later but the copyright section
mentions GPL-3.0 or later causing a mismatch.

Signed-off-by: Danish Prakash <contact@danishpraka.sh>
---
 passt.1 | 2 +-
 qrap.1  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/passt.1 b/passt.1
index 3a23a43cc2e2..7d414f38e341 100644
--- a/passt.1
+++ b/passt.1
@@ -978,7 +978,7 @@ Copyright (c) 2020-2022 Red Hat GmbH.
 
 \fBpasst\fR and \fBpasta\fR are free software: you can redistribute them and/or
 modify them under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the License, or
+published by the Free Software Foundation, either version 2 of the License, or
 (at your option) any later version. 
 
 .SH SEE ALSO
diff --git a/qrap.1 b/qrap.1
index c9e0598d64fb..8704c31cb8ce 100644
--- a/qrap.1
+++ b/qrap.1
@@ -67,7 +67,7 @@ Copyright (c) 2020-2021 Red Hat GmbH.
 
 \fBqrap\fR is free software: you can redistribute is and/or modify it under the
 terms of the GNU Affero General Public License as published by the Free Software
-Foundation, either version 3 of the License, or (at your option) any later
+Foundation, either version 2 of the License, or (at your option) any later
 version. 
 
 .SH SEE ALSO
-- 
@@ -67,7 +67,7 @@ Copyright (c) 2020-2021 Red Hat GmbH.
 
 \fBqrap\fR is free software: you can redistribute is and/or modify it under the
 terms of the GNU Affero General Public License as published by the Free Software
-Foundation, either version 3 of the License, or (at your option) any later
+Foundation, either version 2 of the License, or (at your option) any later
 version. 
 
 .SH SEE ALSO
-- 
2.45.2

Re: [PATCH] passt.1, qrap.1: align license description with SPDX identifier

[Stefano Brivio]

Hi Danish,

On Wed, 19 Jun 2024 13:24:12 +0530
Danish Prakash <contact@danishpraka.sh> wrote:

> The SPDX identifier states GPL-2.0-or-later but the copyright section
> mentions GPL-3.0 or later causing a mismatch.

Oops, I missed this bit in ca2749e1bd52 ("passt: Relicense to GPL 2.0,
or any later version").

Thanks for the patch! Just one comment:

> Signed-off-by: Danish Prakash <contact@danishpraka.sh>
> ---
>  passt.1 | 2 +-
>  qrap.1  | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/passt.1 b/passt.1
> index 3a23a43cc2e2..7d414f38e341 100644
> --- a/passt.1
> +++ b/passt.1
> @@ -978,7 +978,7 @@ Copyright (c) 2020-2022 Red Hat GmbH.
>  
>  \fBpasst\fR and \fBpasta\fR are free software: you can redistribute them and/or
>  modify them under the terms of the GNU Affero General Public License as
> -published by the Free Software Foundation, either version 3 of the License, or
> +published by the Free Software Foundation, either version 2 of the License, or

The reference to the AGPL should go away altogether: the reference here
should simply be to "the GNU General Public License, version 2 or
later".

See also 05627dc5127b ("util: Fix licensing information display in
--version").

-- 
Stefano

[PATCH] passt.1, qrap.1: align license description with SPDX identifier

[Danish Prakash]

The SPDX identifier states GPL-2.0-or-later but the copyright section
mentions GPL-3.0 or later causing a mismatch.

Also, only correctly refers to GPL instead of AGPL.

Signed-off-by: Danish Prakash <contact@danishpraka.sh>
---
 passt.1 | 4 ++--
 qrap.1  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/passt.1 b/passt.1
index 3a23a43cc2e2..8e0fec0fcda5 100644
--- a/passt.1
+++ b/passt.1
@@ -977,8 +977,8 @@ https://passt.top/passt/lists.
 Copyright (c) 2020-2022 Red Hat GmbH.
 
 \fBpasst\fR and \fBpasta\fR are free software: you can redistribute them and/or
-modify them under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the License, or
+modify them under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 2 of the License, or
 (at your option) any later version. 
 
 .SH SEE ALSO
diff --git a/qrap.1 b/qrap.1
index c9e0598d64fb..98cc877b3d20 100644
--- a/qrap.1
+++ b/qrap.1
@@ -66,8 +66,8 @@ issues to Stefano Brivio <sbrivio@redhat.com>.
 Copyright (c) 2020-2021 Red Hat GmbH.
 
 \fBqrap\fR is free software: you can redistribute is and/or modify it under the
-terms of the GNU Affero General Public License as published by the Free Software
-Foundation, either version 3 of the License, or (at your option) any later
+terms of the GNU General Public License as published by the Free Software
+Foundation, either version 2 of the License, or (at your option) any later
 version. 
 
 .SH SEE ALSO
-- 
@@ -66,8 +66,8 @@ issues to Stefano Brivio <sbrivio@redhat.com>.
 Copyright (c) 2020-2021 Red Hat GmbH.
 
 \fBqrap\fR is free software: you can redistribute is and/or modify it under the
-terms of the GNU Affero General Public License as published by the Free Software
-Foundation, either version 3 of the License, or (at your option) any later
+terms of the GNU General Public License as published by the Free Software
+Foundation, either version 2 of the License, or (at your option) any later
 version. 
 
 .SH SEE ALSO
-- 
2.45.2

Re: [PATCH] passt.1, qrap.1: align license description with SPDX identifier

[Danish Prakash]

On 6/19/24 2:15 PM, Stefano Brivio wrote:
> Oops, I missed this bit in ca2749e1bd52 ("passt: Relicense to GPL 2.0,
> or any later version").

No worries, our license bot found the mismatch and refused to let the
package be accepted.

> The reference to the AGPL should go away altogether: the reference here
> should simply be to "the GNU General Public License, version 2 or
> later".
> 
> See also 05627dc5127b ("util: Fix licensing information display in
> --version").

Fixed


-- 
danishpraka.sh

Re: [PATCH] passt.1, qrap.1: align license description with SPDX identifier

[Stefano Brivio]

On Wed, 19 Jun 2024 15:10:55 +0530
Danish Prakash <contact@danishpraka.sh> wrote:

> The SPDX identifier states GPL-2.0-or-later but the copyright section
> mentions GPL-3.0 or later causing a mismatch.
> 
> Also, only correctly refers to GPL instead of AGPL.
> 
> Signed-off-by: Danish Prakash <contact@danishpraka.sh>

Applied, thanks. For the next time, note that if you post a new version
of a patch, it's customary to indicate the version number with v<n>
after the patch tag, for example [PATCH v2].

You can do that with 'git format-patch --subject-prefix="PATCH v2"'.

Alternatively, there are also tools such as git-publish
(https://github.com/stefanha/git-publish) that do this for you
automatically.

-- 
Stefano