Merge remote-tracking branch 'origin/release/8.0.30'

Change-Id: I72d5d5f17dca39635e37104b631662794baf16c4

Author: silvakid

CONTRIBUTING.md

@@ -9,7 +9,7 @@ Before reporting a new bug, please check first to see if a similar bug [exists](
 Bug reports should be as complete as possible.  Please try and include the following:
 
 * complete steps to reproduce the issue
-* any information about platform and environment that could be specific to the bug  
+* any information about platform and environment that could be specific to the bug
 * Specific version of the product you are using
 * Specific version of the server being used
 * C++ code to help reproduce the issue if possible
@@ -18,7 +18,7 @@ Bug reports should be as complete as possible.  Please try and include the follo
 
 Contributing to this project is easy. You just need to follow these steps.
 
-* Sign the Oracle Contributor Agreement. You can find instructions for doing that at [OCA Page](https://www.oracle.com/technetwork/community/oca-486395.html)
+* Sign the Oracle Contributor Agreement. You can find instructions for doing that at [OCA Page](https://oca.opensource.oracle.com/)
 * Develop your pull request
   * Make sure you are aware of the requirements for the project (i.e. don't require C++17 if we are supporting C++11 and higher)
 * Validate your pull request by including tests that sufficiently cover the functionality

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: March 2022
+   Last updated: April 2022
 
 Licensing Information
 
@@ -1885,6 +1885,105 @@ The following notice applies to
    ======================================================================
    ======================================================================
 
+LibFIDO
+
+Copyright (c) 2018-2021 Yubico AB. 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.
+
+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
+HOLDER 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.
+
+4th Party
+=========
+
+libcbor
+-------
+
+MIT License
+
+Copyright (c) 2014-2017 Pavel Kalvoda
+
+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, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+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. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+------------------------------------------------------------------------------
+----
+zlib
+----
+
+Copyright notice:
+
+ (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.
+
+------------------------------------------------------------------------------
+OpenSSL (See its own license section)
+------------------------------------------------------------------------------
+
+   ======================================================================
+   ======================================================================
+
 LZ4
 
 LZ4 Library

buildinfo.cmake

@@ -169,11 +169,11 @@ FUNCTION(GENERATE_INFO_SRC)
       ENDIF()
     ENDIF()
 
-    CONFIGURE_FILE(INFO_SRC.in "${CMAKE_SOURCE_DIR}/INFO_SRC")
+    CONFIGURE_FILE(INFO_SRC.in "${CMAKE_BINARY_DIR}/INFO_SRC")
   ENDIF()
 
   install(
-    FILES "${CMAKE_SOURCE_DIR}/INFO_SRC"
+    FILES "${CMAKE_BINARY_DIR}/INFO_SRC"
     DESTINATION ${INSTALL_DOC_DIR}
     COMPONENT Readme
   )

jdbc

@@ -31,6 +31,45 @@ IF (NOT DEFINED DEB_CODENAME)
   )
   SET (DEB_CODENAME ${DEB_CODENAME} CACHE STRING "")
 ENDIF()
+
+# debian, ubuntu
+IF (NOT DEFINED DEB_ID)
+  execute_process(
+    COMMAND lsb_release -is
+    OUTPUT_VARIABLE DEB_ID
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  SET (DEB_ID ${DEB_ID} CACHE STRING "")
+ENDIF()
+
+# 22.04, 11.x, etc
+IF (NOT DEFINED DEB_RELEASE)
+  execute_process(
+    COMMAND lsb_release -rs
+    OUTPUT_VARIABLE DEB_RELEASE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  SET (DEB_RELEASE ${DEB_RELEASE} CACHE STRING "")
+ENDIF()
+
+# Change uppercase first letter of Ubuntu/Debian
+string(TOLOWER "${DEB_ID}" DEB_ID)
+
+# lsb_release on Debian reports the full version number, e.g. 9.9, and we just want the major version
+IF(DEB_ID STREQUAL "debian")
+  string(REGEX REPLACE "\\..*" "" DEB_RELEASE "${DEB_RELEASE}")
+ENDIF()
+
+# ubuntu22.04, debian11, etc
+SET (DEB_PLATFORMRELEASE "${DEB_ID}${DEB_RELEASE}")
+
+IF(DEB_CODENAME STREQUAL "sid")
+  IF (DEFINED DEB_GCC_SNAPSHOT)
+    SET (DEB_CMAKE_EXTRAS "${DEB_CMAKE_EXTRAS} -DCMAKE_C_COMPILER=/usr/lib/gcc-snapshot/bin/gcc -DCMAKE_CXX_COMPILER=/usr/lib/gcc-snapshot/bin/g++ -DMYSQL_MAINTAINER_MODE=0 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache")
+  ENDIF()
+  SET (DEB_PLATFORMRELEASE "debianunstable")
+ENDIF()
+
 # Timestamp for use in debian/changelog
 IF (NOT DEFINED DEB_CHANGELOG_TIMESTAMP)
   execute_process(
@@ -55,49 +94,10 @@ ELSE()
   SET (DEB_VERSION "-1")
   SET (DEB_SERVERPRODUCT "community")
 ENDIF()
-
-
-# Platform specifics. The differences are generally only distro name used in version string
-IF(DEB_CODENAME STREQUAL "stretch")
-  SET (DEB_PLATFORMRELEASE "debian9")
-ELSEIF(DEB_CODENAME STREQUAL "buster")
-  SET (DEB_PLATFORMRELEASE "debian10")
-ELSEIF(DEB_CODENAME STREQUAL "bullseye")
-  SET (DEB_PLATFORMRELEASE "debian11")
-ELSEIF(DEB_CODENAME STREQUAL "sid")
-  IF (DEFINED DEB_GCC_SNAPSHOT)
-    SET (DEB_CMAKE_EXTRAS "${DEB_CMAKE_EXTRAS} -DCMAKE_C_COMPILER=/usr/lib/gcc-snapshot/bin/gcc -DCMAKE_CXX_COMPILER=/usr/lib/gcc-snapshot/bin/g++ -DMYSQL_MAINTAINER_MODE=0 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache")
-  ENDIF()
-  SET (DEB_PLATFORMRELEASE "debianunstable")
-ELSEIF(DEB_CODENAME STREQUAL "xenial")
-  SET (DEB_PLATFORMRELEASE "ubuntu16.04")
-  # Generate debug symbol packages (this is done automatically in Debian9+)
-  SET (DEB_RULES_STRIP
-"
-override_dh_strip:
-	dh_strip -plibmysqlcppconn9 --dbg-package=libmysqlcppconn9-dbgsym
-	dh_strip -plibmysqlcppconn8-2 --dbg-package=libmysqlcppconn8-2-dbgsym
-")
-  SET (DEB_CONTROL_DBGSYM
-"
-Package: libmysqlcppconn9-dbgsym
-Architecture: any
-Section: debug
-Depends: libmysqlcppconn9 (=\${binary:Version}), \${misc:Depends}
-Description: Debugging symbols for compat library
-
-Package: libmysqlcppconn8-2-dbgsym
-Architecture: any
-Section: debug
-Depends: libmysqlcppconn8-2 (= \${binary:Version}), \${misc:Depends}
-Description: Debugging symbols for main library
-")
-ELSEIF(DEB_CODENAME STREQUAL "bionic")
-  SET (DEB_PLATFORMRELEASE "ubuntu18.04")
-ELSEIF(DEB_CODENAME STREQUAL "groovy")
-  SET (DEB_PLATFORMRELEASE "ubuntu20.10")
-ELSEIF(DEB_CODENAME STREQUAL "focal")
-  SET (DEB_PLATFORMRELEASE "ubuntu20.04")
+ELSEIF(DEB_CODENAME STREQUAL "hirsute")
+  SET (DEB_PLATFORMRELEASE "ubuntu21.04")
+ELSEIF(DEB_CODENAME STREQUAL "impish")
+  SET (DEB_PLATFORMRELEASE "ubuntu21.10")
 ELSEIF(DEB_CODENAME STREQUAL "jammy")
   SET (DEB_PLATFORMRELEASE "ubuntu22.04")
 ELSE()

packaging/deb-in/CMakeLists.txt

@@ -146,15 +146,15 @@ rm %{buildroot}/usr/{INFO_SRC,INFO_BIN}
 %postun jdbc -p /sbin/ldconfig
 
 %files
-%doc README.txt LICENSE.txt INFO_SRC build-dynamic/INFO_BIN
+%doc README.txt LICENSE.txt build-dynamic/INFO_SRC build-dynamic/INFO_BIN
 %{_libdir}/libmysqlcppconn8.so.@ABI_VERSION_MAJOR@*
 
 %files jdbc
-%doc README.txt LICENSE.txt INFO_SRC build-dynamic/INFO_BIN
+%doc README.txt LICENSE.txt build-dynamic/INFO_SRC build-dynamic/INFO_BIN
 %{_libdir}/libmysqlcppconn.so.@JDBC_ABI_VERSION_MAJOR@*
 
 %files devel
-%doc README.txt LICENSE.txt INFO_SRC build-dynamic/INFO_BIN
+%doc README.txt LICENSE.txt build-dynamic/INFO_SRC build-dynamic/INFO_BIN
 %{_libdir}/libmysqlcppconn.so
 %{_libdir}/libmysqlcppconn-static.a
 %{_libdir}/libmysqlcppconn8.so