Merge branch 'master' into release/8.0.24

Author: silvakid

LICENSE.txt

@@ -10,7 +10,7 @@ Introduction
    third-party software which may be included in this distribution of
    MySQL Connector/C++ 8.0.
 
-   Last updated: September 2020
+   Last updated: January 2021
 
 Licensing Information
 
@@ -33,7 +33,7 @@ Licensing Information
    a copy of which is reproduced below and can also be found along with
    its FAQ at http://oss.oracle.com/licenses/universal-foss-exception.
 
-   Copyright (c) 2008, 2020, Oracle and/or its affiliates.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
 Election of GPLv2
 
@@ -474,84 +474,40 @@ Licenses for Third-Party Components
    may be included with this product. We are thankful to all individuals
    that have created these.
 
-Boost Library
-
-   Boost C++ Libraries
-
-   Use of any of this software is governed by the terms of the license
-   below:
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or
-organization obtaining a copy of the software and accompanying
-documentation covered by this license (the "Software") to use,
-reproduce, display, distribute, execute, and transmit the Software,
-and to prepare derivative works of the Software, and to permit
-third-parties to whom the Software is furnished to do so, all
-subject to the following:
-
-The copyright notices in the Software and this entire statement,
-including the above license grant, this restriction and the
-following disclaimer, must be included in all copies of the
-Software, in whole or in part, and all derivative works of the
-Software, unless such copies or derivative works are solely in the
-form of machine-executable object code generated by a source
-language processor.
-
-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, TITLE AND
-NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE
-DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER
-LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
-OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
-   ======================================================================
-   ======================================================================
-
 Google Protocol Buffers
 
-Protocol Buffers (aka Google protobuf)
-
-Google Protocol Buffers - protobuf
-Copyright 2008, Google Inc.
-All rights reserved.
+Copyright 2008 Google Inc.  All rights reserved.
 
-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 name of Google Inc. 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.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-Code generated by the Protocol Buffer compiler is owned by
-the owner of the input file used when generating it. This
-code is not standalone and requires a support library to be
-linked with it. This support library is itself covered by
-the above license.
+    * 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 Google Inc. 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.
+
+Code generated by the Protocol Buffer compiler is owned by the owner
+of the input file used when generating it.  This code is not
+standalone and requires a support library to be linked with it.  This
+support library is itself covered by the above license.
 
    ======================================================================
    ======================================================================
@@ -831,46 +787,6 @@ SOFTWARE.
    ======================================================================
    ======================================================================
 
-zlib
-
-   zlib
-
-   Oracle gratefully acknowledges the contributions of Jean-loup Gailly
-   and Mark Adler in creating the zlib general purpose compression library
-   which is used in this product.
-(C) 1995-2017 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
-  [email protected]          [email protected]
-
-If you use the zlib library in a product, we would appreciate *not* receiving
-lengthy legal documents to sign.  The sources are provided for free but without
-warranty of any kind.  The library has been entirely written by Jean-loup
-Gailly and Mark Adler; it does not include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include in
-the file ChangeLog history information documenting your changes.  Please read
-the FAQ for more information on the distribution of modified source versions.
-
-   ======================================================================
-   ======================================================================
-
 ZSTD
 
    Zstandard

packaging/mysql-connector-c++.spec.in

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2020, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -36,6 +36,13 @@
 %{?commercial:   %global product_suffix -commercial}
 %{!?commercial:  %global product_suffix %{nil}}
 %{?el6:%global __strip /opt/rh/devtoolset-8/root/usr/bin/strip}
+%{?el6:%global gcc_toolset devtoolset-8}
+%ifarch %{arm} aarch64 arm64
+%{?el7:%global gcc_toolset devtoolset-9}
+%else
+%{?el7:%global gcc_toolset devtoolset-10}
+%endif
+%{?el8:%global gcc_toolset gcc-toolset-10}
 %if 0%{?suse_version} == 1315
 %global dist            .sles12
 %endif
@@ -61,12 +68,8 @@ BuildRequires:  cmake
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 %endif
-%{?el6:BuildRequires: devtoolset-8-gcc}
-%{?el6:BuildRequires: devtoolset-8-gcc-c++}
-%{?el7:BuildRequires: devtoolset-9-gcc}
-%{?el7:BuildRequires: devtoolset-9-gcc-c++}
-%{?el8:BuildRequires: gcc-toolset-9-gcc}
-%{?el8:BuildRequires: gcc-toolset-9-gcc-c++}
+BuildRequires: %{gcc_toolset}-gcc
+BuildRequires: %{gcc_toolset}-gcc-c++
 %{!?mysql_dir:BuildRequires: mysql-devel}
 BuildRequires:  openssl-devel
 %{?commercial:Obsoletes: mysql-connector-c++ < %{version}-%{release}}
@@ -118,18 +121,7 @@ test suite for MySQL Connector/C++
 
 %build
 
-%{?el6:. /opt/rh/devtoolset-8/enable}
-%{?el6:export CC=/opt/rh/devtoolset-8/root/usr/bin/gcc}
-%{?el6:export CXX=/opt/rh/devtoolset-8/root/usr/bin/g++}
-
-%{?el7:. /opt/rh/devtoolset-9/enable}
-%{?el7:export LD_LIBRARY_PATH=/opt/rh/devtoolset-9/root/usr/lib64:$LD_LIBRARY_PATH}
-%{?el7:export CC=/opt/rh/devtoolset-9/root/usr/bin/gcc}
-%{?el7:export CXX=/opt/rh/devtoolset-9/root/usr/bin/g++}
-
-%{?el8:. /opt/rh/gcc-toolset-9/enable}
-%{?el8:export CC=/opt/rh/gcc-toolset-9/root/usr/bin/gcc}
-%{?el8:export CXX=/opt/rh/gcc-toolset-9/root/usr/bin/g++}
+source /opt/rh/%{gcc_toolset}/enable
 
 %if 0%{?with_tests:1} && 0%{?with_gtest:1}
 %global __cmake_test_opts -DWITH_TESTS=1 -DWITH_GTEST=%{with_gtest}
@@ -154,10 +146,7 @@ make %{?_smp_mflags} VERBOSE=1
 popd
 
 %install
-%{?el6:. /opt/rh/devtoolset-8/enable}
-%{?el7:export LD_LIBRARY_PATH=/opt/rh/devtoolset-9/root/usr/lib64:$LD_LIBRARY_PATH}
-%{?el7:. /opt/rh/devtoolset-9/enable}
-%{?el8:. /opt/rh/gcc-toolset-9/enable}
+source /opt/rh/%{gcc_toolset}/enable
 
 pushd build-dynamic
 make DESTDIR=%{buildroot} install
@@ -229,6 +218,9 @@ rm %{buildroot}/usr/{INFO_SRC,INFO_BIN}
 %endif
 
 %changelog
+* Fri Feb 05 2021 Kent Boortz <[email protected]> - 8.0.24-1
+- Aligned compiler settings with server
+
 * Thu Nov 12 2020 Balasubramanian Kandasamy <[email protected]> - 8.0.23-1
 - Remove dependency on the mysql-client-plugins package for smooth upgrade