- up to percona 5.6.25 73.0; dh now 2048 in percona already

diff --git a/community-mysql-dh1024.patch b/community-mysql-dh1024.patch
deleted file mode 100644 (file)
index 620ee0b..0000000
--- a/community-mysql-dh1024.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Change the DH key length from 512 to 1024 bits to meet minimum requirements
-of FIPS 140-2.  (In principle we could use the larger size only when FIPS
-mode is on, but it doesn't seem worth the trouble.)
-
-The new parameter value was generated using "openssl dhparam -C 1024".
-
-
-diff -Naur mysql-5.5.28.orig/vio/viosslfactories.c mysql-5.5.28/vio/viosslfactories.c
---- mysql-5.5.28.orig/vio/viosslfactories.c    2012-08-29 04:50:46.000000000 -0400
-+++ mysql-5.5.28/vio/viosslfactories.c 2012-11-15 11:19:38.575701435 -0500
-@@ -20,27 +20,32 @@
- static my_bool     ssl_algorithms_added    = FALSE;
- static my_bool     ssl_error_strings_loaded= FALSE;
- 
--static unsigned char dh512_p[]=
-+static unsigned char dh1024_p[]=
- {
--  0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75,
--  0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F,
--  0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,0x57,0x46,0x50,0xD3,
--  0x69,0x99,0xDB,0x29,0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12,
--  0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,0xD8,0x00,0x3E,0x7C,
--  0x47,0x74,0xE8,0x33,
-+  0xBF,0x5C,0xFA,0xD1,0xDD,0xBB,0xB3,0x0A,0x58,0x29,0x05,0xF5,
-+  0x7D,0x64,0xB2,0xE1,0xCE,0xE8,0xE0,0xE1,0x7A,0xB6,0xBC,0x5B,
-+  0x21,0x56,0xDF,0x2C,0x82,0x60,0xDC,0x31,0xCA,0x1E,0x02,0xFE,
-+  0xC4,0xE7,0x24,0x63,0x31,0xE4,0x67,0x1C,0x0B,0xFF,0x86,0x12,
-+  0x0D,0x2E,0xE6,0x35,0x0A,0x07,0x4F,0xE7,0x3F,0xDE,0xFE,0xF0,
-+  0x13,0x1C,0xA2,0x2B,0xF4,0xEE,0x2C,0x90,0x10,0x57,0x6B,0x2B,
-+  0xB9,0x1E,0x1B,0x47,0xB0,0x25,0xBF,0x45,0x86,0xDA,0x87,0x35,
-+  0x2C,0xF5,0x6A,0x41,0xA2,0x57,0xD8,0x16,0x5E,0x82,0x91,0x99,
-+  0x33,0xA0,0x8B,0x9D,0x34,0xCE,0x03,0x01,0x80,0x32,0x07,0x3B,
-+  0xF2,0x93,0xFC,0x3A,0x25,0xEC,0xB3,0xED,0x5C,0x4E,0x57,0xF2,
-+  0x3C,0x2E,0x0D,0xB1,0x59,0xA2,0x08,0x93,
- };
- 
--static unsigned char dh512_g[]={
-+static unsigned char dh1024_g[]={
-   0x02,
- };
- 
--static DH *get_dh512(void)
-+static DH *get_dh1024(void)
- {
-   DH *dh;
-   if ((dh=DH_new()))
-   {
--    dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL);
--    dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL);
-+    dh->p=BN_bin2bn(dh1024_p,sizeof(dh1024_p),NULL);
-+    dh->g=BN_bin2bn(dh1024_g,sizeof(dh1024_g),NULL);
-     if (! dh->p || ! dh->g)
-     {
-       DH_free(dh);
-@@ -255,7 +260,7 @@
-   }
- 
-   /* DH stuff */
--  dh=get_dh512();
-+  dh=get_dh1024();
-   SSL_CTX_set_tmp_dh(ssl_fd->ssl_context, dh);
-   DH_free(dh);
- 

diff --git a/mysql.spec b/mysql.spec
index c5d997c651e1e9342de355aec86bd129e064f311..de1908b0c8605024bd6d4e324ee18bf39a1b0dd3 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -23,8 +23,8 @@
 %bcond_with    tests           # FIXME: don't run correctly
 %bcond_with    ndb             # NDB is now a separate product, this here is broken, so disable it
 
-%define                rel     2
-%define                percona_rel     72.2
+%define                rel     1
+%define                percona_rel     73.0
 %include       /usr/lib/rpm/macros.perl
 Summary:       MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):     MySQL: ist eine SQL-Datenbank
@@ -35,14 +35,14 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.6.24
+Version:       5.6.25
 Release:       %{percona_rel}.%{rel}
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
 # Source0:     http://vesta.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.5/%{name}-%{version}.tar.gz
 Source0:       http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz
-# Source0-md5: d4fcc3079c2c17efb2c3e3c66601880b
+# Source0-md5: a135239f2f62a1f7ec8a44402b91389c
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.9-release.tar.gz
 # Source100-md5:       1fcc3d180c0559bdeb93602ef248caf4
 Source1:       %{name}.init
@@ -79,7 +79,7 @@ Patch20:      %{name}-dubious-exports.patch
 Patch22:       bug-66589.patch
 Patch23:       bug-44278.patch
 Patch24:       %{name}-cmake.patch
-Patch25:       community-mysql-dh1024.patch
+
 Patch26:       mysqldumpslow-clusters.patch
 Patch27:       x32.patch
 URL:           http://www.mysql.com/products/community/
@@ -527,7 +527,7 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%patch25 -p1
+
 %patch26 -p1
 %patch27 -p1