summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-05-29 19:00:46 +0200
committerRemi Collet <fedora@famillecollet.com>2015-05-29 19:00:46 +0200
commitad539a16b9836180cc82aa02ef8311c4412313f4 (patch)
tree8adafa10317e7ba69118b76f94686c944d6b1a4c
parent32407a552038e3c410c102221c514ff0f971f80d (diff)
MySQL 5.5.44
-rw-r--r--mysql-openssl.patch13
-rw-r--r--mysql.5.5.44.spec (renamed from mysql.5.5.43.spec)8
-rw-r--r--mysql55.spec9
3 files changed, 9 insertions, 21 deletions
diff --git a/mysql-openssl.patch b/mysql-openssl.patch
deleted file mode 100644
index bcdc1d2..0000000
--- a/mysql-openssl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mysql-5.5.31/vio/viossl.c~ 2013-03-25 14:14:58.000000000 +0100
-+++ mysql-5.5.31/vio/viossl.c 2013-04-18 16:58:38.552557538 +0200
-@@ -172,8 +172,10 @@
- SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
- SSL_set_fd(ssl, vio->sd);
- #ifndef HAVE_YASSL
-+#ifdef SSL_OP_NO_COMPRESSION
- SSL_set_options(ssl, SSL_OP_NO_COMPRESSION);
- #endif
-+#endif
-
- if ((r= connect_accept_func(ssl)) < 1)
- {
diff --git a/mysql.5.5.43.spec b/mysql.5.5.44.spec
index 0c74562..ae91e7e 100644
--- a/mysql.5.5.43.spec
+++ b/mysql.5.5.44.spec
@@ -1,4 +1,4 @@
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
%global mysql_vendor_2 Sun Microsystems, Inc.
%global mysql_vendor Oracle and/or its affiliates
-%global mysql_version 5.5.43
+%global mysql_version 5.5.44
%global mysqld_user mysql
%global mysqld_group mysql
@@ -242,7 +242,7 @@
Name: MySQL%{product_suffix}
Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases
-Version: 5.5.43
+Version: 5.5.44
Release: %{release}%{?distro_releasetag:.%{distro_releasetag}}
Distribution: %{distro_description}
License: Copyright (c) 2000, 2015, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field.
@@ -427,7 +427,7 @@ Obsoletes: MySQL-embedded-pro
Obsoletes: MySQL-embedded-classic MySQL-embedded-community MySQL-embedded-enterprise
Obsoletes: MySQL-embedded-advanced-gpl MySQL-embedded-enterprise-gpl
Provides: mysql-embedded = %{version}-%{release}
-Provides: mysql-emdedded%{?_isa} = %{version}-%{release}
+Provides: mysql-embedded%{?_isa} = %{version}-%{release}
%description -n MySQL-embedded%{product_suffix}
This package contains the MySQL server as an embedded library.
diff --git a/mysql55.spec b/mysql55.spec
index 0c1651d..8221c90 100644
--- a/mysql55.spec
+++ b/mysql55.spec
@@ -10,7 +10,7 @@
#endif
Name: mysql
-Version: 5.5.43
+Version: 5.5.44
Release: 1%{?dist}
Summary: MySQL client programs and shared libraries
@@ -72,8 +72,6 @@ Patch19: mysql-file-contents.patch
Patch20: mysql-string-overflow.patch
Patch21: mysql-dh1024.patch
Patch22: mysql-innodbwarn.patch
-# http://bugs.mysql.com/68999
-Patch23: mysql-openssl.patch
Patch24: mysql-ssltest.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -276,7 +274,6 @@ rm -f Docs/mysql.info
%patch20 -p1
%patch21 -p1
%patch22 -p1
-%patch23 -p1
%patch24 -p1
# workaround for upstream bug #56342
@@ -843,6 +840,10 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
+* Fri May 29 2015 Remi Collet <RPMS@FamilleCollet.com> - 5.5.44-1
+- update to MySQL 5.5.44 Community Server GA
+ http://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-44.html
+
* Mon Apr 13 2015 Remi Collet <RPMS@FamilleCollet.com> - 5.5.43-1
- update to MySQL 5.5.43 Community Server GA
http://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-43.html