From 0c017f11c5da3bfaee2f22f6f5fa928a83e6fe5c Mon Sep 17 00:00:00 2001 From: Andrew Lewman Date: Sun, 28 Oct 2007 04:46:26 +0000 Subject: [PATCH] claim copyright, clarify licensing, suggested by various people repeatedly this year. svn:r12242 --- contrib/osx/TorPostflight | 33 ++++++++++++++++++++++++++++++++ contrib/osx/TorPreFlight | 36 +++++++++++++++++++++++++++++++++++ contrib/osx/addsysuser | 2 ++ contrib/osx/package.sh | 1 + contrib/package_nsis-mingw.sh | 30 +++++++++++++++++++++++++++++ contrib/suse/tor.sh.in | 2 ++ 6 files changed, 104 insertions(+) diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight index 19b983b254..f435d21f4d 100644 --- a/contrib/osx/TorPostflight +++ b/contrib/osx/TorPostflight @@ -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. diff --git a/contrib/osx/TorPreFlight b/contrib/osx/TorPreFlight index 69f0575640..11a6d80e59 100644 --- a/contrib/osx/TorPreFlight +++ b/contrib/osx/TorPreFlight @@ -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 diff --git a/contrib/osx/addsysuser b/contrib/osx/addsysuser index 7b167eac00..21f62eb8ef 100755 --- a/contrib/osx/addsysuser +++ b/contrib/osx/addsysuser @@ -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=/ diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh index 65503ffcb7..0aeb2b7776 100644 --- a/contrib/osx/package.sh +++ b/contrib/osx/package.sh @@ -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: diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh index c15ba9a432..2b436d9dcf 100644 --- a/contrib/package_nsis-mingw.sh +++ b/contrib/package_nsis-mingw.sh @@ -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. diff --git a/contrib/suse/tor.sh.in b/contrib/suse/tor.sh.in index 0f974c3737..5dad6499b9 100644 --- a/contrib/suse/tor.sh.in +++ b/contrib/suse/tor.sh.in @@ -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;