From 7f33180e01a60ea661d398d57b9920fbf68ccd3b Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@redhat.com>
Date: Mon, 11 Jun 2012 17:25:25 -0400
Subject: [PATCH] Update to MySQL 5.5.24

---
 .gitignore            |  2 +-
 mysql-logrotate.patch |  5 +++--
 mysql.spec            | 18 +++++++++++++-----
 sources               |  2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f4a138..d942bd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mysql-5.5.23-nodocs.tar.gz
+/mysql-5.5.24-nodocs.tar.gz
diff --git a/mysql-logrotate.patch b/mysql-logrotate.patch
index 8ad9d2c..f76237d 100644
--- a/mysql-logrotate.patch
+++ b/mysql-logrotate.patch
@@ -2,7 +2,8 @@ Adjust the mysql-log-rotate script in several ways:
 
 * Use the correct log file pathname for Red Hat installations.
 * Enable creation of the log file by logrotate (needed since
-  /var/log/ isn't writable by mysql user).
+  /var/log/ isn't writable by mysql user); and set the same 640
+  permissions we normally use.
 * Comment out the actual rotation commands, so that user must edit
   the file to enable rotation.  This is unfortunate, but the fact
   that the script will probably fail without manual configuration
@@ -48,7 +49,7 @@ diff -Naur mysql-5.5.22.orig/support-files/mysql-log-rotate.sh mysql-5.5.22/supp
 +# Then, un-comment the following lines to enable rotation of mysql's log file:
 +
 +#/var/log/mysqld.log {
-+#        create 600 mysql mysql
++#        create 640 mysql mysql
 +#        notifempty
 +#	daily
 +#        rotate 3
diff --git a/mysql.spec b/mysql.spec
index 2e828e7..b521eb3 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 5.5.23
+Version: 5.5.24
 Release: 1%{?dist}
 
 Summary: MySQL client programs and shared libraries
@@ -109,7 +109,7 @@ Requires: sh-utils
 Requires(pre): /usr/sbin/useradd
 Requires(post): chkconfig
 Requires(preun): chkconfig
-# We require this to be present for /etc/tmpfiles.d
+# We require this to be present for %%{_prefix}/lib/tmpfiles.d
 Requires: systemd-units
 # Make sure it's there when scriptlets run, too
 Requires(post): systemd-units
@@ -382,8 +382,8 @@ install -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_unitdir}/
 install -m 755 %{SOURCE12} ${RPM_BUILD_ROOT}%{_libexecdir}/
 install -m 755 %{SOURCE13} ${RPM_BUILD_ROOT}%{_libexecdir}/
 
-mkdir -p $RPM_BUILD_ROOT/etc/tmpfiles.d
-install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT/etc/tmpfiles.d/mysql.conf
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d
+install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/mysql.conf
 
 # Fix funny permissions that cmake build scripts apply to config files
 chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/mysql/config.*.ini
@@ -654,7 +654,7 @@ fi
 %{_libexecdir}/mysqld-prepare-db-dir
 %{_libexecdir}/mysqld-wait-ready
 
-/etc/tmpfiles.d/mysql.conf
+%{_prefix}/lib/tmpfiles.d/mysql.conf
 %attr(0755,mysql,mysql) %dir /var/run/mysqld
 %attr(0755,mysql,mysql) %dir /var/lib/mysql
 %attr(0640,mysql,mysql) %config(noreplace) %verify(not md5 size mtime) /var/log/mysqld.log
@@ -693,6 +693,14 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Mon Jun 11 2012 Tom Lane <tgl@redhat.com> 5.5.24-1
+- Update to MySQL 5.5.24, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.5/en/news-5-5-24.html
+  including the fix for CVE-2012-2122
+Resolves: #830680
+- Tweak logrotate script to put the right permissions on mysqld.log
+- Minor specfile fixes for recent packaging guidelines changes
+
 * Sat Apr 28 2012 Tom Lane <tgl@redhat.com> 5.5.23-1
 - Update to MySQL 5.5.23, for various fixes described at
   http://dev.mysql.com/doc/refman/5.5/en/news-5-5-23.html
diff --git a/sources b/sources
index 88f4c0c..87aa00a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dfdae08b57c51740344a3b4ce930127a  mysql-5.5.23-nodocs.tar.gz
+e42efbddfa93a16ec137dfcbeb996c24  mysql-5.5.24-nodocs.tar.gz