summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2004-03-17 13:25:10 +0000
committerPeter Palfrader <peter@palfrader.org>2004-03-17 13:25:10 +0000
commitef84481aff87ec7fd882ca9b0ba7e04f13c767f6 (patch)
tree04a16738d6ee88f6f4409854280ddac62c31267d
parent971b002d935155abd56d0b01fe5e284f63439b99 (diff)
downloadtor-ef84481aff87ec7fd882ca9b0ba7e04f13c767f6.tar.gz
tor-ef84481aff87ec7fd882ca9b0ba7e04f13c767f6.zip
Add license of strlcat and strlcpy to debian/copyright
svn:r1290
-rw-r--r--debian/copyright33
1 files changed, 33 insertions, 0 deletions
diff --git a/debian/copyright b/debian/copyright
index 34f11556ff..df89d52c68 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,8 +9,13 @@ Upstream Authors: Roger Dingledine <arma@freehaven.net>
Copyright (c) 2001-2004, Roger Dingledine
+strlcat and strlcpy: copyright 1998 Todd C. Miller <Todd.Miller@courtesan.com>
Modifications for Debian: Copyright (C) 2004 Peter Palfrader <weasel@debian.org>
+The tor code is licensed under this license:
+===============================================================================
+Copyright (c) 2001-2004, Roger Dingledine
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
@@ -38,3 +43,31 @@ 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.
+
+===============================================================================
+strlcat and strlcpy by Todd C. Miller are licensed under the following license:
+
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 AUTHOR 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.