From: "cron2 (Code Review)" Date: Sun, 3 Aug 2025 14:48:31 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="yhLxdQzZ+QY="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Update text of GPL to latest version from FSF List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --yhLxdQzZ+QY= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/11= 23?usp=3Demail ) Change subject: Update text of GPL to latest version from FSF ...................................................................... Update text of GPL to latest version from FSF This mostly removes the postal address of the FSF. This was triggered by rpmlint complaining about that address being outdated. Change-Id: Idfe5c615d1109a1038207c1c1b0e0de4da3279f5 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Message-Id: <20250803143939.15335-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 475.html Signed-off-by: Gert Doering --- M COPYRIGHT.GPL M tests/unit_tests/openvpn/test_misc.c 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/COPYRIGHT.GPL b/COPYRIGHT.GPL index 2a591d0..9efa6fb 100644 --- a/COPYRIGHT.GPL +++ b/COPYRIGHT.GPL @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -294,8 +294,9 @@ Copyright (C) This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 - as published by the Free Software Foundation. + it 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -303,8 +304,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + with this program; if not, see . Also add information on how to contact you by electronic and paper mail. @@ -328,8 +328,8 @@ Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. - , 1 April 1989 - Ty Coon, President of Vice + , 1 April 1989 + Moe Ghoul, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may diff --git a/tests/unit_tests/openvpn/test_misc.c b/tests/unit_tests/openvp= n/test_misc.c index 0c604ff..0981a1a 100644 --- a/tests/unit_tests/openvpn/test_misc.c +++ b/tests/unit_tests/openvpn/test_misc.c @@ -240,7 +240,7 @@ while (c); } - assert_int_equal(wordcount, 2978); + assert_int_equal(wordcount, 2971); /* remove some words from the table */ { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1123?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Idfe5c615d1109a1038207c1c1b0e0de4da3279f5 Gerrit-Change-Number: 1123 Gerrit-PatchSet: 3 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --yhLxdQzZ+QY= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

Update text of GPL to latest version from FSF=


This mostly removes the postal address of the FSF.

This was = triggered by rpmlint complaining about
that address being outdated.
<= br>Change-Id: Idfe5c615d1109a1038207c1c1b0e0de4da3279f5
Signed-off-by: F= rank Lichtenheld <frank@...2641...>
Acked-by: Gert Doering <ger= t@...1296...>
Message-Id: <20250803143939.15335-1-gert@...1296...&= gt;
URL: https://www.mail-archive.com/openvpn-devel@...475...= t/msg32475.html
Signed-off-by: Gert Doering <gert@...1296...>
-= --
M COPYRIGHT.GPL
M tests/unit_tests/openvpn/test_misc.c
2 files = changed, 8 insertions(+), 8 deletions(-)

diff --git a/COPYRIGHT.GPL b/COPYRIGHT.GPL
index 2a591d0= ..9efa6fb 100644
--- a/COPYRIGHT.GPL
+++ b/= COPYRIGHT.GPL
@@ -2,7 +2,7 @@
= Version 2, June 1991

Copyrig= ht (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02= 110-1301 USA
+ <ht= tps://fsf.org/>
Everyone is permitted to copy and dist= ribute verbatim copies
of this license document, but chan= ging it is not allowed.

@@ -294,8 +294,9 = @@
Copyright (C) <year> <name of author><= /span>

This program is free software; you c= an redistribute it and/or modify
- it under the terms of the GNU General Public License version= 2
- as published by= the Free Software Foundation.
+ it under the terms of the GNU General Public License as publ= ished by
+ the Fre= e Software Foundation; either version 2 of the License, or
+ (at your option) any later versi= on.

This program is distributed in t= he hope that it will be useful,
but WITHOUT ANY WARRAN= TY; without even the implied warranty of
@@ -303,8 +304,7 @= @
GNU General Public License for more details.<= br>
You should have received a copy of the GNU = General Public License along
- with this program; if not, write to the Free Software Foundation= , Inc.,
- 51 Frankli= n Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ with this program; if not, see <https:= //www.gnu.org/licenses/>.

Also add in= formation on how to contact you by electronic and paper mail.

@@ -328,8 +328,8 @@
Yoyodyne, Inc.,= hereby disclaims all copyright interest in the program
= `Gnomovision' (which makes passes at compilers) written by James Hacker= .

- = <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
+ <signature of Moe Ghoul>, 1 April 198= 9
+ Moe Ghoul, Presi= dent of Vice

This General Public License= does not permit incorporating your program into
proprieta= ry programs. If your program is a subroutine library, you may
diff --git a/tests/unit_tests/openvpn/test_misc.c b/tests/unit_tests/op= envpn/test_misc.c
index 0c604ff..0981a1a 100644
<= span>--- a/tests/unit_tests/openvpn/test_misc.c
+++ b/tests= /unit_tests/openvpn/test_misc.c
@@ -240,7 +240,7 @@<= br> while (c);
}

- assert_int_equal(wordco= unt, 2978);
+ asse= rt_int_equal(wordcount, 2971);

/* re= move some words from the table */
{

To view, visit change 1123. To unsubscribe, or for help writi= ng mail filters, visit setti= ngs.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Idfe5c615d1109a1038207c1c1b0= e0de4da3279f5
Gerrit-Change-Number: 1123
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--yhLxdQzZ+QY=--