You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/02/24 17:27:26 UTC

[1/2] incubator-trafodion git commit: [TRAFODION-1837] Add license info for binary distro of clients

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 496b1b02c -> e4cb6dd5a


[TRAFODION-1837] Add license info for binary distro of clients

Also removed separate Apache license file for linux ODBC driver. Instead,
package up the full Apache license that is used for distro LICENSE
files.

The remaining binary license investigation for clients is related to
win-odbc (TRAFODION-1836).

Also verified that no additional info needed for server-side jar files.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a1921b16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a1921b16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a1921b16

Branch: refs/heads/master
Commit: a1921b1684ca4be3be96c163c5fd842361442523
Parents: 611b556
Author: Steve Varnau <st...@esgyn.com>
Authored: Mon Feb 22 22:36:57 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Mon Feb 22 22:42:48 2016 +0000

----------------------------------------------------------------------
 .../odbc/odbcclient/unixcli/package/license.txt |  18 --
 .../odbc/odbcclient/unixcli/package/mklnxpkg.sh |   2 +-
 licenses/lic-clients-bin                        | 180 +++++++++++++++++--
 licenses/lic-server-bin                         |  15 --
 4 files changed, 167 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a1921b16/core/conn/unixodbc/odbc/odbcclient/unixcli/package/license.txt
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/license.txt b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/license.txt
deleted file mode 100644
index fd52331..0000000
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/license.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a1921b16/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
index ac6ef02..e284ed0 100755
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
@@ -116,7 +116,7 @@ then
     ((err += $?))
     cp ../../connect_test.cpp   connect_test.cpp
     ((err += $?))
-    cp ../../license.txt	license.txt
+    cp $MY_SQROOT/../../licenses/Apache license.txt
     ((err += $?))
     cd ..
     # do the tar

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a1921b16/licenses/lic-clients-bin
----------------------------------------------------------------------
diff --git a/licenses/lic-clients-bin b/licenses/lic-clients-bin
index f030b0a..3e8f401 100644
--- a/licenses/lic-clients-bin
+++ b/licenses/lic-clients-bin
@@ -1,23 +1,175 @@
 ===============================================================================
-To Do:
+The binary distribution of Apache Trafodion bundles OpenSSL software. Specifically,
+the Linux ODBC driver is statically linked with OpenSSL libraries. OpenSSL is
+available under a BSD like license. (http://www.openssl.org/)
+
+
+    LICENSE ISSUES
+    ==============
+
+    The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
+    the OpenSSL License and the original SSLeay license apply to the toolkit.
+    See below for the actual license texts. Actually both licenses are BSD-style
+    Open Source licenses. In case of any license issues related to OpenSSL
+    please contact openssl-core@openssl.org.
+
+    OpenSSL License
+    ---------------
 
-Investigate and document third-pary licenses for SW bundled with binaries 
-for each of these client components:
+  /* ====================================================================
+   * Copyright (c) 1998-2011 The OpenSSL Project.  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. All advertising materials mentioning features or use of this
+   *    software must display the following acknowledgment:
+   *    "This product includes software developed by the OpenSSL Project
+   *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+   *
+   * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   *    endorse or promote products derived from this software without
+   *    prior written permission. For written permission, please contact
+   *    openssl-core@openssl.org.
+   *
+   * 5. Products derived from this software may not be called "OpenSSL"
+   *    nor may "OpenSSL" appear in their names without prior written
+   *    permission of the OpenSSL Project.
+   *
+   * 6. Redistributions of any form whatsoever must retain the following
+   *    acknowledgment:
+   *    "This product includes software developed by the OpenSSL Project
+   *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+   *
+   * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+   * EXPRESSED 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 OpenSSL PROJECT OR
+   * ITS 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.
+   * ====================================================================
+   *
+   * This product includes cryptographic software written by Eric Young
+   * (eay@cryptsoft.com).  This product includes software written by Tim
+   * Hudson (tjh@cryptsoft.com).
+   *
+   */
+
+   Original SSLeay License
+   -----------------------
+
+  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+   * All rights reserved.
+   *
+   * This package is an SSL implementation written
+   * by Eric Young (eay@cryptsoft.com).
+   * The implementation was written so as to conform with Netscapes SSL.
+   *
+   * This library is free for commercial and non-commercial use as long as
+   * the following conditions are aheared to.  The following conditions
+   * apply to all code found in this distribution, be it the RC4, RSA,
+   * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+   * included with this distribution is covered by the same copyright terms
+   * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+   *
+   * Copyright remains Eric Young's, and as such any Copyright notices in
+   * the code are not to be removed.
+   * If this package is used in a product, Eric Young should be given attribution
+   * as the author of the parts of the library used.
+   * This can be in the form of a textual message at program startup or
+   * in documentation (online or textual) provided with the package.
+   *
+   * 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 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. All advertising materials mentioning features or use of this software
+   *    must display the following acknowledgement:
+   *    "This product includes cryptographic software written by
+   *     Eric Young (eay@cryptsoft.com)"
+   *    The word 'cryptographic' can be left out if the rouines from the library
+   *    being used are not cryptographic related :-).
+   * 4. If you include any Windows specific code (or a derivative thereof) from
+   *    the apps directory (application code) you must include an acknowledgement:
+   *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+   *
+   * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 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.
+   *
+   * The licence and distribution terms for any publically available version or
+   * derivative of this code cannot be changed.  i.e. this code cannot simply be
+   * copied and put under another distribution licence
+   * [including the GNU Public Licence.]
+   */
+
++++++++++++++++++++++++++++++
 
-JDBCT4.zip  
-  lib/jdbcT4.jar
+The binary distribution of Apache Trafodion bundles ICU software. Specifically,
+the Linux ODBC driver includes ICU shared libraries. ICU is available under an
+MIT like license. (http://site.icu-project.org/)
 
-odb64_linux.tar.gz  
-  bin/odb64luo
+  COPYRIGHT AND PERMISSION NOTICE
 
-trafci.zip  
-  trafciInstaller.jar
+  Copyright (c) 1995-2016 International Business Machines Corporation and others
+
+  All rights reserved.
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, and/or sell copies of the
+  Software, and to permit persons to whom the Software is furnished to do so,
+  provided that the above copyright notice(s) and this permission notice appear
+  in all copies of the Software and that both the above copyright notice(s) and
+  this permission notice appear in supporting documentation.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+  INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+  PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL
+  THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM,
+  OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
+  RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
+  USE OR PERFORMANCE OF THIS SOFTWARE.
+
+  Except as contained in this notice, the name of a copyright holder shall not be
+  used in advertising or otherwise to promote the sale, use or other dealings in
+  this Software without prior written authorization of the copyright holder.
+
++++++++++++++++++++++++++++++
+
+To Do:
 
-TRAF_ODBC_Linux_Driver_64.tar.gz
-  libicu*Nv44.so.44 - ICU http://source.icu-project.org/repos/icu/icu/trunk/license.html
-  statically linked libraries:
-    /usr/lib64/libssl.a
-    /usr/lib64/libcrypto.a
+Investigate and document third-pary licenses for SW bundled with binaries
+for client component:
 
 win-odbc
   TFODBC64-*.exe

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a1921b16/licenses/lic-server-bin
----------------------------------------------------------------------
diff --git a/licenses/lic-server-bin b/licenses/lic-server-bin
index d1e8411..69d617f 100644
--- a/licenses/lic-server-bin
+++ b/licenses/lic-server-bin
@@ -118,18 +118,3 @@ available under a University of Illinois/NCSA license. (http://llvm.org/)
 
 +++++++++++++++++++++++++++++
 
-To Do:
-
-Need to investigate and add info regarding third-party software bundled into jars:
-
-./export/lib/jdbcT2.jar
-./export/lib/jdbcT4.jar
-./export/lib/hbase-trx-hbase_98_4-2.0.0.jar
-./export/lib/hbase-trx-cdh5_3-2.0.0.jar
-./export/lib/hbase-trx-hdp2_2-2.0.0.jar
-./export/lib/sqmanvers.jar
-./export/lib/trafodion-sql-2.0.0.jar
-./export/lib/trafodion-utility-2.0.0.jar
-./export/lib/trafodion-dtm-2.0.0.jar
-./trafci/lib/trafci.jar
-


[2/2] incubator-trafodion git commit: Merge [TRAFODION-1837] PR 336 Add license info for binary distro of clients

Posted by db...@apache.org.
Merge [TRAFODION-1837] PR 336 Add license info for binary distro of clients


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e4cb6dd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e4cb6dd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e4cb6dd5

Branch: refs/heads/master
Commit: e4cb6dd5a35ee1aca240ddcca1a52827da466a02
Parents: 496b1b0 a1921b1
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Feb 24 16:26:07 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Feb 24 16:26:07 2016 +0000

----------------------------------------------------------------------
 .../odbc/odbcclient/unixcli/package/license.txt |  18 --
 .../odbc/odbcclient/unixcli/package/mklnxpkg.sh |   2 +-
 licenses/lic-clients-bin                        | 180 +++++++++++++++++--
 licenses/lic-server-bin                         |  15 --
 4 files changed, 167 insertions(+), 48 deletions(-)
----------------------------------------------------------------------