BUG#22322685 ERROR LOG DEFINED PATH MIS-ALIGNS WITH LOGROTATE.D CONFIG IN RPM INSTALL

Use cmake variables to align paths.

Author: trosten

CMakeLists.txt

@@ -637,6 +637,7 @@ IF(NOT WITHOUT_SERVER)
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
     ADD_SUBDIRECTORY(internal)
   ENDIF()
+  ADD_SUBDIRECTORY(packaging/rpm-common)
   ADD_SUBDIRECTORY(packaging/rpm-oel)
   ADD_SUBDIRECTORY(packaging/rpm-fedora)
   ADD_SUBDIRECTORY(packaging/rpm-sles)

packaging/rpm-common/CMakeLists.txt

@@ -0,0 +1,32 @@
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+IF ("${PIDFILE_RPM}" STREQUAL "")
+  SET(PIDFILE_RPM  "/var/run/mysqld/mysqld.pid")
+ENDIF()
+
+IF ("${LOGFILE_RPM}" STREQUAL "")
+  SET(LOGFILE_RPM "/var/log/mysqld.log")
+ENDIF()
+
+SET(bindir "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}")
+
+FOREACH(cfile my.cnf mysql.logrotate)
+  CONFIGURE_FILE(${cfile}.in ${CMAKE_CURRENT_BINARY_DIR}/${cfile} @ONLY)
+ENDFOREACH()
+
+FOREACH(cfile filter-provides.sh filter-requires.sh mysql_config.sh my_config.h)
+  CONFIGURE_FILE(${cfile} ${CMAKE_CURRENT_BINARY_DIR}/${cfile} COPYONLY)
+ENDFOREACH()

packaging/rpm-oel/filter-provides.sh renamed to packaging/rpm-common/filter-provides.sh

@@ -1,5 +1,5 @@
 # For advice on how to change settings please see
-# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html
+# http://dev.mysql.com/doc/refman/@MYSQL_BASE_VERSION@/en/server-configuration-defaults.html
 
 [mysqld]
 #
@@ -17,11 +17,11 @@
 # join_buffer_size = 128M
 # sort_buffer_size = 2M
 # read_rnd_buffer_size = 2M
-datadir=/var/lib/mysql
-socket=/var/lib/mysql/mysql.sock
+datadir=@INSTALL_MYSQLDATADIR@
+socket=@MYSQL_UNIX_ADDR@
 
 # Disabling symbolic-links is recommended to prevent assorted security risks
 symbolic-links=0
 
-log-error=/var/log/mysqld.log
-pid-file=/var/run/mysqld/mysqld.pid
+log-error=@LOGFILE_RPM@
+pid-file=@PIDFILE_RPM@

packaging/rpm-oel/filter-requires.sh renamed to packaging/rpm-common/filter-requires.sh

@@ -0,0 +1,36 @@
+# The log file name and location can be set in
+# /etc/my.cnf by setting the "log-error" option
+# in [mysqld]  section as follows:
+#
+# [mysqld]
+# log-error=@LOGFILE_RPM@
+#
+# For the mysqladmin commands below to work, root account
+# password is required. Use mysql_config_editor(1) to store
+# authentication credentials in the encrypted login path file
+# ~/.mylogin.cnf
+#
+# Example usage:
+#
+#  mysql_config_editor set --login-path=client --user=root --host=localhost --password
+#
+# When these actions has been done, un-comment the following to
+# enable rotation of mysqld's log error.
+#
+
+#@LOGFILE_RPM@ {
+#        create 640 mysql mysql
+#        notifempty
+#        daily
+#        rotate 5
+#        missingok
+#        compress
+#    postrotate
+#       # just if mysqld is really running
+#       if test -x @bindir@/mysqladmin && \
+#          @bindir@/mysqladmin ping &>/dev/null
+#       then
+#          @bindir@/mysqladmin flush-logs
+#       fi
+#    endscript
+#}

packaging/rpm-fedora/my.cnf renamed to packaging/rpm-common/my.cnf.in

@@ -26,8 +26,5 @@ IF(UNIX)
   # Left in current directory, to be taken during build
   CONFIGURE_FILE(mysql.spec.in ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY)
 
-  FOREACH(fedfile my.cnf mysql_config.sh)
-    CONFIGURE_FILE(${fedfile} ${CMAKE_CURRENT_BINARY_DIR}/${fedfile} COPYONLY)
-  ENDFOREACH()
 ENDIF()
 

packaging/rpm-oel/my_config.h renamed to packaging/rpm-common/my_config.h

@@ -66,7 +66,6 @@ License:        Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All
 Source0:        https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
 Source1:        http://downloads.sourceforge.net/boost/@[email protected]
 Source2:        %{compatsrc}
-Source3:        mysql_config.sh
 URL:            http://www.mysql.com/
 Packager:       MySQL Release Engineering <[email protected]>
 Vendor:         %{mysql_vendor}
@@ -464,11 +463,10 @@ install -d -m 0750 %{buildroot}/var/lib/mysql-keyring
 # Install all binaries
 pushd $MBD/release
 make DESTDIR=%{buildroot} install
-popd
 
-# Install logrotate and autostart
-install -D -m 0644 $MBD/release/support-files/mysql-log-rotate %{buildroot}%{_sysconfdir}/logrotate.d/mysql
-install -D -m 0644 $MBD/release/packaging/rpm-fedora/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
+# Install config and logrotate
+install -D -m 0644 packaging/rpm-common/mysql.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/mysql
+install -D -m 0644 packaging/rpm-common/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
 install -d %{buildroot}%{_sysconfdir}/my.cnf.d
 
 # Add libdir to linker
@@ -479,7 +477,7 @@ echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}
 %multilib_fix_c_header --file %{_includedir}/mysql/my_config.h
 if %multilib_capable ; then
     mv %{buildroot}%{_bindir}/mysql_config %{buildroot}%{_bindir}/mysql_config-%{__isa_bits}
-    install -p -m 0755 %{SOURCE3} %{buildroot}%{_bindir}/mysql_config
+    install -p -m 0755 packaging/rpm-common/mysql_config.sh %{buildroot}%{_bindir}/mysql_config
 fi
 
 # Remove files pages we explicitly do not want to package