rpms/mysql/F-10 .cvsignore, 1.36, 1.37 mysql.init, 1.23, 1.24 mysql.spec, 1.114, 1.115 sources, 1.36, 1.37 mysql-bug-44348.patch, 1.1, NONE

[Tom Lane]

Author: tgl

Update of /cvs/pkgs/rpms/mysql/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26894

Modified Files:
	.cvsignore mysql.init mysql.spec sources 
Removed Files:
	mysql-bug-44348.patch 
Log Message:
Update to MySQL 5.0.88


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-10/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	3 Aug 2009 03:53:18 -0000	1.36
+++ .cvsignore	24 Nov 2009 17:47:40 -0000	1.37
@@ -1 +1 @@
-mysql-5.0.84.tar.gz
+mysql-5.0.88.tar.gz


Index: mysql.init
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-10/mysql.init,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- mysql.init	27 Jul 2008 17:54:30 -0000	1.23
+++ mysql.init	24 Nov 2009 17:47:40 -0000	1.24
@@ -46,6 +46,15 @@ start(){
 	chmod 0640 "$errlogfile"
 	[ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
 	if [ ! -d "$datadir/mysql" ] ; then
+	    # First, make sure $datadir is there with correct permissions
+	    if [ ! -e "$datadir" -a ! -h "$datadir" ]
+	    then
+		mkdir -p "$datadir" || exit 1
+	    fi
+	    chown mysql:mysql "$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
 	    ret=$?
 	    chown -R mysql:mysql "$datadir"
@@ -66,7 +75,7 @@ start(){
 	# Rather than assuming we know a valid username, accept an "access
 	# denied" response as meaning the server is functioning.
 	if [ $ret -eq 0 ]; then
-	    STARTTIMEOUT=30
+	    STARTTIMEOUT=60
 	    while [ $STARTTIMEOUT -gt 0 ]; do
 		RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` && break
 		echo "$RESPONSE" | grep -q "Access denied for user" && break


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-10/mysql.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- mysql.spec	3 Aug 2009 03:53:18 -0000	1.114
+++ mysql.spec	24 Nov 2009 17:47:40 -0000	1.115
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 5.0.84
+Version: 5.0.88
 Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -20,7 +20,7 @@ Source6: ndbd.init
 Source7: ndb_mgmd.init
 Source8: ndb_types.h
 # Working around perl dependency checking bug in rpm FTTB. Remove later.
-Source999: filter-requires-mysql.sh 
+Source999: filter-requires-mysql.sh
 Patch1: mysql-libdir.patch
 Patch2: mysql-errno.patch
 Patch3: mysql-stack.patch
@@ -33,7 +33,6 @@ Patch9: mysql-bdb-link.patch
 Patch10: mysql-bdb-open.patch
 Patch13: mysql-no-dbug.patch
 Patch15: mysql-stack-guard.patch
-Patch17: mysql-bug-44348.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -179,7 +178,6 @@ the MySQL sources.
 %patch10 -p1
 %patch13 -p1
 %patch15 -p1
-%patch17 -p1
 
 libtoolize --force
 aclocal
@@ -585,9 +583,6 @@ fi
 %{_mandir}/man1/ndb_drop_table.1*
 %{_mandir}/man1/ndb_error_reporter.1*
 %{_mandir}/man1/ndb_mgm.1*
-%{_mandir}/man1/ndb_print_backup_file.1*
-%{_mandir}/man1/ndb_print_schema_file.1*
-%{_mandir}/man1/ndb_print_sys_file.1*
 %{_mandir}/man1/ndb_restore.1*
 %{_mandir}/man1/ndb_select_all.1*
 %{_mandir}/man1/ndb_select_count.1*
@@ -628,6 +623,15 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Tue Nov 24 2009 Tom Lane <tgl at redhat.com> 5.0.88-1
+- Update to MySQL 5.0.88, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.0/en/news-5-0-88.html
+  including fixes for CVE-2009-4019
+Related: #540906
+- Ensure that /var/lib/mysql is created with the right SELinux context
+Related: #502966
+- Increase startup timeout per bug #472222
+
 * Sun Aug  2 2009 Tom Lane <tgl at redhat.com> 5.0.84-1
 - Update to mysql version 5.0.84, for various fixes described at
   http://dev.mysql.com/doc/refman/5.0/en/news-5-0-84.html


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-10/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	3 Aug 2009 03:53:18 -0000	1.36
+++ sources	24 Nov 2009 17:47:40 -0000	1.37
@@ -1 +1 @@
-671348f1a5b078da9ca76f97e1fda325  mysql-5.0.84.tar.gz
+a56810288c40a2a5d7b649467f57422c  mysql-5.0.88.tar.gz


--- mysql-bug-44348.patch DELETED ---