BUG#20587028 LOG IS NOT WRITTEN IN /VAR/LOG/MYSQL/MYSQLD.LOG IN SLES12 REPO

Perms set on log file directory was too strict, server was not allowed
to write to log file.

Also fix perms on datadir as socket file might be inside and perms set
on mysql-files directory.

Signed-off-by: Terje Røsten <[email protected]>
(cherry picked from commit 4d99bc6ecfb5d31616adac74e5386a9919beb678)

Author: trosten

packaging/rpm-fedora/mysql.spec.in

@@ -464,7 +464,7 @@ MBD=$RPM_BUILD_DIR/%{src_dir}
 # Ensure that needed directories exists
 install -d -m 0755 %{buildroot}/var/lib/mysql
 install -d -m 0755 %{buildroot}/var/run/mysqld
-install -d -m 0770 %{buildroot}/var/lib/mysql-files
+install -d -m 0750 %{buildroot}/var/lib/mysql-files
 
 # Install all binaries
 pushd $MBD/release
@@ -517,7 +517,7 @@ rm -r $(readlink var) var
 
 %post server
 datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
-/bin/chmod 0750 "$datadir" >/dev/null 2>&1 || :
+/bin/chmod 0755 "$datadir" >/dev/null 2>&1 || :
 /bin/touch /var/log/mysqld.log >/dev/null 2>&1 || :
 %systemd_post mysqld.service
 /usr/bin/systemctl enable mysqld >/dev/null 2>&1 || :
@@ -635,7 +635,7 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
 %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
 %dir %attr(755, mysql, mysql) /var/lib/mysql
 %dir %attr(755, mysql, mysql) /var/run/mysqld
-%dir %attr(770, mysql, mysql) /var/lib/mysql-files
+%dir %attr(750, mysql, mysql) /var/lib/mysql-files
 
 %files common
 %defattr(-, root, root, -)

packaging/rpm-oel/mysql.init

@@ -84,7 +84,7 @@ start(){
 		mkdir -p "$datadir" || exit 1
 	    fi
 	    chown mysql:mysql "$datadir"
-	    chmod 0750 "$datadir"
+	    chmod 0755 "$datadir"
 	    [ -x /sbin/restorecon ] && /sbin/restorecon "$datadir"
 	    # Now create the database
 	    action $"Initializing MySQL database: " /usr/bin/mysql_install_db --datadir="$datadir" --user=mysql
@@ -100,7 +100,7 @@ start(){
 
 	fi
 	chown mysql:mysql "$datadir"
-	chmod 0750 "$datadir"
+	chmod 0755 "$datadir"
 	# Pass all the options determined above, to ensure consistent behavior.
 	# In many cases mysqld_safe would arrive at the same conclusions anyway
 	# but we need to be sure.  (An exception is that we don't force the

packaging/rpm-oel/mysql.spec.in

@@ -625,7 +625,7 @@ MBD=$RPM_BUILD_DIR/%{src_dir}
 # Ensure that needed directories exists
 install -d -m 0755 %{buildroot}/var/lib/mysql
 install -d -m 0755 %{buildroot}/var/run/mysqld
-install -d -m 0770 %{buildroot}/var/lib/mysql-files
+install -d -m 0750 %{buildroot}/var/lib/mysql-files
 
 # Install all binaries
 cd $MBD/release
@@ -681,7 +681,7 @@ rm -r $(readlink var) var
 
 %post server
 datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
-/bin/chmod 0750 "$datadir" >/dev/null 2>&1 || :
+/bin/chmod 0755 "$datadir" >/dev/null 2>&1 || :
 /bin/touch /var/log/mysqld.log >/dev/null 2>&1 || :
 %if 0%{?systemd}
 %systemd_post mysqld.service
@@ -842,7 +842,7 @@ fi
 %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
 %dir %attr(755, mysql, mysql) /var/lib/mysql
 %dir %attr(755, mysql, mysql) /var/run/mysqld
-%dir %attr(770, mysql, mysql) /var/lib/mysql-files
+%dir %attr(750, mysql, mysql) /var/lib/mysql-files
 
 %files common
 %defattr(-, root, root, -)

packaging/rpm-sles/mysql.init

@@ -77,7 +77,7 @@ install_db () {
     logfile=$(get_option mysqld_safe log-error "/var/log/mysql/mysqld.log")
 
     # Restore log, dir, perms and SELinux contexts
-    [ -d "$datadir" ] || install -d -m 0750 -omysql -gmysql "$datadir" || return 1
+    [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || return 1
 
     [ -e $logfile ] || touch $logfile || return 1
     chmod 0640 $logfile

packaging/rpm-sles/mysql.spec.in

@@ -441,10 +441,10 @@ mkdir release
 MBD=$RPM_BUILD_DIR/%{src_dir}
 
 # Ensure that needed directories exists
-install -d -m 0750 %{buildroot}/var/lib/mysql
+install -d -m 0755 %{buildroot}/var/lib/mysql
 install -d -m 0755 %{buildroot}/var/run/mysql
-install -d -m 0660 %{buildroot}/var/log/mysql
-install -d -m 0770 %{buildroot}/var/lib/mysql-files
+install -d -m 0750 %{buildroot}/var/log/mysql
+install -d -m 0750 %{buildroot}/var/lib/mysql-files
 
 
 # Install all binaries
@@ -509,7 +509,7 @@ rm -r $(readlink var) var
 
 %post server
 datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
-/bin/chmod 0750 "$datadir"
+/bin/chmod 0755 "$datadir"
 /bin/touch /var/log/mysql/mysqld.log
 %if 0%{?systemd}
 %service_add_post mysql.service
@@ -668,10 +668,10 @@ fi
 %attr(755, root, root) %{_sysconfdir}/init.d/mysql
 %endif
 %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
-%dir %attr(750, mysql, mysql) /var/lib/mysql
+%dir %attr(755, mysql, mysql) /var/lib/mysql
 %dir %attr(755, mysql, mysql) /var/run/mysql
-%dir %attr(660, mysql, mysql) /var/log/mysql
-%dir %attr(770, mysql, mysql) /var/lib/mysql-files
+%dir %attr(750, mysql, mysql) /var/log/mysql
+%dir %attr(750, mysql, mysql) /var/lib/mysql-files
 
 %files common
 %defattr(-, root, root, -)

scripts/systemd/mysqld_pre_systemd.in

@@ -34,7 +34,7 @@ install_db () {
 
     # Restore log, dir, perms and SELinux contexts
 
-    [ -d "$datadir" ] || install -d -m 0750 -o@MYSQLD_USER@ -g@MYSQLD_USER@ "$datadir" || exit 1
+    [ -d "$datadir" ] || install -d -m 0755 -o@MYSQLD_USER@ -g@MYSQLD_USER@ "$datadir" || exit 1
 
     [ -e $log ] || touch $log
     chmod 0640 $log