From 9c6a8729f6553615786878b382d4d44d2a54eec0 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Nov 2017 16:14:00 +0000 Subject: [PATCH] Administrivia: Fix erroneous GPL3+ licence notices "version d or later" (!) Signed-off-by: Ian Jackson --- Makefile.in | 2 +- aclocal.m4 | 2 +- autogen.sh | 2 +- comm-common.c | 2 +- comm-common.h | 2 +- conffile.c | 2 +- conffile.fl | 2 +- conffile.h | 2 +- conffile_internal.h | 2 +- configure.in | 2 +- debian/changelog | 3 ++- hackypar.c | 2 +- hackypar.h | 2 +- ipaddr.c | 2 +- ipaddr.h | 2 +- log.c | 2 +- magic.h | 2 +- make-secnet-sites | 2 +- modules.c | 2 +- netlink.c | 2 +- netlink.h | 2 +- polypath-interface-monitor-linux | 2 +- polypath.c | 2 +- process.c | 2 +- process.h | 2 +- random.c | 2 +- resolver.c | 2 +- secnet.8 | 2 +- secnet.c | 2 +- secnet.h | 2 +- setup.mac | 2 +- site.c | 2 +- slip.c | 2 +- test-example/README | 2 +- transform-cbcmac.c | 2 +- transform-common.h | 2 +- transform-eax.c | 2 +- tun.c | 2 +- udp.c | 2 +- uk.org.greenend.secnet.plist | 2 +- unaligned.h | 2 +- util.c | 2 +- util.h | 2 +- 43 files changed, 44 insertions(+), 43 deletions(-) diff --git a/Makefile.in b/Makefile.in index c389a06..a8d7a65 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5,7 +5,7 @@ # # secnet 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 d of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # secnet is distributed in the hope that it will be useful, but diff --git a/aclocal.m4 b/aclocal.m4 index 13477df..970fb7d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -5,7 +5,7 @@ dnl See README for full list of copyright holders. dnl dnl secnet is free software; you can redistribute it and/or modify it dnl under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version d of the License, or +dnl the Free Software Foundation; either version 3 of the License, or dnl (at your option) any later version. dnl dnl secnet is distributed in the hope that it will be useful, but diff --git a/autogen.sh b/autogen.sh index 603c44c..dddafac 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,7 +5,7 @@ # # secnet 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 d of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # secnet is distributed in the hope that it will be useful, but diff --git a/comm-common.c b/comm-common.c index 4bbc871..b855b9d 100644 --- a/comm-common.c +++ b/comm-common.c @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/comm-common.h b/comm-common.h index ebb71b8..1e86864 100644 --- a/comm-common.h +++ b/comm-common.h @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/conffile.c b/conffile.c index 7f0202c..c03c1d8 100644 --- a/conffile.c +++ b/conffile.c @@ -5,7 +5,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/conffile.fl b/conffile.fl index c8df0e6..2ceb01b 100644 --- a/conffile.fl +++ b/conffile.fl @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/conffile.h b/conffile.h index a904c62..c4834b1 100644 --- a/conffile.h +++ b/conffile.h @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/conffile_internal.h b/conffile_internal.h index 81e821b..c2127ab 100644 --- a/conffile_internal.h +++ b/conffile_internal.h @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/configure.in b/configure.in index 76e7e12..2e37df7 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl See README for full list of copyright holders. dnl dnl secnet is free software; you can redistribute it and/or modify it dnl under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version d of the License, or +dnl the Free Software Foundation; either version 3 of the License, or dnl (at your option) any later version. dnl dnl secnet is distributed in the hope that it will be useful, but diff --git a/debian/changelog b/debian/changelog index 5834f29..e9b8c78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ secnet (0.4.4~) unstable; urgency=medium - * + Administrivia: + * Fix erroneous GPL3+ licence notices "version d or later" (!) -- diff --git a/hackypar.c b/hackypar.c index a93b3ee..25e41ea 100644 --- a/hackypar.c +++ b/hackypar.c @@ -5,7 +5,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/hackypar.h b/hackypar.h index 77be856..2f378d3 100644 --- a/hackypar.h +++ b/hackypar.h @@ -7,7 +7,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/ipaddr.c b/ipaddr.c index aa7ac04..d12af55 100644 --- a/ipaddr.c +++ b/ipaddr.c @@ -6,7 +6,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/ipaddr.h b/ipaddr.h index dfe6271..d8bc9fa 100644 --- a/ipaddr.h +++ b/ipaddr.h @@ -5,7 +5,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/log.c b/log.c index ddc2524..9778f03 100644 --- a/log.c +++ b/log.c @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/magic.h b/magic.h index 0f7e8d3..4fe83f3 100644 --- a/magic.h +++ b/magic.h @@ -5,7 +5,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/make-secnet-sites b/make-secnet-sites index a7f14de..7747c23 100755 --- a/make-secnet-sites +++ b/make-secnet-sites @@ -5,7 +5,7 @@ # # secnet 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 d of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # secnet is distributed in the hope that it will be useful, but diff --git a/modules.c b/modules.c index b3bdad8..24c1459 100644 --- a/modules.c +++ b/modules.c @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/netlink.c b/netlink.c index 83b470e..7add6d7 100644 --- a/netlink.c +++ b/netlink.c @@ -6,7 +6,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/netlink.h b/netlink.h index 63a33c1..93b556d 100644 --- a/netlink.h +++ b/netlink.h @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/polypath-interface-monitor-linux b/polypath-interface-monitor-linux index 0bb9b7e..3ecae59 100755 --- a/polypath-interface-monitor-linux +++ b/polypath-interface-monitor-linux @@ -5,7 +5,7 @@ # # secnet 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 d of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # secnet is distributed in the hope that it will be useful, but diff --git a/polypath.c b/polypath.c index 025909a..e3c31e6 100644 --- a/polypath.c +++ b/polypath.c @@ -7,7 +7,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/process.c b/process.c index 4cd21bd..3444308 100644 --- a/process.c +++ b/process.c @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/process.h b/process.h index 1a756fd..99681b0 100644 --- a/process.h +++ b/process.h @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/random.c b/random.c index 2680827..cdb0dfd 100644 --- a/random.c +++ b/random.c @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/resolver.c b/resolver.c index 06aa7c3..3a6ad5a 100644 --- a/resolver.c +++ b/resolver.c @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/secnet.8 b/secnet.8 index 32b449a..0b0afda 100644 --- a/secnet.8 +++ b/secnet.8 @@ -5,7 +5,7 @@ .\" .\" secnet 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 d of the License, or +.\" the Free Software Foundation; either version 3 of the License, or .\" (at your option) any later version. .\" .\" secnet is distributed in the hope that it will be useful, but diff --git a/secnet.c b/secnet.c index 1762fd7..c14a835 100644 --- a/secnet.c +++ b/secnet.c @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/secnet.h b/secnet.h index 10b6334..fe1f484 100644 --- a/secnet.h +++ b/secnet.h @@ -5,7 +5,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/setup.mac b/setup.mac index e280701..a7a7359 100755 --- a/setup.mac +++ b/setup.mac @@ -7,7 +7,7 @@ # # secnet 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 d of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # secnet is distributed in the hope that it will be useful, but diff --git a/site.c b/site.c index dcac0ba..e8ab493 100644 --- a/site.c +++ b/site.c @@ -6,7 +6,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/slip.c b/slip.c index a75d50e..6631fae 100644 --- a/slip.c +++ b/slip.c @@ -9,7 +9,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/test-example/README b/test-example/README index b9869d8..72f98ab 100644 --- a/test-example/README +++ b/test-example/README @@ -37,7 +37,7 @@ directory above) for full list of copyright holders. secnet 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 d of the License, or +the Free Software Foundation; either version 3 of the License, or (at your option) any later version. secnet is distributed in the hope that it will be useful, but diff --git a/transform-cbcmac.c b/transform-cbcmac.c index ca260f0..0631897 100644 --- a/transform-cbcmac.c +++ b/transform-cbcmac.c @@ -6,7 +6,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/transform-common.h b/transform-common.h index f90deef..f35b5f6 100644 --- a/transform-common.h +++ b/transform-common.h @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/transform-eax.c b/transform-eax.c index 5a7bd64..78f53ff 100644 --- a/transform-eax.c +++ b/transform-eax.c @@ -7,7 +7,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/tun.c b/tun.c index afb97d1..3ba62b3 100644 --- a/tun.c +++ b/tun.c @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/udp.c b/udp.c index 1535f29..9be56e1 100644 --- a/udp.c +++ b/udp.c @@ -6,7 +6,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/uk.org.greenend.secnet.plist b/uk.org.greenend.secnet.plist index 2339c00..f462c03 100644 --- a/uk.org.greenend.secnet.plist +++ b/uk.org.greenend.secnet.plist @@ -7,7 +7,7 @@ secnet 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 d of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. secnet is distributed in the hope that it will be useful, but diff --git a/unaligned.h b/unaligned.h index bce0e5f..2c48d0e 100644 --- a/unaligned.h +++ b/unaligned.h @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/util.c b/util.c index 7036061..c601f0f 100644 --- a/util.c +++ b/util.c @@ -11,7 +11,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but diff --git a/util.h b/util.h index 4e1f9d0..85de6df 100644 --- a/util.h +++ b/util.h @@ -4,7 +4,7 @@ * * secnet 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 d of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * secnet is distributed in the hope that it will be useful, but -- 2.30.2