diff --git a/.gitignore b/.gitignore index e0aacd0..8e470d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mariadb-10.0.17.tar.gz +SOURCES/mariadb-10.0.20.tar.gz diff --git a/.rh-mariadb100-mariadb.metadata b/.rh-mariadb100-mariadb.metadata index 9c5e110..6905cbe 100644 --- a/.rh-mariadb100-mariadb.metadata +++ b/.rh-mariadb100-mariadb.metadata @@ -1 +1 @@ -240253b3ee21dea5e2f501778e8ee72b32a5d052 SOURCES/mariadb-10.0.17.tar.gz +e005c8dc2b2e4b0b3215f8bbb9b0b43726c7cf6a SOURCES/mariadb-10.0.20.tar.gz diff --git a/SOURCES/mariadb-dh1024.patch b/SOURCES/mariadb-dh1024.patch deleted file mode 100644 index a887199..0000000 --- a/SOURCES/mariadb-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 -up mariadb-10.0.16/vio/viosslfactories.c.orig mariadb-10.0.16/vio/viosslfactories.c ---- mariadb-10.0.16/vio/viosslfactories.c.orig 2015-01-25 16:21:38.000000000 +0100 -+++ mariadb-10.0.16/vio/viosslfactories.c 2015-02-03 10:48:26.012560285 +0100 -@@ -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); -@@ -257,7 +262,7 @@ new_VioSSLFd(const char *key_file, const - } - - /* DH stuff */ -- dh=get_dh512(); -+ dh=get_dh1024(); - SSL_CTX_set_tmp_dh(ssl_fd->ssl_context, dh); - DH_free(dh); - diff --git a/SOURCES/mariadb-ssltest.patch b/SOURCES/mariadb-ssltest.patch deleted file mode 100644 index bd57760..0000000 --- a/SOURCES/mariadb-ssltest.patch +++ /dev/null @@ -1,29 +0,0 @@ -Don't test EDH-RSA-DES-CBC-SHA cipher, it seems to be removed from openssl -which now makes mariadb/mysql FTBFS because openssl_1 test fails - -Related: #1044565 - -diff -up mariadb-10.0.17/mysql-test/r/openssl_1.result.p36 mariadb-10.0.17/mysql-test/r/openssl_1.result ---- mariadb-10.0.17/mysql-test/r/openssl_1.result.p36 2015-02-25 16:40:54.000000000 +0100 -+++ mariadb-10.0.17/mysql-test/r/openssl_1.result 2015-03-15 23:10:19.993502874 +0100 -@@ -198,8 +198,6 @@ Ssl_cipher DHE-RSA-AES256-SHA - Variable_name Value - Ssl_cipher EDH-RSA-DES-CBC3-SHA - Variable_name Value --Ssl_cipher EDH-RSA-DES-CBC-SHA --Variable_name Value - Ssl_cipher RC4-SHA - select 'is still running; no cipher request crashed the server' as result from dual; - result -diff -up mariadb-10.0.17/mysql-test/t/openssl_1.test.p36 mariadb-10.0.17/mysql-test/t/openssl_1.test ---- mariadb-10.0.17/mysql-test/t/openssl_1.test.p36 2015-02-25 16:40:55.000000000 +0100 -+++ mariadb-10.0.17/mysql-test/t/openssl_1.test 2015-03-15 23:22:52.608571473 +0100 -@@ -222,7 +223,7 @@ DROP TABLE t1; - # Common ciphers to openssl and yassl - --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=DHE-RSA-AES256-SHA - --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC3-SHA ----exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC-SHA -+#--exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC-SHA - --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=RC4-SHA - --disable_query_log - --disable_result_log diff --git a/SPECS/mariadb.spec b/SPECS/mariadb.spec index 1b81838..8399bdc 100644 --- a/SPECS/mariadb.spec +++ b/SPECS/mariadb.spec @@ -152,7 +152,7 @@ # Make long macros shorter %global sameevr %{epoch}:%{version}-%{release} %global compatver 10.0 -%global bugfixver 17 +%global bugfixver 20 %if 0%{?scl:1} %global scl_upper %{lua:print(string.upper(string.gsub(rpm.expand("%{scl}"), "-", "_")))} @@ -160,7 +160,7 @@ Name: %{?scl_prefix}mariadb Version: %{compatver}.%{bugfixver} -Release: 9%{?with_debug:.debug}%{?dist} +Release: 1%{?with_debug:.debug}%{?dist} Epoch: 1 Summary: A community developed branch of MySQL @@ -199,7 +199,6 @@ Patch2: %{pkgnamepatch}-install-test.patch Patch3: %{pkgnamepatch}-s390-tsc.patch Patch4: %{pkgnamepatch}-logrotate.patch Patch5: %{pkgnamepatch}-file-contents.patch -Patch6: %{pkgnamepatch}-dh1024.patch Patch7: %{pkgnamepatch}-scripts.patch Patch8: %{pkgnamepatch}-install-db-sharedir.patch Patch9: %{pkgnamepatch}-ownsetup.patch @@ -212,7 +211,6 @@ Patch31: %{pkgnamepatch}-string-overflow.patch Patch32: %{pkgnamepatch}-basedir.patch Patch33: %{pkgnamepatch}-covscan-signexpr.patch Patch34: %{pkgnamepatch}-covscan-stroverflow.patch -Patch36: %{pkgnamepatch}-ssltest.patch Patch37: %{pkgnamepatch}-notestdb.patch # Patches specific for scl @@ -563,7 +561,6 @@ MariaDB is a community developed branch of MySQL. %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 @@ -574,7 +571,6 @@ MariaDB is a community developed branch of MySQL. %patch32 -p1 %patch33 -p1 %patch34 -p1 -%patch36 -p1 %patch37 -p1 # removing bundled cmd-line-utils is now disabled @@ -939,14 +935,13 @@ export MTR_BUILD_THREAD=%{__isa_bits} # manually. Nonstandard options chosen are: # --force to continue tests after a failure # no retries please -# test SSL with --ssl # skip tests that are listed in rh-skipped-tests.list # avoid redundant test runs with --binlog-format=mixed # increase timeouts to prevent unwanted failures during mass rebuilds ( set -e cd mysql-test - perl ./mysql-test-run.pl --force --retry=0 --ssl \ + perl ./mysql-test-run.pl --force --retry=0 \ %if ! %{check_testsuite} --skip-test-list=rh-skipped-tests.list \ %endif @@ -1285,6 +1280,10 @@ fi %endif %changelog +* Tue Jul 28 2015 Jakub Dorňák - 1:10.0.20-1 +- Rebase to version 10.0.20 + Resolves: #1247029 + * Thu Apr 23 2015 Honza Horak - 1:10.0.17-9 - Define context for pid file dir explicitely Resolves: #1207113