update net-proxy/3dproxy license

1 files changed, 52 insertions, 24 deletions

diff --git a/licenses/3proxy b/licenses/3proxy
index bfe6bd91cec0..2c7449ee39e9 100644
--- a/licenses/3proxy
+++ b/licenses/3proxy
@@ -1,31 +1,59 @@
-3proxy 0.4.3b Public License Agreement
+3proxy 0.6 Public License Agreement
 
-This software provided "as is" without any guaranties or support.
+(c) 2000-2009 by 3APA3A (3APA3A@security.nnov.ru)
+(c) 2000-2009 by SecurityVulns.com (http://3proxy.ru/)
+(c) 2000-2009 by Vladimir Dubrovin (vlad@sandy.ru)
 
-This software is FREEWARE. You can use it under terms of current version
-of GNU GPL (General Public License) available from 
-http://www.gnu.org/licenses/gpl.txt or under conditions below:
+This software uses:
+  RSA Data Security, Inc. MD4 Message-Digest Algorithm
+  RSA Data Security, Inc. MD5 Message-Digest Algorithm
 
-1. You are granted non-exclusive rights to compile, modify, use and
-re-distribute this program.
-2. In case this software is redistributed in binary form, source code
-MUST be available for user for free.
-3. In case this software redistributed embedded in hardware device or
-pre-installed version of operation system and source code is not available,
-documentation MUST refer to http://www.security.nnov.ru/ as a source of
-software.
-4. In case this software is modified or is used as a part of another project
-license MUST NOT be modified.
-5. Authors of this software MAY change terms of this license for future
-versions of this product.
+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.
 
-(c) 2000-2003 by 3APA3A (3APA3A@security.nnov.ru)
-(c) 2000-2003 by SECURITY.NNOV (http://www.security.nnov.ru)
-(c) 2000-2003 by Vladimir Dubrovin (vlad@sandy.ru)
+This software is FREEWARE. 
 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that following conditions
+are met (BSD style license):
 
-This software uses:
-  RSA Data Security, Inc. MD4 Message-Digest Algorithm
-  RSA Data Security, Inc. MD5 Message-Digest Algorithm
+    * 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 name of the SecurityVulns.COM nor the names of its
+    contributors may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+
+Instead of this license, you can also use and redistribute this software under
+terms of compatible license, including:
+
+1. Apache License, Version 2.0
+   You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+2. GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   You may obtain a copy of the License at
+
+	http://www.gnu.org/licenses/gpl.txt
+
+3. GNU Lesser General Public License as published by the
+   Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+   You may obtain a copy of the License at
 
-$Id: 3proxy,v 1.1 2004/03/18 04:13:47 vapier Exp $
+	http://www.gnu.org/licenses/lgpl.txt