Move most copyright notice text into LICENCE.txt

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/LICENCE.txt b/LICENCE.txt
new file mode 100644 (file)
index 0000000..b15b7fb
--- /dev/null
+++ b/LICENCE.txt
@@ -0,0 +1,20 @@
+Copyright 2010,2015,2022,2024 Ian Jackson <ijackson@chiark.greenend.org.uk>
+SPDX-License-Identifier: GPL-3.0-or-later
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 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
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+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, see <http://www.gnu.org/licenses/>.
+
+(I believe that when you compile and link this as part of the inn2
+build, with the Makefile runes I have provided, all the libraries
+and files which end up included in innduct are licence-compatible
+with GPLv3.  If not then please let me know.  -Ian Jackson.

diff --git a/Makefile.am b/Makefile.am
index 5560a3dba280bd2366560da14177d6b56f2e1efc..eb0f57dbb0ba24c1639f0d384ffbd98445a869c6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,25 +2,9 @@
 #  tailing reliable realtime streaming feeder for inn
 #  Makefile.am
 #
-#  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
-# 
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 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
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  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, see <http://www.gnu.org/licenses/>.
-#
-#  (I believe that when you compile and link this as part of the inn2
-#  build, with the Makefile runes I have provided, all the libraries
-#  and files which end up included in innduct are licence-compatible
-#  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+#  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+#  and contributors; see LICENCE.txt.
+#  SPDX-License-Identifier: GPL-3.0-or-later
 
 AUTOMAKE_OPTIONS=foreign
 

diff --git a/README.states b/README.states
index 29bbe6b33f3d599e1ec547a8b91d1275ad04ec36..01b0573e6ed93cde06024ef036364b43df3c5dfb 100644 (file)
--- a/README.states
+++ b/README.states
@@ -186,23 +186,6 @@ rune for printing diagrams:
 #  part of innduct
 #  tailing reliable realtime streaming feeder for inn
 #
-#  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
-# 
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 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
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  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, see <http://www.gnu.org/licenses/>.
-#
-#  (I believe that when you compile and link this as part of the inn2
-#  build, with the Makefile runes I have provided, all the libraries
-#  and files which end up included in innduct are licence-compatible
-#  with GPLv3.  If not then please let me know.  -Ian Jackson.)
-
+#  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+#  and contributors; see LICENCE.txt.
+#  SPDX-License-Identifier: GPL-3.0-or-later

diff --git a/cli.c b/cli.c
index 532f0981c22b4d40271f19db0e2bda8b6b24def2..941021bf43eec9f14a6b9030c5b751661e547145 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -3,25 +3,9 @@
  *  tailing reliable realtime streaming feeder for inn
  *  cli.c - command and control connections
  *
- *  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 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
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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, see <http://www.gnu.org/licenses/>.
- *
- *  (I believe that when you compile and link this as part of the inn2
- *  build, with the Makefile runes I have provided, all the libraries
- *  and files which end up included in innduct are licence-compatible
- *  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+ *  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *  and contributors; see LICENCE.txt.
+ *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include "innduct.h"

diff --git a/configure.ac b/configure.ac
index 7c59b0cefc0c8846d6b00c6c14c8fe35bccf92a6..dbd9e0588d67c46f8ebad718573a1bf08a41813d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,25 +2,9 @@
 #  tailing reliable realtime streaming feeder for inn
 #  configure.ac
 #
-#  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
-# 
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 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
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  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, see <http://www.gnu.org/licenses/>.
-#
-#  (I believe that when you compile and link this as part of the inn2
-#  build, with the Makefile runes I have provided, all the libraries
-#  and files which end up included in innduct are licence-compatible
-#  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+#  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+#  and contributors; see LICENCE.txt.
+#  SPDX-License-Identifier: GPL-3.0-or-later
 
 AC_INIT([innduct],[1.0],[duct.c])
 AC_CONFIG_AUX_DIR(autoconf-aux)

diff --git a/conn.c b/conn.c
index 9eee364db07f0d39ff773323d8a605763c44a030..814adc8b646cf6b00ee0b970f416bb461f0fdf16 100644 (file)
--- a/conn.c
+++ b/conn.c
@@ -3,25 +3,9 @@
  *  tailing reliable realtime streaming feeder for inn
  *  conn.c - connection establishment and teardown
  *
- *  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 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
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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, see <http://www.gnu.org/licenses/>.
- *
- *  (I believe that when you compile and link this as part of the inn2
- *  build, with the Makefile runes I have provided, all the libraries
- *  and files which end up included in innduct are licence-compatible
- *  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+ *  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *  and contributors; see LICENCE.txt.
+ *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include "innduct.h"

diff --git a/defer.c b/defer.c
index 99555deafcd574b6debf651466f77a9e612bec72..775d1c9afcf5da715397fea8075c7176d367f31e 100644 (file)
--- a/defer.c
+++ b/defer.c
@@ -3,25 +3,9 @@
  *  tailing reliable realtime streaming feeder for inn
  *  defer.c - handling of defer and backlog files
  *
- *  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 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
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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, see <http://www.gnu.org/licenses/>.
- *
- *  (I believe that when you compile and link this as part of the inn2
- *  build, with the Makefile runes I have provided, all the libraries
- *  and files which end up included in innduct are licence-compatible
- *  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+ *  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *  and contributors; see LICENCE.txt.
+ *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include "innduct.h"

diff --git a/duct.c b/duct.c
index 29b8ea64ff0cf6d7607f2430483e237894e375c1..bf8c8087842c986400cfd1598bf3191876f1b046 100644 (file)
--- a/duct.c
+++ b/duct.c
@@ -3,25 +3,9 @@
  *  tailing reliable realtime streaming feeder for inn
  *  duct.c - main program, option parsing and startup
  *
- *  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 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
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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, see <http://www.gnu.org/licenses/>.
- *
- *  (I believe that when you compile and link this as part of the inn2
- *  build, with the Makefile runes I have provided, all the libraries
- *  and files which end up included in innduct are licence-compatible
- *  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+ *  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *  and contributors; see LICENCE.txt.
+ *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include "innduct.h"
@@ -401,9 +385,9 @@ static void printusage(FILE *f) {
 
 static void printcopyright(FILE *f) {
   fputs(
- "innduct is Copyright (C)2010 Ian Jackson.\n"
+ "innduct is Copyright Ian Jackson and contributors.\n"
  "It is free software, licenced under GPL version 3 or later.\n"
- "It is provided WITHOUT ANY WARRANTY.  See the file GPL-3 for details\n",
+ "There is NO WARRANTY.  See the file LICENCE.txt for details.\n",
         stderr);
 }
 

diff --git a/filemon.c b/filemon.c
index a293fe85e7d3e0bfd1a4ab9b04ec0a299f142c1d..c531f40c32e15db0b182b701a3d4c40df4d6d001 100644 (file)
--- a/filemon.c
+++ b/filemon.c
@@ -3,25 +3,9 @@
  *  tailing reliable realtime streaming feeder for inn
  *  filemon.c - file monitoring (inotify, kqueue, poll, etc.)
  *
- *  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 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
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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, see <http://www.gnu.org/licenses/>.
- *
- *  (I believe that when you compile and link this as part of the inn2
- *  build, with the Makefile runes I have provided, all the libraries
- *  and files which end up included in innduct are licence-compatible
- *  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+ *  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *  and contributors; see LICENCE.txt.
+ *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include "innduct.h"

diff --git a/help.c b/help.c
index 46a784eb04d6817a469cdd9507536bfdadebb6cf..cd563c4092c936e6b6db5ba50faa99c7611def29 100644 (file)
--- a/help.c
+++ b/help.c
@@ -3,25 +3,9 @@
  *  tailing reliable realtime streaming feeder for inn
  *  help.c - logging and utility functions
  *
- *  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 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
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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, see <http://www.gnu.org/licenses/>.
- *
- *  (I believe that when you compile and link this as part of the inn2
- *  build, with the Makefile runes I have provided, all the libraries
- *  and files which end up included in innduct are licence-compatible
- *  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+ *  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *  and contributors; see LICENCE.txt.
+ *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include "innduct.h"

diff --git a/infile.c b/infile.c
index b8e01bcfc6f6ad200a19741f70bcfa14a2f7dd1a..9a1af7e4af0658a5fdcef66ccbafe9c1c439b1b5 100644 (file)
--- a/infile.c
+++ b/infile.c
@@ -3,25 +3,9 @@
  *  tailing reliable realtime streaming feeder for inn
  *  infile.c - monitoring and handling of input files
  *
- *  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 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
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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, see <http://www.gnu.org/licenses/>.
- *
- *  (I believe that when you compile and link this as part of the inn2
- *  build, with the Makefile runes I have provided, all the libraries
- *  and files which end up included in innduct are licence-compatible
- *  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+ *  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *  and contributors; see LICENCE.txt.
+ *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include "innduct.h"

diff --git a/innduct.h b/innduct.h
index d82033a5b5ec7ae9809a4973417ace1dc5f29e51..c85d057386bc3c5e413ed32be0939754195f928c 100644 (file)
--- a/innduct.h
+++ b/innduct.h
@@ -2,25 +2,9 @@
  *  innduct
  *  tailing reliable realtime streaming feeder for inn
  *
- *  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 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
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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, see <http://www.gnu.org/licenses/>.
- *
- *  (I believe that when you compile and link this as part of the inn2
- *  build, with the Makefile runes I have provided, all the libraries
- *  and files which end up included in innduct are licence-compatible
- *  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+ *  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *  and contributors; see LICENCE.txt.
+ *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #ifndef INNDUCT_H

diff --git a/recv.c b/recv.c
index b163f9cf747a29570d104411a8987368939ce3b4..44587bf1fb954dca661bf9e1a0569b1f5b26b26a 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -3,25 +3,9 @@
  *  tailing reliable realtime streaming feeder for inn
  *  recv.c - receiving peer responses and disposing of articles
  *
- *  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 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
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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, see <http://www.gnu.org/licenses/>.
- *
- *  (I believe that when you compile and link this as part of the inn2
- *  build, with the Makefile runes I have provided, all the libraries
- *  and files which end up included in innduct are licence-compatible
- *  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+ *  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *  and contributors; see LICENCE.txt.
+ *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include "innduct.h"

diff --git a/statemc.c b/statemc.c
index fb372468f637cd0a82e23a4cb2bfce77446e5970..26b5c22e4673aabd319401d17ba5e9cfc3c586e8 100644 (file)
--- a/statemc.c
+++ b/statemc.c
@@ -3,25 +3,9 @@
  *  tailing reliable realtime streaming feeder for inn
  *  statemc.c - state machine core (see README.states).
  *
- *  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 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
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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, see <http://www.gnu.org/licenses/>.
- *
- *  (I believe that when you compile and link this as part of the inn2
- *  build, with the Makefile runes I have provided, all the libraries
- *  and files which end up included in innduct are licence-compatible
- *  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+ *  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *  and contributors; see LICENCE.txt.
+ *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include "innduct.h"

diff --git a/xmit.c b/xmit.c
index c4b1854717333b05249bf009e33387fe9b8d13de..96e599af02eaceea39fb79864a5ab2cb9468dd37 100644 (file)
--- a/xmit.c
+++ b/xmit.c
@@ -3,25 +3,9 @@
  *  tailing reliable realtime streaming feeder for inn
  *  xmit.c - transmitting checks and articles, flow control, expiry
  *
- *  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 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
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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, see <http://www.gnu.org/licenses/>.
- *
- *  (I believe that when you compile and link this as part of the inn2
- *  build, with the Makefile runes I have provided, all the libraries
- *  and files which end up included in innduct are licence-compatible
- *  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+ *  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *  and contributors; see LICENCE.txt.
+ *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include "innduct.h"