*** empty log message ***

diff --git a/Makefile b/Makefile
index 4ded068..474ce27 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2000 Ian Jackson
+# Copyright (C) 2000,2003 Ian Jackson
 #
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
 # along with userv-utils; if not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: Makefile,v 1.12 2003/07/06 16:57:23 ian Exp $
+# $Id: Makefile,v 1.13 2003/07/06 20:47:12 ian Exp $
 
 VERSION=0.2.99.0.1
 

diff --git a/README b/README
index 1dd4d19..71796ba 100644 (file)
--- a/README
+++ b/README
@@ -47,8 +47,10 @@ Key to the Status:
    S   Too small to need any significant documentation.
 
 userv-utils are
-Copyright (C)1996-2000 Ian Jackson <ian@davenant.greenend.org.uk>.
+Copyright (C)1996-2000,2003 Ian Jackson <ian@davenant.greenend.org.uk>.
 Copyright (C)1998 David Damerell <damerell@chiark.greenend.org.uk>
+Copyright (C)1999,2003
+   Chancellor Masters and Scholars of the University of Cambridge
 
 All the utilities here are free software.  You can redistribute it
 and/or modify them under the terms of the GNU General Public License
@@ -66,7 +68,7 @@ address above or write to the Free Software Foundation, 59 Temple
 Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
-$Id: README,v 1.5 2000/09/18 00:31:11 ian Exp $
+$Id: README,v 1.6 2003/07/06 20:47:12 ian Exp $
 
 Local variables:
 mode: text

diff --git a/changelog b/changelog
index efad7bd..774706f 100644 (file)
--- a/changelog
+++ b/changelog
@@ -3,6 +3,7 @@ userv-utils (0.2.99.0.2) unstable; urgency=low
   * debianisation
   * new Makefiles in various directories, still all a bit crap
   * removed some common stuff from */Makefile to settings.make
+  * copyright notices updated
 
  --
 

diff --git a/debian/copyright b/debian/copyright
index 8b85c39..472f02e 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,3 +22,8 @@ your Debian GNU/Linux system, in /usr/doc/copyright/GPL, or with the
 chiark-utils source package as the file COPYING; if not, email me at
 one of the addresses above or write to the Free Software Foundation,
 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+userv-utils are
+Copyright (C)1996-2000,2003 Ian Jackson <ian@davenant.greenend.org.uk>.
+Copyright (C)1998 David Damerell <damerell@chiark.greenend.org.uk>

diff --git a/debian/userv-dyndns/postinst b/debian/userv-dyndns/postinst
index fdceb76..85182d9 100755 (executable)
--- a/debian/userv-dyndns/postinst
+++ b/debian/userv-dyndns/postinst
@@ -1,3 +1,23 @@
+# Copyright (C) 1999-2000,2003 Ian Jackson
+#
+# This file is part of dyndns, 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.
+#
+# 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 userv-utils; if not, write to the Free Software
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# $Id: postinst,v 1.2 2003/07/06 20:47:12 ian Exp $
+
 #!/bin/sh
 set -e
 

diff --git a/dyndns/INSTALL b/dyndns/INSTALL
index f922a78..7ebbd58 100644 (file)
--- a/dyndns/INSTALL
+++ b/dyndns/INSTALL
@@ -25,7 +25,7 @@ cp dyndns-domains /etc/userv/dyndns-domains.example
 #      Zone
 #    to your nameserver configuration.
 
-# Copyright (C) 2000 Ian Jackson
+# Copyright (C) 2000,2003 Ian Jackson
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -41,4 +41,4 @@ cp dyndns-domains /etc/userv/dyndns-domains.example
 # along with userv-utils; if not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 # 
-# $Id: INSTALL,v 1.2 2003/07/06 20:32:27 ian Exp $
+# $Id: INSTALL,v 1.3 2003/07/06 20:47:12 ian Exp $

diff --git a/dyndns/install-script b/dyndns/install-script
index 751bb72..271dd60 100755 (executable)
--- a/dyndns/install-script
+++ b/dyndns/install-script
@@ -1,4 +1,25 @@
 #!/bin/bash
+
+# Copyright (C) 1999-2000,2003 Ian Jackson
+#
+# This file is part dyndns, 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.
+#
+# 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 userv-utils; if not, write to the Free Software
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# $Id: install-script,v 1.2 2003/07/06 20:47:12 ian Exp $
+
 set -e
 zone=$1
 test -d ../zone,$zone

diff --git a/dyndns/service b/dyndns/service
index f9a6bde..5ef91ed 100755 (executable)
--- a/dyndns/service
+++ b/dyndns/service
@@ -7,6 +7,26 @@
 #    to <subdomain>.<zone>, and so must not have a trailing `.';
 #    where the owner is to be <subdomain>.<zone>, `@' must be used.
 
+# Copyright (C) 1999-2000,2003 Ian Jackson
+#
+# This file is part dyndns, 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.
+#
+# 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 userv-utils; if not, write to the Free Software
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# $Id: service,v 1.4 2003/07/06 20:47:12 ian Exp $
+
 use POSIX;
 
 BEGIN {

diff --git a/dyndns/update b/dyndns/update
index 5d334c1..561135c 100755 (executable)
--- a/dyndns/update
+++ b/dyndns/update
@@ -1,4 +1,25 @@
 #!/bin/bash
+
+# Copyright (C) 1999-2000,2003 Ian Jackson
+#
+# This file is part dyndns, 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.
+#
+# 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 userv-utils; if not, write to the Free Software
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# $Id: update,v 1.3 2003/07/06 20:47:12 ian Exp $
+
 set -e
 
 zone="$1"

diff --git a/groupmanage/groupmanage.text b/groupmanage/groupmanage.text
index 14da700..fe45528 100644 (file)
--- a/groupmanage/groupmanage.text
+++ b/groupmanage/groupmanage.text
@@ -46,4 +46,21 @@ without having to ask other users to chmod files, or having to type
 incantations to switch between working on shared files and your
 personal files.
 
-$Id: groupmanage.text,v 1.2 1999/11/09 21:45:57 ian Exp $
+ Copyright (C) 1999,2003 Ian Jackson
+ This file is part of groupmanage, 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.
+
+ 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 userv-utils; if not, write to the Free Software
+ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+$Id: groupmanage.text,v 1.3 2003/07/06 20:47:12 ian Exp $

diff --git a/ipif/udptunnel-vpn-defaults b/ipif/udptunnel-vpn-defaults
index 7c044e8..5647a74 100644 (file)
--- a/ipif/udptunnel-vpn-defaults
+++ b/ipif/udptunnel-vpn-defaults
@@ -1,5 +1,8 @@
 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 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
@@ -14,7 +17,7 @@ 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: udptunnel-vpn-defaults,v 1.6 2001/09/26 00:21:00 ian Exp $
+m4_dnl $Id: udptunnel-vpn-defaults,v 1.7 2003/07/06 20:47:12 ian Exp $
 
 SET(   lcommand,       [udptunnel])
 SET( crypto,

diff --git a/ipif/utils.c b/ipif/utils.c
index dadee70..0e22180 100644 (file)
--- a/ipif/utils.c
+++ b/ipif/utils.c
@@ -2,7 +2,7 @@
  * General utility functions for udp tunnel
  */
 /*
- * Copyright (C) 2000 Ian Jackson
+ * Copyright (C) 2000,2003 Ian Jackson
  *
  * This is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by

diff --git a/misc/mailq-wrapper b/misc/mailq-wrapper
index b538e75..ebb1748 100755 (executable)
--- a/misc/mailq-wrapper
+++ b/misc/mailq-wrapper
@@ -1,3 +1,30 @@
 #!/bin/sh
+
+# Copyright (C) 2003 Ian Jackson
+#
+# This file is part of userv-utils (misc subdirectory)
+#
+# 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 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 userv-utils; if not, write to the Free Software
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# $Id: mailq-wrapper,v 1.2 2003/07/06 20:47:12 ian Exp $
+
 set -e
+
+if $# != 0; then
+       echo >&2 'usage: mailq'
+       exit 127
+fi
+
 exec userv mail mailq </dev/null

diff --git a/newsrc-lg/getgroups b/newsrc-lg/getgroups
index fbec559..a1e5857 100755 (executable)
--- a/newsrc-lg/getgroups
+++ b/newsrc-lg/getgroups
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# Copyright (C) 1999 Ian Jackson
+# Copyright (C) 1999,2003 Ian Jackson
 #
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # along with userv-utils; if not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: getgroups,v 1.2 1999/11/09 23:12:54 ian Exp $
+# $Id: getgroups,v 1.3 2003/07/06 20:47:12 ian Exp $
 
 $minreaddays= 21;
 $maxperuser= 250;

diff --git a/newsrc-lg/newsrc-listgroups b/newsrc-lg/newsrc-listgroups
index 81c5323..c1ba87a 100755 (executable)
--- a/newsrc-lg/newsrc-listgroups
+++ b/newsrc-lg/newsrc-listgroups
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# Copyright (C) 1999 Ian Jackson
+# Copyright (C) 1999,2003 Ian Jackson
 #
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # along with userv-utils; if not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: newsrc-listgroups,v 1.2 1999/11/09 23:12:54 ian Exp $
+# $Id: newsrc-listgroups,v 1.3 2003/07/06 20:47:12 ian Exp $
 
 $minreaddays= 21;
 $maxperuser= 250;

diff --git a/settings.make b/settings.make
index e80bb47..79df4f4 100644 (file)
--- a/settings.make
+++ b/settings.make
@@ -1,6 +1,6 @@
 # common makefile settings for userv-utils
 
-# Copyright (C) 1999-2000 Ian Jackson
+# Copyright (C) 1999-2000,2003 Ian Jackson
 #
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 # along with userv-utils; if not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: settings.make,v 1.1 2003/07/06 20:32:27 ian Exp $
+# $Id: settings.make,v 1.2 2003/07/06 20:47:12 ian Exp $
 
 etcdir=                /etc
 prefix=                /usr/local

diff --git a/www-cgi/Makefile b/www-cgi/Makefile
index e5c293b..69d4566 100644 (file)
--- a/www-cgi/Makefile
+++ b/www-cgi/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1999 Ian Jackson
+# Copyright (C) 1999,2003 Ian Jackson
 #
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
 # along with userv-utils; if not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: Makefile,v 1.5 2003/07/06 20:32:27 ian Exp $
+# $Id: Makefile,v 1.6 2003/07/06 20:47:12 ian Exp $
 
 
 include ../settings.make

diff --git a/www-cgi/srm.conf.fragment b/www-cgi/srm.conf.fragment
index d6570fb..8acbe24 100644 (file)
--- a/www-cgi/srm.conf.fragment
+++ b/www-cgi/srm.conf.fragment
@@ -1,2 +1,2 @@
-ScriptAlias /ucgi/ /usr/local/lib/user-cgi/cgi/ucgi/
-ScriptAlias /ucgi-debug/ /usr/local/lib/user-cgi/cgi/ucgi-debug/
+ScriptAlias /ucgi/ /usr/lib/user-cgi/cgi/ucgi/
+ScriptAlias /ucgi-debug/ /usr/lib/user-cgi/cgi/ucgi-debug/

diff --git a/www-cgi/ucgi.c b/www-cgi/ucgi.c
index e4c6d9d..2993ecf 100644 (file)
--- a/www-cgi/ucgi.c
+++ b/www-cgi/ucgi.c
@@ -2,7 +2,7 @@
  * Usage: as CGI script
  */
 /*
- * Copyright (C) 1998-1999 Ian Jackson
+ * Copyright (C) 1998-1999,2003 Ian Jackson
  *
  * This is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
  * along with userv-utils; if not, write to the Free Software
  * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: ucgi.c,v 1.2 1999/11/09 23:04:32 ian Exp $
+ * $Id: ucgi.c,v 1.3 2003/07/06 20:47:12 ian Exp $
  */
 
 #include <stdio.h>

diff --git a/www-cgi/ucgi.h b/www-cgi/ucgi.h
index 23aa90e..5c94122 100644 (file)
--- a/www-cgi/ucgi.h
+++ b/www-cgi/ucgi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-1999 Ian Jackson
+ * Copyright (C) 1998-1999,2003 Ian Jackson
  *
  * This is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  * along with userv-utils; if not, write to the Free Software
  * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: ucgi.h,v 1.2 1999/11/09 23:04:32 ian Exp $
+ * $Id: ucgi.h,v 1.3 2003/07/06 20:47:12 ian Exp $
  */
 
 #ifndef UCGI_H

diff --git a/www-cgi/ucgicommon.c b/www-cgi/ucgicommon.c
index e1635b0..99e4098 100644 (file)
--- a/www-cgi/ucgicommon.c
+++ b/www-cgi/ucgicommon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-1999 Ian Jackson
+ * Copyright (C) 1998-1999,2003 Ian Jackson
  *
  * This is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  * along with userv-utils; if not, write to the Free Software
  * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: ucgicommon.c,v 1.4 2001/03/17 15:32:58 ian Exp $
+ * $Id: ucgicommon.c,v 1.5 2003/07/06 20:47:12 ian Exp $
  */
 
 #include <stdio.h>

diff --git a/www-cgi/ucgitarget.c b/www-cgi/ucgitarget.c
index d4a5121..4272bb9 100644 (file)
--- a/www-cgi/ucgitarget.c
+++ b/www-cgi/ucgitarget.c
@@ -3,7 +3,7 @@
  * environment variables are USERV_U_E_...
  */
 /*
- * Copyright (C) 1998-1999 Ian Jackson
+ * Copyright (C) 1998-1999,2003 Ian Jackson
  *
  * This is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
  * along with userv-utils; if not, write to the Free Software
  * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: ucgitarget.c,v 1.2 1999/11/09 23:04:32 ian Exp $
+ * $Id: ucgitarget.c,v 1.3 2003/07/06 20:47:12 ian Exp $
  */
 
 #include <stdio.h>

diff --git a/www-cgi/user-cgi.text b/www-cgi/user-cgi.text
index 11e5df9..9fc79fa 100644 (file)
--- a/www-cgi/user-cgi.text
+++ b/www-cgi/user-cgi.text
@@ -85,7 +85,7 @@ It is important that the webserver removes /../ components from the
 PATH_INFO - if it doesn't there is a security hole.
 
 
-Copyright (C) 1998-1999 Ian Jackson
+Copyright (C) 1998-1999,2003 Ian Jackson
 
 This is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by
@@ -101,4 +101,4 @@ 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: user-cgi.text,v 1.2 1999/11/09 23:04:32 ian Exp $
+$Id: user-cgi.text,v 1.3 2003/07/06 20:47:12 ian Exp $