Re: FSF office adddress update

[Simon Josefsson]

See below - the Franklin Street address for FSF is obsolete.  I think
gnulib has changed most files to use newer style blurbs without postal
addresses already, but the following files seems to remain:

jas@kaka:~/src/gnulib$ rgrep -i franklin .
./doc/COPYING.LESSERv2: 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 
 USA
./doc/COPYING.LESSERv2:    Foundation, Inc., 51 Franklin Street, Fifth Floor, 
Boston, MA  02110-1301  USA
./doc/COPYINGv2: 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
./doc/COPYINGv2:    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
./doc/lgpl-2.1.texi:51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
./doc/lgpl-2.1.texi:Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA 02110-1301,
./doc/gpl-2.0.texi:51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
./doc/gpl-2.0.texi:Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA  02110-1301, USA.
grep: ./.git/objects/pack/pack-7d04541358cfd976f694749df43e1b715f62bbc6.pack: 
binär fil matchar
./tests/test-dfa-match-aux.c:   Foundation, Inc., 51 Franklin Street - Fifth 
Floor, Boston, MA
./lib/localeinfo.c:   Foundation, Inc., 51 Franklin Street - Fifth Floor, 
Boston, MA
./lib/dfa.c:   51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA */
./lib/dfa.h:   51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA */
./lib/localeinfo.h:   Foundation, Inc., 51 Franklin Street - Fifth Floor, 
Boston, MA
jas@kaka:~/src/gnulib$

Seeing the license files are synced from other repository, I didn't want
to touch them but I fixed the other remaining files with the attached
patch.

/Simon

Richard Stallman <rms@gnu.org> writes:

> [[[ To any NSA and FBI agents reading my email: please consider    ]]]
> [[[ whether defending the US Constitution against all enemies,     ]]]
> [[[ foreign or domestic, requires you to follow Snowden's example. ]]]
>
> The FSF has changed its address -- please update this anywhere it is used.
>
> Free Software Foundation
> 31 Milk St # 960789
> Boston, MA 02196
> USA

From bf31b26be8574bd64fbd7e5456740d7d029b311c Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Sun, 1 Sep 2024 15:05:24 +0200
Subject: [PATCH] Avoid using postal address in license

* lib/dfa.h, lib/dfa.c: Update license header.
* lib/localeinfo.h, lib/localeinfo.c: Likewise.
* tests/test-dfa-match-aux.c: Likewise.
---
 ChangeLog                  | 7 +++++++
 lib/dfa.c                  | 4 +---
 lib/dfa.h                  | 4 +---
 lib/localeinfo.c           | 4 +---
 lib/localeinfo.h           | 4 +---
 tests/test-dfa-match-aux.c | 4 +---
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 25826b49c2..537d05ad7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-09-01  Simon Josefsson  <simon@josefsson.org>
+
+       Avoid using postal address in license
+       * lib/dfa.h, lib/dfa.c: Update license header.
+       * lib/localeinfo.h, lib/localeinfo.c: Likewise.
+       * tests/test-dfa-match-aux.c: Likewise.
+
 2024-09-01  Bruno Haible  <bruno@clisp.org>
 
        Fix mbscasestr test failure on native Windows with MSVC.
diff --git a/lib/dfa.c b/lib/dfa.c
index a7a969b6ca..9bddc777bc 100644
--- a/lib/dfa.c
+++ b/lib/dfa.c
@@ -13,9 +13,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 */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written June, 1988 by Mike Haertel
    Modified July, 1988 by Arthur David Olson to assist BMG speedups  */
diff --git a/lib/dfa.h b/lib/dfa.h
index b015073833..4653add584 100644
--- a/lib/dfa.h
+++ b/lib/dfa.h
@@ -12,9 +12,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 */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written June, 1988 by Mike Haertel */
 
diff --git a/lib/localeinfo.c b/lib/localeinfo.c
index 67af44a6ff..c90f1d76b5 100644
--- a/lib/localeinfo.c
+++ b/lib/localeinfo.c
@@ -13,9 +13,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.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/localeinfo.h b/lib/localeinfo.h
index f8863edf53..765c237186 100644
--- a/lib/localeinfo.h
+++ b/lib/localeinfo.h
@@ -13,9 +13,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.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/tests/test-dfa-match-aux.c b/tests/test-dfa-match-aux.c
index 112f9dd918..3a66bc62ef 100644
--- a/tests/test-dfa-match-aux.c
+++ b/tests/test-dfa-match-aux.c
@@ -13,9 +13,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.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <locale.h>
-- 
2.45.2

signature.asc
Description: PGP signature