Update to GPLv3+; update copyright notices everywhere.

3 files changed, 24 insertions, 24 deletions

diff --git a/misc/Makefile b/misc/Makefile
index bdec315..ae4db5a 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,11 +1,14 @@
 # Makefile
-# installation runes for userv-dyndns
-
-# Copyright (C) 2003 Ian Jackson
+#
+# Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+# Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+# Copyright 1999,2003
+#    Chancellor Masters and Scholars of the University of Cambridge
+# Copyright 2010 Tony Finch <fanf@dotat.at>
 #
 # 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
+# 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
@@ -14,10 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with userv-utils; if not, write to the Free Software
-# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# $Id$
+# along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
 include ../settings.make
 
diff --git a/misc/checkpasswd-service b/misc/checkpasswd-service
index af72772..e78c44e 100755
--- a/misc/checkpasswd-service
+++ b/misc/checkpasswd-service
@@ -1,8 +1,7 @@
 #!/usr/bin/perl -w
 # checkpasswd-service
 # part of userv-utils
-#
-#
+
 # protocols:
 #
 #   userv root checkpasswd-self <<'END'
@@ -20,13 +19,16 @@
 #   2 incorrect password
 #   4 no such user
 #   5 password disabled
-#
-#
-# Copyright (C) 2013 Ian Jackson
+
+# Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+# Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+# Copyright 1999,2003
+#    Chancellor Masters and Scholars of the University of Cambridge
+# Copyright 2010 Tony Finch <fanf@dotat.at>
 #
 # 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
+# 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
@@ -35,8 +37,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with userv-utils; if not, write to the Free Software
-# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
 
 use strict;
diff --git a/misc/mailq-wrapper b/misc/mailq-wrapper
index f87b41c..adab378 100755
--- a/misc/mailq-wrapper
+++ b/misc/mailq-wrapper
@@ -1,12 +1,14 @@
 #!/bin/sh
 
-# Copyright (C) 2003 Ian Jackson
-#
-# This file is part of userv-utils (misc subdirectory)
+# Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+# Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+# Copyright 1999,2003
+#    Chancellor Masters and Scholars of the University of Cambridge
+# Copyright 2010 Tony Finch <fanf@dotat.at>
 #
 # 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
+# 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
@@ -15,10 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with userv-utils; if not, write to the Free Software
-# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# $Id$
+# along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
 set -e