*** empty log message ***

diff --git a/Makefile b/Makefile
index 24f7c36..eecb31a 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
 #
 # 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/README b/README
index 4dca21a..806e8bf 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
    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)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
 
 All the utilities here are free software.  You can redistribute it
 and/or modify them under the terms of the GNU General Public License

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
   * 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/changelog b/debian/changelog
index efad7bd..774706f 100644 (file)
--- a/debian/changelog
+++ b/debian/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
   * 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.
 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..ee5442b 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$
+

 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

diff --git a/dyndns/INSTALL b/dyndns/INSTALL
index 7f8a24f..d49ebed 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.
 
 #      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
 # 
 # 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/dyndns/install-script b/dyndns/install-script
index 751bb72..951cdcf 100755 (executable)
--- a/dyndns/install-script
+++ b/dyndns/install-script
@@ -1,4 +1,25 @@
 #!/bin/bash
 #!/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$
+

 set -e
 zone=$1
 test -d ../zone,$zone
 set -e
 zone=$1
 test -d ../zone,$zone

diff --git a/dyndns/service b/dyndns/service
index f9a6bde..92caf49 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.
 
 #    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$
+

 use POSIX;
 
 BEGIN {
 use POSIX;
 
 BEGIN {

diff --git a/dyndns/update b/dyndns/update
index 5d334c1..0362aaf 100755 (executable)
--- a/dyndns/update
+++ b/dyndns/update
@@ -1,4 +1,25 @@
 #!/bin/bash
 #!/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$
+

 set -e
 
 zone="$1"
 set -e
 
 zone="$1"

diff --git a/groupmanage/groupmanage.text b/groupmanage/groupmanage.text
index f0963d7..2a38961 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.
 
 incantations to switch between working on shared files and your
 personal files.
 

+ 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$
 $Id$

diff --git a/ipif/udptunnel-vpn-defaults b/ipif/udptunnel-vpn-defaults
index 330273d..7dffe3f 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 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
 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

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
  */
 /*
  * 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
  *
  * 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..f87b41c 100755 (executable)
--- a/misc/mailq-wrapper
+++ b/misc/mailq-wrapper
@@ -1,3 +1,30 @@
 #!/bin/sh
 #!/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$
+

 set -e
 set -e

+
+if $# != 0; then
+       echo >&2 'usage: mailq'
+       exit 127
+fi
+

 exec userv mail mailq </dev/null
 exec userv mail mailq </dev/null

diff --git a/newsrc-lg/getgroups b/newsrc-lg/getgroups
index 9bbeb6c..f1f93bb 100755 (executable)
--- a/newsrc-lg/getgroups
+++ b/newsrc-lg/getgroups
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
 #!/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
 #
 # 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/newsrc-lg/newsrc-listgroups b/newsrc-lg/newsrc-listgroups
index bb3f9f6..de27fb2 100755 (executable)
--- a/newsrc-lg/newsrc-listgroups
+++ b/newsrc-lg/newsrc-listgroups
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
 #!/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
 #
 # 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/settings.make b/settings.make
index 95c0f19..bd9313c 100644 (file)
--- a/settings.make
+++ b/settings.make
@@ -1,6 +1,6 @@
 # common makefile settings for userv-utils
 
 # 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
 #
 # 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/www-cgi/Makefile b/www-cgi/Makefile
index 53dbf0a..440de6b 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
 #
 # 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/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 0e11624..c1239d0 100644 (file)
--- a/www-cgi/ucgi.c
+++ b/www-cgi/ucgi.c
@@ -2,7 +2,7 @@
  * Usage: as CGI script
  */
 /*
  * 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
  *
  * 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/www-cgi/ucgi.h b/www-cgi/ucgi.h
index f8dc674..5915321 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
  *
  * 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/www-cgi/ucgicommon.c b/www-cgi/ucgicommon.c
index da41f75..653d5a6 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
  *
  * 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/www-cgi/ucgitarget.c b/www-cgi/ucgitarget.c
index ebec06b..eb5fdab 100644 (file)
--- a/www-cgi/ucgitarget.c
+++ b/www-cgi/ucgitarget.c
@@ -3,7 +3,7 @@
  * environment variables are USERV_U_E_...
  */
 /*
  * 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
  *
  * 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/www-cgi/user-cgi.text b/www-cgi/user-cgi.text
index 2ab72c0..d97f156 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.
 
 
 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
 
 This is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by