openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package mysql (Revision 820129434a8b111d14aa454079d1d2b1)

Currently displaying revision 820129434a8b111d14aa454079d1d2b1 , Show latest

--- mysql.changes.orig
+++ mysql.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Oct  5 11:11:35 CEST 2009 - mhrusecky@suse.cz
+
+- fixed my.cnf rights (bnc#539249)
+- fixed restart on update (bnc#520876)
+
+-------------------------------------------------------------------
 Tue Sep 15 16:45:23 CEST 2009 - mhrusecky@suse.cz
 
 - Few better formulations in README.SuSE (bnc#539243)
--- mysql.spec.orig
+++ mysql.spec
@@ -552,12 +552,22 @@ done
 #-------------------------------------------------------------------------------
 
 %pre
-#-------------------------------------------------------------------------------
-[ -x /usr/sbin/rcmysql ] && /usr/sbin/rcmysql stop
 /usr/sbin/groupadd -r mysql >/dev/null 2>/dev/null || :
 /usr/sbin/useradd -r -o -g mysql -u 60 -c "MySQL database admin" \
                   -s /bin/false -d /var/lib/mysql mysql 2> /dev/null || :
 /usr/sbin/usermod -g mysql -s /bin/false mysql
+
+%preun
+[ $1 = 1 ] || /usr/sbin/rcmysql stop
+
+%pretrans
+#-------------------------------------------------------------------------------
+if [ -x /usr/sbin/rcmysql ]; then
+	RESTART=""
+	/usr/sbin/rcmysql status > /dev/null && RESTART="yes"
+	/usr/sbin/rcmysql stop
+	[ "$RESTART" ] && mkdir -p /var/run/mysql/restart
+fi
 dbfile=var/mysql/mysql/db.ISM
 olddir=var/mysql
 newdir=var/lib/mysql
@@ -575,15 +585,16 @@ cp -a $olddir $newdir || echo "Error whi
 fi
 #-------------------------------------------------------------------------------
 
-%post
+%posttrans
 #-------------------------------------------------------------------------------
-%remove_and_set -n mysql MYSQLD_MULTI
- # nothing here because of broken macro
+%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.gz
 if [ -d /var/lib/mysql ]; then
 	touch /var/lib/mysql/.run-mysql_upgrade
 	chown -R mysql:mysql /var/lib/mysql
 fi
-%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.gz
+for i in /var/lib/mysql/{.protected,.tmp}; do
+	( [ -d "$i" ] && rmdir "$i" ) || :
+done
 SRCLOGS=""
 DESTLOG="/var/log/mysql/mysqld.log"
 test_src() {
@@ -602,10 +613,9 @@ else
 		[ $SRCLOGS = "$DESTLOG" ] || mv $SRCLOGS "$DESTLOG"
 	fi
 fi
-# start mysql again if it should run in current runlevel
-RUNLEVEL="`/sbin/runlevel | sed 's|.\ ||'`"
-if [ -e /etc/rc.d/rc${RUNLEVEL}.d/S[0-9]*mysql ]; then
-	/usr/sbin/rcmysql start
+# start mysql again if it should run
+if [ "`ls /etc/rc.d/rc*.d/S*mysql`" ] || [ -d /var/run/mysql/restart ]; then
+	[ -x /usr/sbin/rcmysql ] && /usr/sbin/rcmysql start
 fi
 #-------------------------------------------------------------------------------
 
@@ -629,15 +639,12 @@ fi
 /sbin/ldconfig
 #-------------------------------------------------------------------------------
 
-%preun
-#-------------------------------------------------------------------------------
-[ -x /usr/sbin/rcmysql ] && /usr/sbin/rcmysql stop
-#-------------------------------------------------------------------------------
-
 %postun
 #-------------------------------------------------------------------------------
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.gz
-%{insserv_cleanup}
+if [ $1 = 0 ]; then
+	%install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.gz
+	%{insserv_cleanup}
+fi
 #-------------------------------------------------------------------------------
 
 %clean
@@ -648,7 +655,7 @@ fi
 %files -f mysql.files
 #-------------------------------------------------------------------------------
 %defattr(-, root, root)
-%config(noreplace) %attr(-, mysql, mysql) /etc/my.cnf
+%config(noreplace) %attr(0640, root, mysql) /etc/my.cnf
 %config /etc/logrotate.d/mysql
 %doc %{_defaultdocdir}/%{name}
 %doc %{_infodir}/mysql.info.gz

Places

File project.diff of Package mysql (Revision 820129434a8b111d14aa454079d1d2b1)

Places