Following Simon's patch in Gnulib, replacing the old FSF postal address
with a link [1].
[1] https://lists.gnu.org/archive/html/bug-gnulib/2024-09/msg00004.html
>From 5a95e8f44f24ae3530116cadca7aa18a2b676e88 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.fu...@gmail.com>
Date: Mon, 2 Sep 2024 11:39:54 -0700
Subject: [PATCH] Avoid using postal address in license.
* lib/colorize-posix.c, lib/colorize-w32.c, lib/colorize.h:
* src/dfasearch.c, src/die.h, src/grep.c, src/grep.h, src/kwsearch.c:
* src/kwset.c, src/kwset.h, src/pcresearch.c, src/search.h:
* src/searchutils.c, src/system.h, tests/get-mb-cur-max.c: Update
license header.
---
lib/colorize-posix.c | 4 +---
lib/colorize-w32.c | 4 +---
lib/colorize.h | 4 +---
src/dfasearch.c | 4 +---
src/die.h | 4 +---
src/grep.c | 4 +---
src/grep.h | 4 +---
src/kwsearch.c | 4 +---
src/kwset.c | 4 +---
src/kwset.h | 4 +---
src/pcresearch.c | 4 +---
src/search.h | 4 +---
src/searchutils.c | 4 +---
src/system.h | 4 +---
tests/get-mb-cur-max.c | 4 +---
15 files changed, 15 insertions(+), 45 deletions(-)
diff --git a/lib/colorize-posix.c b/lib/colorize-posix.c
index 273a617..4d54397 100644
--- a/lib/colorize-posix.c
+++ b/lib/colorize-posix.c
@@ -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/>. */
/* Without this pragma, gcc 4.7.0 20120102 suggests that the
init_colorize function might be candidate for attribute 'const' */
diff --git a/lib/colorize-w32.c b/lib/colorize-w32.c
index 1d6a030..2230c96 100644
--- a/lib/colorize-w32.c
+++ b/lib/colorize-w32.c
@@ -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 by Eli Zaretskii. */
diff --git a/lib/colorize.h b/lib/colorize.h
index 9d6cc98..360257e 100644
--- a/lib/colorize.h
+++ b/lib/colorize.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/>. */
extern int should_colorize (void);
extern void init_colorize (void);
diff --git a/src/dfasearch.c b/src/dfasearch.c
index d28d90d..c9f350c 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -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 August 1992 by Mike Haertel. */
diff --git a/src/die.h b/src/die.h
index accf3fd..ba445e5 100644
--- a/src/die.h
+++ b/src/die.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/>. */
#ifndef DIE_H
#define DIE_H
diff --git a/src/grep.c b/src/grep.c
index 669238b..78356f3 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -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 July 1992 by Mike Haertel. */
diff --git a/src/grep.h b/src/grep.h
index ad7f932..6ac3910 100644
--- a/src/grep.h
+++ b/src/grep.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/>. */
#ifndef GREP_GREP_H
#define GREP_GREP_H 1
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 20d71f1..5a744cb 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -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 August 1992 by Mike Haertel. */
diff --git a/src/kwset.c b/src/kwset.c
index 1848a9a..f121ffd 100644
--- a/src/kwset.c
+++ b/src/kwset.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 August 1989 by Mike Haertel. */
diff --git a/src/kwset.h b/src/kwset.h
index 3e9ab43..adbfc25 100644
--- a/src/kwset.h
+++ b/src/kwset.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 August 1989 by Mike Haertel. */
diff --git a/src/pcresearch.c b/src/pcresearch.c
index 052a371..10dd918 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -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/>. */
#include <config.h>
diff --git a/src/search.h b/src/search.h
index 237b2d7..0749e7b 100644
--- a/src/search.h
+++ b/src/search.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/>. */
#ifndef GREP_SEARCH_H
#define GREP_SEARCH_H 1
diff --git a/src/searchutils.c b/src/searchutils.c
index 8491927..7613961 100644
--- a/src/searchutils.c
+++ b/src/searchutils.c
@@ -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/>. */
#include <config.h>
diff --git a/src/system.h b/src/system.h
index 2a6611e..aba86d3 100644
--- a/src/system.h
+++ b/src/system.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/>. */
#ifndef GREP_SYSTEM_H
#define GREP_SYSTEM_H 1
diff --git a/tests/get-mb-cur-max.c b/tests/get-mb-cur-max.c
index 4f55394..6f864b9 100644
--- a/tests/get-mb-cur-max.c
+++ b/tests/get-mb-cur-max.c
@@ -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/>. */
#include <config.h>
#include <locale.h>
--
2.46.0
