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/03/08 17:36:05 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-1836] Remove
win-odbc license info from clients package
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 2d44fac64 -> 97a7da4a9
[TRAFODION-1836] Remove win-odbc license info from clients package
Removing TFODBC64 from the client packaging, since there is still
a license issue with pulling in redistributed code from visual
studio. The existing license info is moved to a new file that is
not added to the LICENSE file during packaging. But it is retained
for future use when the issue can be resolved and win-odbc added back
into the binary distribution.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/89b9ca95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/89b9ca95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/89b9ca95
Branch: refs/heads/master
Commit: 89b9ca956b260e88fabe1dac265f87ad8ddc7f50
Parents: a717a3e
Author: Steve Varnau <sv...@apache.org>
Authored: Thu Mar 3 22:42:51 2016 +0000
Committer: Steve Varnau <sv...@apache.org>
Committed: Thu Mar 3 22:49:53 2016 +0000
----------------------------------------------------------------------
licenses/lic-clients-bin | 33 +---------------------------
licenses/lic-winodbc-bin | 50 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/89b9ca95/licenses/lic-clients-bin
----------------------------------------------------------------------
diff --git a/licenses/lic-clients-bin b/licenses/lic-clients-bin
index 8e3b96a..ff9b503 100644
--- a/licenses/lic-clients-bin
+++ b/licenses/lic-clients-bin
@@ -1,7 +1,6 @@
===============================================================================
The binary distribution of Apache Trafodion bundles OpenSSL software. Specifically,
-the Linux ODBC driver is statically linked with OpenSSL libraries. The Windows
-ODBC driver (TFODBC64) also links in OpenSSL libraries.
+the Linux ODBC driver is statically linked with OpenSSL libraries.
OpenSSL is available under a BSD like license. (http://www.openssl.org/)
@@ -167,33 +166,3 @@ MIT like license. (http://site.icu-project.org/)
this Software without prior written authorization of the copyright holder.
+++++++++++++++++++++++++++++
-
-The binary distribution of Apache Trafodion bundles zlib software. Specifically,
-the Windows ODBC driver (TFODBC64) links in zlib libraries. Zlib is
-available under the zlib/libpng license.
-
- zlib.h -- interface of the 'zlib' general purpose compression library
- version 1.2.8, April 28th, 2013
-
- Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Jean-loup Gailly Mark Adler
- jloup@gzip.org madler@alumni.caltech.edu
-
-+++++++++++++++++++++++++++++
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/89b9ca95/licenses/lic-winodbc-bin
----------------------------------------------------------------------
diff --git a/licenses/lic-winodbc-bin b/licenses/lic-winodbc-bin
new file mode 100644
index 0000000..27ec643
--- /dev/null
+++ b/licenses/lic-winodbc-bin
@@ -0,0 +1,50 @@
+
+The Windows ODBC driver (TFODBC4) is removed from the binary distribution
+of Trafodion clients package. This is due to inclusion of vcredist_x64.exe.
+See JIRA TRAFODION-1836.
+
+If the license issues with that software are resolved, and the driver is
+added back to the clients binary distribution package, then the license info
+below must be integrated back into lic-clients-bin file.
+
+This only affects binary distribution. This issue does not apply to the source
+distribution of win-odbc or derivative products.
+
+===============================================================================
+The binary distribution of Apache Trafodion bundles OpenSSL software. Specifically,
+the Linux ODBC driver is statically linked with OpenSSL libraries. The Windows
+ODBC driver (TFODBC64) also links in OpenSSL libraries.
+
+(Documented in licenses/lic-clients-bin.)
+
++++++++++++++++++++++++++++++
+
+The binary distribution of Apache Trafodion bundles zlib software. Specifically,
+the Windows ODBC driver (TFODBC64) links in zlib libraries. Zlib is
+available under the zlib/libpng license.
+
+ zlib.h -- interface of the 'zlib' general purpose compression library
+ version 1.2.8, April 28th, 2013
+
+ Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly Mark Adler
+ jloup@gzip.org madler@alumni.caltech.edu
+
++++++++++++++++++++++++++++++
[2/2] incubator-trafodion git commit: Merge [TRAFODION-1836] PR 361
Remove some license info from clients pkg
Posted by db...@apache.org.
Merge [TRAFODION-1836] PR 361 Remove some license info from clients pkg
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/97a7da4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/97a7da4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/97a7da4a
Branch: refs/heads/master
Commit: 97a7da4a9558643935c29bb3a4883d6793b4fa32
Parents: 2d44fac 89b9ca9
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Mar 8 16:35:16 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Mar 8 16:35:16 2016 +0000
----------------------------------------------------------------------
licenses/lic-clients-bin | 33 +---------------------------
licenses/lic-winodbc-bin | 50 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 32 deletions(-)
----------------------------------------------------------------------