Merge pull request #5495 from adivinho/release-8.4.2-2

PKG-299 Release tasks for PS 8.4.2 pro

build-ps/build-binary.sh

@@ -31,6 +31,7 @@ COMMON_FLAGS=''
 TOKUDB_BACKUP_VERSION=''
 # enable asan
 ENABLE_ASAN=0
+FIPSMODE=0
 #
 # Some programs that may be overriden
 TAR=${TAR:-tar}
@@ -39,7 +40,7 @@ TAR=${TAR:-tar}
 if ! getopt --test
 then
     go_out="$(getopt --options=iqdvj:m:t: \
-        --longoptions=i686,quiet,debug,valgrind,with-jemalloc:,with-mecab:,with-ssl:,tag: \
+        --longoptions=i686,quiet,debug,valgrind,with-jemalloc:,enable-fipsmode,with-mecab:,with-ssl:,tag: \
         --name="$(basename "$0")" -- "$@")"
     test $? -eq 0 || exit 1
     eval set -- $go_out
@@ -104,6 +105,12 @@ do
             exit 3
         fi
         ;;
+    --enable-fipsmode )
+        shift
+        FIPSMODE=1
+        WITH_SSL="OFF"
+        BUILD_COMMENT="${BUILD_COMMENT:-}-pro"
+        ;;
     -t | --tag )
         shift
         TAG="$1"
@@ -169,10 +176,19 @@ elif [ -n "$(command -v git)" -a -d "$SOURCEDIR/.git" ];
 then
     REVISION="$(git rev-parse --short HEAD)"
 fi
-PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
+if [ x"${FIPSMODE}" == x1 ]; then
+    PRODUCT_FULL="Percona-Server-Pro-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
+else
+    PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
+fi
 PRODUCT_FULL="$PRODUCT_FULL-$TAG$(uname -s)${DIST_NAME:-}.$TARGET${GLIBC_VER:-}${TARBALL_SUFFIX:-}"
-COMMENT="Percona Server (GPL), Release ${MYSQL_VERSION_EXTRA#-}"
-COMMENT="$COMMENT, Revision $REVISION${BUILD_COMMENT:-}"
+if [ x"${FIPSMODE}" == x1 ]; then
+    COMMENT="Percona Server Pro (GPL), Release ${MYSQL_VERSION_EXTRA#-}"
+    COMMENT="$COMMENT, Revision $REVISION${BUILD_COMMENT:-}"
+else
+    COMMENT="Percona Server (GPL), Release ${MYSQL_VERSION_EXTRA#-}"
+    COMMENT="$COMMENT, Revision $REVISION${BUILD_COMMENT:-}"
+fi
 
 # Compilation flags
 export CC=${CC:-gcc}
@@ -214,9 +230,8 @@ if [ -n "$(command -v rpm)" ]; then
   if test "x$CMAKE_BUILD_TYPE" = "xDebug"
   then
     COMMON_FLAGS=`echo " ${COMMON_FLAGS} " | \
-              sed -e 's/-Wall/-Wall -Wno-error=stringop-overflow -Wno-error=restrict -Wno-error=maybe-uninitialized -Wno-error=array-bounds -Wno-error=alloc-size-larger-than= -Wno-error=stringop-truncation/' \
-            #  sed -e 's/ -O[0-9]* / /' \
-                  -e 's/-Wp,-D_FORTIFY_SOURCE=2//' \
+              sed -e 's/ -O[0-9]* / /' \
+                  -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /' \
                   -e 's/ -unroll2 / /' \
                   -e 's/ -ip / /' \
                   -e 's/^ //' \
@@ -302,8 +317,11 @@ fi
 )
 
 (
-
-    LIBLIST="libaio.so.1 libnuma.so.1 libgssapi.so libldap_r-2.4.so.2 libldap.so.2 liblber-2.4.so.2 liblber.so.2 libtinfo.so libsasl2.so libbrotlidec.so libbrotlicommon.so librtmp.so libgssapi_krb5.so libkrb5.so libk5crypto.so libsmime3.so libnss3.so libssl3.so libnssutil3.so libplc4.so libnspr4.so libplds4.so libncurses.so.5 libtinfo.so.5 component_encryption_udf.so component_uuid_vx_udf.so component_keyring_kms.so component_masking_functions.so"
+if [ x"${FIPSMODE}" == x1 ]; then
+    LIBLIST="libgssapi.so libldap_r-2.4.so.2 libldap.so.2 liblber-2.4.so.2 liblber.so.2 libreadline.so libtinfo.so libbrotlidec.so libbrotlicommon.so librtmp.so libgssapi_krb5.so libkrb5.so libssl3.so libsmime3.so libnss3.so libnssutil3.so libplc4.so libnspr4.so libplds4.so libncurses.so.5 libtinfo.so.5 component_encryption_udf.so component_keyring_kms.so component_masking_functions.so"
+else
+    LIBLIST="libgssapi.so libldap_r-2.4.so.2 libldap.so.2 liblber-2.4.so.2 liblber.so.2 libcrypto.so libssl.so libreadline.so libtinfo.so libsasl2.so libbrotlidec.so libbrotlicommon.so librtmp.so libgssapi_krb5.so libkrb5.so libk5crypto.so libssl3.so libsmime3.so libnss3.so libnssutil3.so libplc4.so libnspr4.so libssl3.so libplds4.so libncurses.so.5 libtinfo.so.5 component_encryption_udf.so component_keyring_kms.so component_masking_functions.so"
+fi
     DIRLIST="bin lib lib/private lib/plugin lib/mysqlrouter/plugin lib/mysqlrouter/private"
 
     LIBPATH=""

build-ps/debian/compat

@@ -1 +1 @@
-9
+10

build-ps/debian/percona-server-server.install

@@ -145,7 +145,6 @@ usr/lib/mysql/plugin/mysql_no_login.so
 usr/lib/mysql/plugin/rewriter.so
 usr/lib/mysql/plugin/semisync_master.so
 usr/lib/mysql/plugin/semisync_slave.so
-usr/lib/mysql/plugin/test_security_context.so
 usr/lib/mysql/plugin/validate_password.so
 usr/lib/mysql/plugin/version_token.so
 usr/lib/mysql/plugin/connection_control.so
@@ -177,7 +176,6 @@ usr/lib/mysql/plugin/debug/mysql_no_login.so
 usr/lib/mysql/plugin/debug/rewriter.so
 usr/lib/mysql/plugin/debug/semisync_master.so
 usr/lib/mysql/plugin/debug/semisync_slave.so
-usr/lib/mysql/plugin/debug/test_security_context.so
 usr/lib/mysql/plugin/debug/validate_password.so
 usr/lib/mysql/plugin/debug/version_token.so
 usr/lib/mysql/plugin/debug/keyring_udf.so

build-ps/debian/rules

@@ -7,12 +7,18 @@ export DH_VERBOSE=1
 export CFLAGS=
 export CXXFLAGS=
 export CPPFLAGS=
+export FIPSMODE=0
 
 PACKAGE=percona-server
 PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@'
 REVISION = '@@REVISION@@'
-COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
-COMPILATION_COMMENT_DEBUG = "Percona Server - Debug (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
+ifeq ($(FIPSMODE),1)
+	COMPILATION_COMMENT_RELEASE = "Percona Server Pro (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
+	COMPILATION_COMMENT_DEBUG = "Percona Server Pro - Debug (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
+else
+	COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"$
+	COMPILATION_COMMENT_DEBUG = "Percona Server - Debug (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"$
+endif
 TOKUDB_BACKUP_VERSION = "@@TOKUDB_BACKUP_VERSION@@"
 
 TMP=$(CURDIR)/debian/tmp/