Permalink
Browse files

MySQL 5.5.25a

  • Loading branch information...
1 parent 01690cd commit 42083e20c8ab2de0dd13112713df77796dec7f50 @remicollet committed Jul 6, 2012
Showing with 23 additions and 10 deletions.
  1. +3 −2 mysql55/mysql-logrotate.patch
  2. +2 −2 mysql55/{mysql.5.5.25.spec → mysql.5.5.25a.spec}
  3. +18 −6 mysql55/mysql55.spec
@@ -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
@@ -24,7 +24,7 @@
%define mysql_vendor_2 Sun Microsystems, Inc.
%define mysql_vendor Oracle and/or its affiliates
-%define mysql_version 5.5.25
+%define mysql_version 5.5.25a
%define mysqld_user mysql
%define mysqld_group mysql
@@ -241,7 +241,7 @@
Name: MySQL%{product_suffix}
Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases
-Version: 5.5.25
+Version: 5.5.25a
Release: %{release}%{?distro_releasetag:.%{distro_releasetag}}
Distribution: %{distro_description}
License: Copyright (c) 2000, 2012, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field.
View
@@ -1,5 +1,5 @@
Name: mysql
-Version: 5.5.25
+Version: 5.5.25a
Release: 1%{?dist}
Summary: MySQL client programs and shared libraries
@@ -130,7 +130,7 @@ Requires(pre): /usr/sbin/useradd
Requires(post): chkconfig
Requires(preun): chkconfig
%if 0%{?fedora} >= 15
-# 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
@@ -443,8 +443,8 @@ sed -i -e '/PrivateTmp/s/true/false/' ${RPM_BUILD_ROOT}%{_unitdir}/mysqld.servic
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
%else
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
@@ -527,7 +527,7 @@ echo -e "\nWARNING : This MySQL RPM is not an official Fedora/Redhat build and i
echo -e "overrides the official one. Don't file bugs on Fedora Project nor Redhat."
echo -e "Use dedicated forums http://forums.famillecollet.com/\n"
-%if %{?fedora}%{!?fedora:99} <= 14
+%if %{?fedora}%{!?fedora:99} <= 15
echo -e "WARNING : Fedora %{fedora} is now EOL :"
echo -e "You should consider upgrading to a supported release.\n"
%endif
@@ -760,7 +760,7 @@ fi
%{_libexecdir}/mysqld-prepare-db-dir
%{_libexecdir}/mysqld-wait-ready
-/etc/tmpfiles.d/mysql.conf
+%{_prefix}/lib/tmpfiles.d/mysql.conf
%else
/etc/rc.d/init.d/mysqld
%config(noreplace) /etc/sysconfig/mysqld
@@ -803,6 +803,18 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
+* Fri Jul 06 2012 Remi Collet <RPMS@FamilleCollet.com> - 5.5.25a-1
+- update to MySQL 5.5.25a Community Server GA
+ http://dev.mysql.com/doc/refman/5.5/en/news-5-5-25a.html
+
+* 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
+
* Fri Jun 01 2012 Remi Collet <RPMS@FamilleCollet.com> - 5.5.25-1
- update to MySQL 5.5.25 Community Server GA
http://dev.mysql.com/doc/refman/5.5/en/news-5-5-25.html

0 comments on commit 42083e2

Please sign in to comment.