*** empty log message ***

diff --git a/Makefile b/Makefile
index 24f7c366e0bbc0823e5342ae70cb615a7319ff20..eecb31a61cca318a08c7276ebe6cc3133fd5bdfa 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 4dca21aa37c0d4922ded512877fdae9d4688e337..806e8bff46d7536828d6fcd5d9d9fcd7073dcf33 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 efad7bdb0903337b9d866993f2aed485fb3fd368..774706f91f3d72e71ff7a783657fbc56aaa2b513 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 efad7bdb0903337b9d866993f2aed485fb3fd368..774706f91f3d72e71ff7a783657fbc56aaa2b513 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 8b85c39deb27b21cf2bff9e248ecf3b119512410..472f02ee0a4a8421ac179dbb1dd6d1c5df18c7e4 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 fdceb760e0d2988f40180933f4944d0756738e02..ee5442baa13eb684eecae567d569aee999fc99c2 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 7f8a24fb6b95a8c642eb66b565ec7c1df98856a6..d49ebed5b7af34cf892817d3fd3b626a4be69e91 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 751bb72c82c36e77497750ca7e4f1454282f65d3..951cdcf824a04115902be4a86cc0d6876bf9bcb4 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 f9a6bde88c133005745113ee0e674a3b999182cf..92caf4975e0913939623c371e1c64a280831eb14 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 5d334c16470c6825ff310007fd0cba1511549d03..0362aafb8846fba76ef2e83ee7b7ff51a9e592e3 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 f0963d7aeb692179511933e40e1d96ad11289c82..2a38961fabdce3b6a01fcbb62335616390a14f74 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 330273d1affe0230075d2a256844acf2ca77ccf9..7dffe3f36493dd74293263f4a390fac69be96b79 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 dadee709156190b10e327223cca98bda27267484..0e22180afa5565f696979e934c86ba95fc0e34d3 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 b538e75da88664c4ceb791fabfeb094ba2b6cbbb..f87b41ca19b90a6603f9e16012e2d96ccf324459 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 9bbeb6c07c82e9281d378e0e018afe9600e65fab..f1f93bbacfea6c21c1b837e85bbe61ce13ff3862 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 bb3f9f60b4577c472e952f043ac372391cbcb80f..de27fb2f8c413dd8953b2c8957cb4045bafc909d 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 95c0f197eaddf58f48db0b891ffe51967f419037..bd9313c6d56526c282b77589c08b6d15bd9ecbcf 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 53dbf0a04499f666642033d951a99a4828f6cd4d..440de6b27edd5a995a3f218746870da8fc1c1b1b 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 d6570fbd0e1415b13e9360540b8d4d5e291550af..8acbe245dbec6608efabea706550dfd224444d14 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 0e11624a357ed216da0c33bc8555b6173f9b0f84..c1239d07f90b24b14f2c139d52a713e5eaa552b1 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 f8dc67402b0036d8427321655cec7ec4413a1542..59153210f3300cce80177188a17c62befe60980d 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 da41f750afdacf57d3afac99403efc6d052d7202..653d5a660e0738220a1c1c25f20c833abbc8c07f 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 ebec06b2c19783fb0e2cdc116ed84089b47ce56a..eb5fdabaface49339b75ab43852341b84f5e9da4 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 2ab72c0a3b9d9b7413d04fafef9d301e212f6b0e..d97f156a14a85b3e6570db1d03c9186d06f5ccd4 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