From: Ian Jackson Date: Thu, 1 Feb 2024 20:16:54 +0000 (+0000) Subject: Move most copyright notice text into LICENCE.txt X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=9d299e27352320f0b8a0c64f727908507e807322;p=innduct.git Move most copyright notice text into LICENCE.txt Signed-off-by: Ian Jackson --- diff --git a/LICENCE.txt b/LICENCE.txt new file mode 100644 index 0000000..b15b7fb --- /dev/null +++ b/LICENCE.txt @@ -0,0 +1,20 @@ +Copyright 2010,2015,2022,2024 Ian Jackson +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 . + +(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 5560a3d..eb0f57d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,25 +2,9 @@ # tailing reliable realtime streaming feeder for inn # Makefile.am # -# Copyright (C) 2010 Ian Jackson -# -# 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 . -# -# (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 +# 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 29bbe6b..01b0573 100644 --- 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 -# -# 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 . -# -# (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 +# and contributors; see LICENCE.txt. +# SPDX-License-Identifier: GPL-3.0-or-later diff --git a/cli.c b/cli.c index 532f098..941021b 100644 --- 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 - * - * 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 . - * - * (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 + * 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 7c59b0c..dbd9e05 100644 --- a/configure.ac +++ b/configure.ac @@ -2,25 +2,9 @@ # tailing reliable realtime streaming feeder for inn # configure.ac # -# Copyright (C) 2010 Ian Jackson -# -# 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 . -# -# (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 +# 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 9eee364..814adc8 100644 --- 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 - * - * 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 . - * - * (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 + * 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 99555de..775d1c9 100644 --- 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 - * - * 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 . - * - * (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 + * 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 29b8ea6..bf8c808 100644 --- 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 - * - * 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 . - * - * (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 + * 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 a293fe8..c531f40 100644 --- 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 - * - * 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 . - * - * (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 + * 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 46a784e..cd563c4 100644 --- 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 - * - * 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 . - * - * (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 + * 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 b8e01bc..9a1af7e 100644 --- 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 - * - * 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 . - * - * (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 + * 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 d82033a..c85d057 100644 --- a/innduct.h +++ b/innduct.h @@ -2,25 +2,9 @@ * innduct * tailing reliable realtime streaming feeder for inn * - * Copyright (C) 2010 Ian Jackson - * - * 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 . - * - * (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 + * 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 b163f9c..44587bf 100644 --- 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 - * - * 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 . - * - * (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 + * 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 fb37246..26b5c22 100644 --- 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 - * - * 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 . - * - * (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 + * 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 c4b1854..96e599a 100644 --- 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 - * - * 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 . - * - * (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 + * and contributors; see LICENCE.txt. + * SPDX-License-Identifier: GPL-3.0-or-later */ #include "innduct.h"