[or-cvs] r12242: claim copyright, clarify licensing, suggested by various peo (in tor/trunk/contrib: . osx suse)

Sun Oct 28 04:46:26 UTC 2007

Author: phobos
Date: 2007-10-28 00:46:26 -0400 (Sun, 28 Oct 2007)
New Revision: 12242

Modified:
   tor/trunk/contrib/osx/TorPostflight
   tor/trunk/contrib/osx/TorPreFlight
   tor/trunk/contrib/osx/addsysuser
   tor/trunk/contrib/osx/package.sh
   tor/trunk/contrib/package_nsis-mingw.sh
   tor/trunk/contrib/suse/tor.sh.in
Log:
claim copyright, clarify licensing, suggested by various people
repeatedly this year.


Modified: tor/trunk/contrib/osx/TorPostflight
===================================================================

--- tor/trunk/contrib/osx/TorPostflight	2007-10-28 04:24:21 UTC (rev 12241)
+++ tor/trunk/contrib/osx/TorPostflight	2007-10-28 04:46:26 UTC (rev 12242)
@@ -1,4 +1,37 @@
 #!/bin/sh
+# ====================================================================
+#  addsysuser is distributed under this license
+#
+#  Copyright (c) 2006 Andrew Lewman
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#
+#     * Neither the names of the copyright owners nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# ======================================================================
 
 # TorPostflight gets invoked after any install or upgrade.
 

Modified: tor/trunk/contrib/osx/TorPreFlight
===================================================================
--- tor/trunk/contrib/osx/TorPreFlight	2007-10-28 04:24:21 UTC (rev 12241)
+++ tor/trunk/contrib/osx/TorPreFlight	2007-10-28 04:46:26 UTC (rev 12242)
@@ -1,4 +1,40 @@
 #!/bin/sh
+#
+# ===================================================================
+# 
+# TorPreFlight is distributed under this license:
+#
+# Copyright (c) 2006 Andrew Lewman
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#
+#     * Neither the names of the copyright owners nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#===============================================================================
+
 # TorPreFlight is invoked before the install begins
 
 # Figure out where Tor is installed

Modified: tor/trunk/contrib/osx/addsysuser
===================================================================
--- tor/trunk/contrib/osx/addsysuser	2007-10-28 04:24:21 UTC (rev 12241)
+++ tor/trunk/contrib/osx/addsysuser	2007-10-28 04:46:26 UTC (rev 12242)
@@ -4,6 +4,8 @@
 #
 # Modified for Tor installer by Nick Mathewson
 # 2007-06-12 Modified for leopard by Andrew Lewman
+# Copyright (c) 2007 Andrew Lewman
+#
 
 
 ROOTPROP=/

Modified: tor/trunk/contrib/osx/package.sh
===================================================================
--- tor/trunk/contrib/osx/package.sh	2007-10-28 04:24:21 UTC (rev 12241)
+++ tor/trunk/contrib/osx/package.sh	2007-10-28 04:46:26 UTC (rev 12242)
@@ -1,6 +1,7 @@
 #!/bin/sh
 # $Id$
 # Copyright 2004-2005 Nick Mathewson. 
+# Copyright 2005-2007 Andrew Lewman
 # See LICENSE in Tor distribution for licensing information.
 
 # This script builds a Macintosh OS X metapackage containing 4 packages:

Modified: tor/trunk/contrib/package_nsis-mingw.sh
===================================================================
--- tor/trunk/contrib/package_nsis-mingw.sh	2007-10-28 04:24:21 UTC (rev 12241)
+++ tor/trunk/contrib/package_nsis-mingw.sh	2007-10-28 04:46:26 UTC (rev 12242)
@@ -1,5 +1,35 @@
 #!/bin/sh
+# Copyright (c) 2006-2007 Andrew Lewman
 #
+#Redistribution and use in source and binary forms, with or without
+#modification, are permitted provided that the following conditions are
+#met:
+#
+#    * Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+#
+#    * Redistributions in binary form must reproduce the above
+#copyright notice, this list of conditions and the following disclaimer
+#in the documentation and/or other materials provided with the
+#distribution.
+#
+#    * Neither the names of the copyright owners nor the names of its
+#contributors may be used to endorse or promote products derived from
+#this software without specific prior written permission.
+#
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+#A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+#OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+#OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#===============================================================================
+
 # Script to package a Tor installer on win32.  This script assumes that
 # you have already built Tor, that you are running msys/mingw, and that
 # you know what you are doing.

Modified: tor/trunk/contrib/suse/tor.sh.in
===================================================================
--- tor/trunk/contrib/suse/tor.sh.in	2007-10-28 04:24:21 UTC (rev 12241)
+++ tor/trunk/contrib/suse/tor.sh.in	2007-10-28 04:46:26 UTC (rev 12242)
@@ -1,5 +1,7 @@
 #!/bin/sh
 #
+# Copyright (c) 2006-2007 Andrew Lewman
+#
 # tor    The Onion Router
 #
 # Startup/shutdown script for tor. This is a wrapper around torctl;

