From: "flichtenheld (Code Review)" Date: Thu, 31 Jul 2025 13:17:33 +0000 In-Reply-To: References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <5c01cd4176cddc0854ace28cf3cf5120d2e4b094-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="SKms9QkEQCI="; 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: plaisthos Cc: openvpn-devel --SKms9QkEQCI= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1123?usp=3Demail to look at the new patch set (#2). 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 --- M COPYRIGHT.GPL M tests/unit_tests/openvpn/test_misc.c 2 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/23/1123/2 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: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-MessageType: newpatchset --SKms9QkEQCI= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: plaisthos.

flichtenheld uploaded patch set #2 to this change.

<= p>View C= hange

Update text of GPL to latest version from FSF

This mostly = removes the postal address of the
FSF.

This was triggered by rpml= int complaining about
that address being outdated.

Change-Id: Idf= e5c615d1109a1038207c1c1b0e0de4da3279f5
Signed-off-by: Frank Lichtenheld = <frank@...2641...>
---
M COPYRIGHT.GPL
M tests/unit_tests/op= envpn/test_misc.c
2 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/23/1123/2=
diff --git a/COPYRIGHT.GPL b/COPYRIGHT.GPL
index 2= a591d0..9efa6fb 100644
--- a/COPYRIGHT.GPL
= +++ b/COPYRIGHT.GPL
@@ -2,7 +2,7 @@
= Version 2, June 1991

C= opyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston,= MA 02110-1301 USA
+ = <https://fsf.org/>
Everyone is permitted to copy an= d distribute verbatim copies
of this license document, bu= t changing it is not allowed.

@@ -294,8 += 294,9 @@
Copyright (C) <year> <name of autho= r>

This program is free software;= you can redistribute it and/or modify
- it under the terms of the GNU General Public License v= ersion 2
- as publis= hed by the Free Software Foundation.
+ it under the terms of the GNU General Public License a= s published by
+ t= he Free Software Foundation; either version 2 of the License, or
= + (at your option) any later= version.

This program is distribute= d in the hope that it will be useful,
but WITHOUT ANY = WARRANTY; without even the implied warranty of
@@ -303,8 +3= 04,7 @@
GNU General Public License for more details.

You should have received a copy of th= e GNU General Public License along
- with this program; if not, write to the Free Software Foun= dation, Inc.,
- 51 F= ranklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ with this program; if not, see <= https://www.gnu.org/licenses/>.

Also = add information on how to contact you by electronic and paper mail.<= br>
@@ -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 Apr= il 1989
+ Moe Ghoul,= President of Vice

This General Public L= icense does not permit incorporating your program into
pro= prietary programs. If your program is a subroutine library, you may=
diff --git a/tests/unit_tests/openvpn/test_misc.c b/tests/unit_te= sts/openvpn/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 change 1123. To unsubscribe, or for help= writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Idfe5c615d1109a1038207c1c1b0= e0de4da3279f5
Gerrit-Change-Number: 1123
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-MessageType: newpatchset
--SKms9QkEQCI=--