From 896fdc18c430d8f6a5e5bd417b9ab0d3254941da Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 17 Jun 2016 11:38:02 -0400 Subject: simplify licenses to match what LICENSE.txt says --- Makefile | 22 ++++++++-------------- src/nshd/hackers_git/check_password.go | 5 ----- src/nshd/hackers_git/db_config.go | 5 ----- src/nshd/hackers_git/db_group.go | 5 ----- src/nshd/hackers_git/db_pam.go | 5 ----- src/nshd/hackers_git/db_passwd.go | 5 ----- src/nshd/hackers_git/db_shadow.go | 5 ----- src/nshd/hackers_git/gid.go | 5 ----- src/nshd/hackers_git/hackers.go | 5 ----- src/nshd/hackers_git/hackers_parse.go | 5 ----- src/nshd/hackers_git/set.go | 5 ----- src/nshd/main.go.in | 5 ----- 12 files changed, 8 insertions(+), 69 deletions(-) diff --git a/Makefile b/Makefile index da11652..d7cee40 100644 --- a/Makefile +++ b/Makefile @@ -1,23 +1,17 @@ # Copyright 2015-2016 Luke Shumaker . # -# This 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 2 of -# the License, or (at your option) any later version. +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# The GNU General Public License's references to "object code" and -# "executables" are to be interpreted to also include the output of -# any document formatting or typesetting system, including -# intermediate and printed output. -# -# This software is distributed in the hope that it will be useful, +# 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. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this manual; if not, see -# . +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . prefix=/usr bindir=$(libexecdir)/$(PACKAGE) diff --git a/src/nshd/hackers_git/check_password.go b/src/nshd/hackers_git/check_password.go index cde70d3..84a5a24 100644 --- a/src/nshd/hackers_git/check_password.go +++ b/src/nshd/hackers_git/check_password.go @@ -5,11 +5,6 @@ // published by the Free Software Foundation; either version 2 of // the License, or (at your option) any later version. // -// The GNU General Public License's references to "object code" and -// "executables" are to be interpreted to also include the output of -// any document formatting or typesetting system, including -// intermediate and printed output. -// // This software 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 diff --git a/src/nshd/hackers_git/db_config.go b/src/nshd/hackers_git/db_config.go index 5f5fea9..cdbb7db 100644 --- a/src/nshd/hackers_git/db_config.go +++ b/src/nshd/hackers_git/db_config.go @@ -5,11 +5,6 @@ // published by the Free Software Foundation; either version 2 of // the License, or (at your option) any later version. // -// The GNU General Public License's references to "object code" and -// "executables" are to be interpreted to also include the output of -// any document formatting or typesetting system, including -// intermediate and printed output. -// // This software 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 diff --git a/src/nshd/hackers_git/db_group.go b/src/nshd/hackers_git/db_group.go index 07c1a1f..af1ac2c 100644 --- a/src/nshd/hackers_git/db_group.go +++ b/src/nshd/hackers_git/db_group.go @@ -5,11 +5,6 @@ // published by the Free Software Foundation; either version 2 of // the License, or (at your option) any later version. // -// The GNU General Public License's references to "object code" and -// "executables" are to be interpreted to also include the output of -// any document formatting or typesetting system, including -// intermediate and printed output. -// // This software 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 diff --git a/src/nshd/hackers_git/db_pam.go b/src/nshd/hackers_git/db_pam.go index 2ef8d9a..977104e 100644 --- a/src/nshd/hackers_git/db_pam.go +++ b/src/nshd/hackers_git/db_pam.go @@ -5,11 +5,6 @@ // published by the Free Software Foundation; either version 2 of // the License, or (at your option) any later version. // -// The GNU General Public License's references to "object code" and -// "executables" are to be interpreted to also include the output of -// any document formatting or typesetting system, including -// intermediate and printed output. -// // This software 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 diff --git a/src/nshd/hackers_git/db_passwd.go b/src/nshd/hackers_git/db_passwd.go index 0be3910..d6e4f16 100644 --- a/src/nshd/hackers_git/db_passwd.go +++ b/src/nshd/hackers_git/db_passwd.go @@ -5,11 +5,6 @@ // published by the Free Software Foundation; either version 2 of // the License, or (at your option) any later version. // -// The GNU General Public License's references to "object code" and -// "executables" are to be interpreted to also include the output of -// any document formatting or typesetting system, including -// intermediate and printed output. -// // This software 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 diff --git a/src/nshd/hackers_git/db_shadow.go b/src/nshd/hackers_git/db_shadow.go index c2719b3..2df4026 100644 --- a/src/nshd/hackers_git/db_shadow.go +++ b/src/nshd/hackers_git/db_shadow.go @@ -5,11 +5,6 @@ // published by the Free Software Foundation; either version 2 of // the License, or (at your option) any later version. // -// The GNU General Public License's references to "object code" and -// "executables" are to be interpreted to also include the output of -// any document formatting or typesetting system, including -// intermediate and printed output. -// // This software 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 diff --git a/src/nshd/hackers_git/gid.go b/src/nshd/hackers_git/gid.go index f7bbac7..852b9a3 100644 --- a/src/nshd/hackers_git/gid.go +++ b/src/nshd/hackers_git/gid.go @@ -5,11 +5,6 @@ // published by the Free Software Foundation; either version 2 of // the License, or (at your option) any later version. // -// The GNU General Public License's references to "object code" and -// "executables" are to be interpreted to also include the output of -// any document formatting or typesetting system, including -// intermediate and printed output. -// // This software 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 diff --git a/src/nshd/hackers_git/hackers.go b/src/nshd/hackers_git/hackers.go index b8b9f22..b9a0b9a 100644 --- a/src/nshd/hackers_git/hackers.go +++ b/src/nshd/hackers_git/hackers.go @@ -5,11 +5,6 @@ // published by the Free Software Foundation; either version 2 of // the License, or (at your option) any later version. // -// The GNU General Public License's references to "object code" and -// "executables" are to be interpreted to also include the output of -// any document formatting or typesetting system, including -// intermediate and printed output. -// // This software 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 diff --git a/src/nshd/hackers_git/hackers_parse.go b/src/nshd/hackers_git/hackers_parse.go index e2efd16..af8c913 100644 --- a/src/nshd/hackers_git/hackers_parse.go +++ b/src/nshd/hackers_git/hackers_parse.go @@ -5,11 +5,6 @@ // published by the Free Software Foundation; either version 2 of // the License, or (at your option) any later version. // -// The GNU General Public License's references to "object code" and -// "executables" are to be interpreted to also include the output of -// any document formatting or typesetting system, including -// intermediate and printed output. -// // This software 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 diff --git a/src/nshd/hackers_git/set.go b/src/nshd/hackers_git/set.go index dc1d443..f0cf454 100644 --- a/src/nshd/hackers_git/set.go +++ b/src/nshd/hackers_git/set.go @@ -5,11 +5,6 @@ // published by the Free Software Foundation; either version 2 of // the License, or (at your option) any later version. // -// The GNU General Public License's references to "object code" and -// "executables" are to be interpreted to also include the output of -// any document formatting or typesetting system, including -// intermediate and printed output. -// // This software 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 diff --git a/src/nshd/main.go.in b/src/nshd/main.go.in index ae2d2b7..7dd4cae 100644 --- a/src/nshd/main.go.in +++ b/src/nshd/main.go.in @@ -5,11 +5,6 @@ // published by the Free Software Foundation; either version 2 of // the License, or (at your option) any later version. // -// The GNU General Public License's references to "object code" and -// "executables" are to be interpreted to also include the output of -// any document formatting or typesetting system, including -// intermediate and printed output. -// // This software 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 -- cgit v1.2.3