Update to GPLv3+; update copyright notices everywhere.

23 files changed, 194 insertions, 120 deletions

diff --git a/ipif/INSTALL b/ipif/INSTALL
index dc3e454..397a31d 100644
--- a/ipif/INSTALL
+++ b/ipif/INSTALL
@@ -665,13 +665,19 @@ UDPTUNNEL SETUP TUTORIAL
 
 8. Copyright notice
 
- Copyright (C) 1999-2000,2003 Ian Jackson
  This file is part of ipif, part of userv-utils
 
- 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.
+ userv-utils are
+ 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>
+
+ All the utilities here are 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
@@ -679,8 +685,4 @@ UDPTUNNEL SETUP TUTORIAL
  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/.
diff --git a/ipif/Makefile b/ipif/Makefile
index a34a85f..5136656 100644
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -1,11 +1,16 @@
 # Makefile for ipif/udptunnel stuff
 
-# Copyright (C) 1999-2000,2003 Ian Jackson
-# This file is part of ipif, part of userv-utils
+# This file is part of ipif, part of userv-util
+#
+# 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 +19,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/ipif/README b/ipif/README
index caed3ec..09bf5d9 100644
--- a/ipif/README
+++ b/ipif/README
@@ -48,13 +48,19 @@ forwarder.c (head comment)
   to read these details unless you are debugging or modifying udptunnel.
 
 
-Copyright (C) 1999-2000,2003 Ian Jackson
 This file is part of ipif, part of userv-utils
 
-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.
+userv-utils are
+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>
+
+All the utilities here are 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
@@ -62,8 +68,4 @@ 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 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/.
diff --git a/ipif/automechgen.sh b/ipif/automechgen.sh
index 4012b85..2bc4800 100755
--- a/ipif/automechgen.sh
+++ b/ipif/automechgen.sh
@@ -1,12 +1,17 @@
 #!/bin/sh
 # generates automech.h and automech.c
 
-# Copyright (C) 2000,2003 Ian Jackson
 # This file is part of ipif, part of userv-utils
 #
+# 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,8 +20,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/.
 
 exec >automech.c.new
 exec 3>automech.h.new
diff --git a/ipif/blowfish.c b/ipif/blowfish.c
index dbaf02f..bf62a7e 100644
--- a/ipif/blowfish.c
+++ b/ipif/blowfish.c
@@ -6,12 +6,17 @@
  * Schneier (1995) by Ian Jackson in 1997.
  */
 /*
- * Copyright (C) 1997,2000,2003 Ian Jackson
  * This file is part of ipif, part of userv-utils
  *
+ * 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
@@ -20,8 +25,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/.
  */
 
 /* TODO: test with zero length key */
diff --git a/ipif/blowfish.h b/ipif/blowfish.h
index 166c672..6efd137 100644
--- a/ipif/blowfish.h
+++ b/ipif/blowfish.h
@@ -1,10 +1,15 @@
 /*
- * Copyright (C) 1997,2000,2003 Ian Jackson
  * This file is part of ipif, part of userv-utils
  *
+ * 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
@@ -13,8 +18,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/.
  */
 
 #ifndef BLOWFISH__H_INCLUDED
diff --git a/ipif/blowfishspeed.c b/ipif/blowfishspeed.c
index f62172f..9ba39e8 100644
--- a/ipif/blowfishspeed.c
+++ b/ipif/blowfishspeed.c
@@ -1,10 +1,15 @@
 /*
- * Copyright (C) 1997,2000,2003 Ian Jackson
  * This file is part of ipif, part of userv-utils
  *
+ * 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
@@ -13,8 +18,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/.
  */
 
 #include <stdio.h>
diff --git a/ipif/blowfishtest.c b/ipif/blowfishtest.c
index 73bb677..8882f03 100644
--- a/ipif/blowfishtest.c
+++ b/ipif/blowfishtest.c
@@ -2,12 +2,17 @@
  * test program for blowfish; very hard to use (sorry!)
  */
 /*
- * Copyright (C) 1997,2000,2003 Ian Jackson
  * This file is part of ipif, part of userv-utils
  *
+ * 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
@@ -16,9 +21,8 @@
  * 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/.
+ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/ipif/forwarder.c b/ipif/forwarder.c
index 7a81403..d92fdd9 100644
--- a/ipif/forwarder.c
+++ b/ipif/forwarder.c
@@ -35,12 +35,17 @@
  *      16     bad trouble
  */
 /*
- * Copyright (C) 2000,2003 Ian Jackson
  * This file is part of ipif, part of userv-utils
  *
+ * 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
@@ -49,8 +54,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/.
  */
 
 #include <sys/socket.h>
diff --git a/ipif/forwarder.h b/ipif/forwarder.h
index 599eb41..5397317 100644
--- a/ipif/forwarder.h
+++ b/ipif/forwarder.h
@@ -2,12 +2,17 @@
  * Encrypting tunnel for userv-ipif tunnels, header file
  */
 /*
- * Copyright (C) 2000,2003 Ian Jackson
  * This file is part of ipif, part of userv-utils
  *
+ * 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
@@ -16,8 +21,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/.
  */
 
 #ifndef MECHS_H
diff --git a/ipif/hex.c b/ipif/hex.c
index c30b909..03b6ab4 100644
--- a/ipif/hex.c
+++ b/ipif/hex.c
@@ -1,10 +1,15 @@
 /*
- * Copyright (C) 1997,2000,2003 Ian Jackson
  * This file is part of ipif, part of userv-utils
  *
+ * 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
@@ -13,8 +18,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/.
  */
 
 #include <stdio.h>
diff --git a/ipif/hex.h b/ipif/hex.h
index 6fd588d..1566de2 100644
--- a/ipif/hex.h
+++ b/ipif/hex.h
@@ -1,10 +1,15 @@
 /*
- * Copyright (C) 1997,2000,2003 Ian Jackson
  * This file is part of ipif, part of userv-utils
  *
+ * 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
@@ -13,8 +18,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/.
  */
 
 #ifndef HEX__H_INCLUDED
diff --git a/ipif/mech-blowfish.c b/ipif/mech-blowfish.c
index 3f5169c..6912222 100644
--- a/ipif/mech-blowfish.c
+++ b/ipif/mech-blowfish.c
@@ -11,12 +11,17 @@
  * encoding for MAC: do CBC and prepend last ciphertext block
  */
 /*
- * Copyright (C) 2000,2003 Ian Jackson
  * This file is part of ipif, part of userv-utils
  *
+ * 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
@@ -25,8 +30,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/.
  */
 
 #include "forwarder.h"
diff --git a/ipif/mech-null.c b/ipif/mech-null.c
index 0b08c54..d24de73 100644
--- a/ipif/mech-null.c
+++ b/ipif/mech-null.c
@@ -9,12 +9,17 @@
  * encoding: no transformation
  */
 /*
- * Copyright (C) 2000,2003 Ian Jackson
  * This file is part of ipif, part of userv-utils
  *
+ * 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
@@ -23,8 +28,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/.
  */
 
 #include "forwarder.h"
diff --git a/ipif/mech-pkcs5.c b/ipif/mech-pkcs5.c
index 58190b6..5116917 100644
--- a/ipif/mech-pkcs5.c
+++ b/ipif/mech-pkcs5.c
@@ -9,12 +9,17 @@
  *           the number of bytes appended
  */
 /*
- * Copyright (C) 2000,2003 Ian Jackson
  * This file is part of ipif, part of userv-utils
  *
+ * 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
@@ -23,8 +28,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/.
  */
 
 #include "forwarder.h"
diff --git a/ipif/mech-sequence.c b/ipif/mech-sequence.c
index beb14c3..273638a 100644
--- a/ipif/mech-sequence.c
+++ b/ipif/mech-sequence.c
@@ -9,12 +9,17 @@
  * decoding: check increasingness (sequence), or ignore (nonce)
  */
 /*
- * Copyright (C) 2000,2003 Ian Jackson
  * This file is part of ipif, part of userv-utils
  *
+ * 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
@@ -23,8 +28,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/.
  */
 
 #include <netinet/in.h>
diff --git a/ipif/mech-timestamp.c b/ipif/mech-timestamp.c
index 793ea6c..129eee9 100644
--- a/ipif/mech-timestamp.c
+++ b/ipif/mech-timestamp.c
@@ -13,12 +13,17 @@
  *
  */
 /*
- * Copyright (C) 2000,2003 Ian Jackson
  * This file is part of ipif, part of userv-utils
  *
+ * 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
@@ -27,8 +32,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/.
  */
 
 #include <stdint.h>
diff --git a/ipif/service.c b/ipif/service.c
index b9e40e2..df03926 100644
--- a/ipif/service.c
+++ b/ipif/service.c
@@ -91,12 +91,17 @@
  * The service program should be run from userv with no-disconnect-hup.
  */
 /*
- * Copyright (C) 1999-2000,2003 Ian Jackson
  * This file is part of ipif, part of userv-utils
  *
+ * 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
@@ -105,10 +110,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 <stdio.h>
diff --git a/ipif/udptunnel b/ipif/udptunnel
index 963245c..1e2729b 100755
--- a/ipif/udptunnel
+++ b/ipif/udptunnel
@@ -122,11 +122,15 @@
 # `-e nonce -e timestamp/...' with just `-e sequence'.  Do not just
 # remove `-e timestamp/...'.
 
-# Copyright (C) 1999-2000 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
@@ -135,10 +139,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/.
 
 use Socket;
 use POSIX;
diff --git a/ipif/udptunnel-reconf.pl b/ipif/udptunnel-reconf.pl
index 6b77f97..4a5423c 100755
--- a/ipif/udptunnel-reconf.pl
+++ b/ipif/udptunnel-reconf.pl
@@ -3,12 +3,17 @@
 # Set up the relevant stuff in /etc/userv/vpn, and then run
 # this.  It should tell you what to do to inittab and ipif-networks.
 
-# Copyright (C) 1999-2000,2003 Ian Jackson
 # This file is part of ipif, part of userv-utils
 #
+# 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
@@ -17,10 +22,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/.
 
 use Socket;
 
diff --git a/ipif/udptunnel-vpn-config.m4 b/ipif/udptunnel-vpn-config.m4
index 42eb390..4eba63f 100644
--- a/ipif/udptunnel-vpn-config.m4
+++ b/ipif/udptunnel-vpn-config.m4
@@ -1,11 +1,16 @@
 m4_dnl udptunnel-vpn-config.m4: macros for udptunnel-reconf et al
 
-m4_dnl Copyright (C) 1999-2000,2003 Ian Jackson
 m4_dnl This file is part of ipif, part of userv-utils
-
+m4_dnl
+m4_dnl Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+m4_dnl Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+m4_dnl Copyright 1999,2003
+m4_dnl    Chancellor Masters and Scholars of the University of Cambridge
+m4_dnl Copyright 2010 Tony Finch <fanf@dotat.at>
+m4_dnl
 m4_dnl This is free software; you can redistribute it and/or modify it
 m4_dnl under the terms of the GNU General Public License as published by
-m4_dnl the Free Software Foundation; either version 2 of the License, or
+m4_dnl the Free Software Foundation; either version 3 of the License, or
 m4_dnl (at your option) any later version.
 m4_dnl
 m4_dnl This program is distributed in the hope that it will be useful, but
@@ -14,10 +19,7 @@ m4_dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 m4_dnl General Public License for more details.
 m4_dnl
 m4_dnl You should have received a copy of the GNU General Public License
-m4_dnl along with userv-utils; if not, write to the Free Software
-m4_dnl Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-m4_dnl
-m4_dnl $Id$
+m4_dnl along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
 m4_define(V_JUNK,1)m4_divert(V_JUNK)
 m4_define(V_VARIABLE,2)
diff --git a/ipif/udptunnel-vpn-defaults b/ipif/udptunnel-vpn-defaults
index 520359e..77adf16 100644
--- a/ipif/udptunnel-vpn-defaults
+++ b/ipif/udptunnel-vpn-defaults
@@ -1,11 +1,16 @@
 m4_dnl udptunnel-vpn-defaults: default settings for udptunnel-reconf
 
-m4_dnl Copyright (C) 1999-2000,2003 Ian Jackson
 m4_dnl This file is part of ipif, part of userv-utils
-
+m4_dnl
+m4_dnl Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+m4_dnl Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+m4_dnl Copyright 1999,2003
+m4_dnl    Chancellor Masters and Scholars of the University of Cambridge
+m4_dnl Copyright 2010 Tony Finch <fanf@dotat.at>
+m4_dnl
 m4_dnl This is free software; you can redistribute it and/or modify it
 m4_dnl under the terms of the GNU General Public License as published by
-m4_dnl the Free Software Foundation; either version 2 of the License, or
+m4_dnl the Free Software Foundation; either version 3 of the License, or
 m4_dnl (at your option) any later version.
 m4_dnl
 m4_dnl This program is distributed in the hope that it will be useful, but
@@ -14,10 +19,7 @@ m4_dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 m4_dnl General Public License for more details.
 m4_dnl
 m4_dnl You should have received a copy of the GNU General Public License
-m4_dnl along with userv-utils; if not, write to the Free Software
-m4_dnl Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-m4_dnl
-m4_dnl $Id$
+m4_dnl along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
 SET(	lcommand,	[udptunnel])
 SET(	clock_maxskew,	45)
diff --git a/ipif/utils.c b/ipif/utils.c
index 0e22180..1a4d30c 100644
--- a/ipif/utils.c
+++ b/ipif/utils.c
@@ -2,11 +2,15 @@
  * General utility functions for udp tunnel
  */
 /*
- * Copyright (C) 2000,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
@@ -15,8 +19,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/.
  */
 
 #include <string.h>