* Fixing regular expression in tests to guard against build path containing

  the '+' symbol (Closes: #674210)
* Disabled certain SSL tests pending investigation (cf. #674267)
* Updated French translation (Closes: #674025)
* Updated Dutch translation (Closes: #674124)
* Updated Russian translation (Closes: #674189)
* Revert having libssl-dev as a build dependency and changed
  WITH_SSL option to 'bundled' from 'yes' (Closes: #590905)
  and (Closes: #673865)
* Removed main_openssl_1 patch
* Set SYSTEM_TYPE according to GNU Build System

git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2124 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1

10 files changed, 93 insertions, 139 deletions

diff --git a/debian/changelog b/debian/changelog
index d779c7e..696e64c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
 mysql-5.5 (5.5.24+dfsg-1) UNRELEASED; urgency=low
 
+  * Fixing regular expression in tests to guard against build path containing
+    the '+' symbol (Closes: #674210)
+  * Disabled certain SSL tests pending investigation (cf. #674267)
+  * Updated French translation (Closes: #674025)
+  * Updated Dutch translation (Closes: #674124)
+  * Updated Russian translation (Closes: #674189)
   * Migrated libmysqlclient-dev, mysql-client-5.5, mysql-server-core-5.5
     and mysql-server-5.5 off dh_movefiles
   * Removed dh_movefiles override
@@ -28,6 +34,11 @@ mysql-5.5 (5.5.24+dfsg-1) UNRELEASED; urgency=low
   * Refreshed patches
   * Standardized debian/watch and get-orig-source and made DFSG exclusion
     of Docs/mysql.info explicit (Closes: #673528)
+  * Revert having libssl-dev as a build dependency and changed
+    WITH_SSL option to 'bundled' from 'yes' (Closes: #590905)
+    and (Closes: #673865)
+  * Removed main_openssl_1 patch
+  * Set SYSTEM_TYPE according to GNU Build System
 
  -- Nicholas Bamber <nicholas@periapt.co.uk>  Tue, 08 May 2012 09:04:25 +0100
 
diff --git a/debian/control b/debian/control
index 6d1e412..e81a77e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
 Uploaders: Norbert Tretkowski <norbert@tretkowski.de>,
  Clint Byrum <clint@ubuntu.com>, Nicholas Bamber <nicholas@periapt.co.uk>
-Build-Depends: debhelper (>= 8.1.3~), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, po-debconf, psmisc, chrpath, gawk, bison, lsb-release, hardening-wrapper, cmake, libssl-dev
+Build-Depends: debhelper (>= 8.1.3~), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, po-debconf, psmisc, chrpath, gawk, bison, lsb-release, hardening-wrapper, cmake
 Standards-Version: 3.9.3
 Homepage: http://dev.mysql.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/
diff --git a/debian/patches/linked_list_mem_failure.patch b/debian/patches/linked_list_mem_failure.patch
new file mode 100644
index 0000000..c3346bb
--- /dev/null
+++ b/debian/patches/linked_list_mem_failure.patch
@@ -0,0 +1,22 @@
+Author: Nicholas Bamber <nicholas@periapt.co.uk>
+Subject: certain tests failing
+Bug-Debian: http://bugs.debian.org/674267
+Last-Update: 2012-05-25
+Forwarded: no
+--- a/mysql-test/suite/rpl/t/disabled.def
++++ b/mysql-test/suite/rpl/t/disabled.def
+@@ -17,3 +17,6 @@
+ rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
+ rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146
+ rpl_mysql_upgrade: Fails on Debian #64773
++rpl_heartbeat_ssl:     Debian Bug 674267 2012-05-24
++rpl_ssl1: Debian Bug 674267 2012-05-24
++rpl_ssl: Debian Bug 674267 2012-05-24
+--- a/mysql-test/t/disabled.def
++++ b/mysql-test/t/disabled.def
+@@ -29,3 +29,5 @@
+ ssl_compress             : Bug#64773 2012-03-27 Debian local
+ ssl                      : Bug#64773 2012-03-27 Debian local
+ openssl_1                : Bug#64773 2012-03-27 Debian local
++ssl_cipher               : Debian Bug 674267 2012-05-24
++ssl_connect              : Debian Bug 674267 2012-05-24
diff --git a/debian/patches/main_openssl_1.patch b/debian/patches/main_openssl_1.patch
deleted file mode 100644
index 1be90b1..0000000
--- a/debian/patches/main_openssl_1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Nicholas Bamber <nicholas@periapt.co.uk>
-Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660799
-Forwarded: no
-Last-Update: 2012-03-02
-Subject: This test fails in the presence of libssl-dev
- and SSL functionality seems to fail without it.
-
---- a/mysql-test/r/openssl_1.result
-+++ b/mysql-test/r/openssl_1.result
-@@ -44,9 +44,9 @@
- drop user ssl_user1@localhost, ssl_user2@localhost,
- ssl_user3@localhost, ssl_user4@localhost, ssl_user5@localhost;
- drop table t1;
--mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation
--mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation
--mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation
-+mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1)
-+mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1)
-+mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1)
- SSL error: Unable to get private key from ''
- mysqltest: Could not open connection 'default': 2026 SSL connection error: Unable to get private key
- SSL error: Unable to get certificate from ''
diff --git a/debian/patches/regex_plus.patch b/debian/patches/regex_plus.patch
new file mode 100644
index 0000000..5094e46
--- /dev/null
+++ b/debian/patches/regex_plus.patch
@@ -0,0 +1,30 @@
+Author: Nicholas Bamber <nicholas@periapt.co.uk>
+Subject: FTBS when in build directory containing '+'
+Bug-Debian: http://bugs.debian.org/674210
+Bug: http://bugs.mysql.com/bug.php?id=65408
+Last-Update: 2012-05-24
+--- a/mysql-test/include/mysqld--help.inc
++++ b/mysql-test/include/mysqld--help.inc
+@@ -47,7 +47,11 @@
+     s/\b4294967295\b/18446744073709551615/;
+     s/\b2146435072\b/9223372036853727232/;
+     s/\b196608\b/262144/;
+-    foreach $var (@env) { s/$ENV{$var}/$var/ }
++    foreach $var (@env) {
++	my $re = $ENV{$var};
++	$re =~ s/\+/\\\+/g;
++	s/$re/$var/
++    }
+     next if /use --skip-(use-)?symbolic-links to disable/; # for valgrind, again
+     next if $skip;
+     print;
+--- a/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
++++ b/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
+@@ -7,6 +7,7 @@
+ # TODO: fix with a proper comparison in mysqltest
+ let $rcd= `SELECT REPLACE('$MYSQL_CHARSETSDIR', '\\\\\', '.')`;
+ let $rcd= `SELECT REPLACE('$rcd', '/', '.')`;
++let $rcd= `SELECT REPLACE('$rcd', '+', '.')`;
+ let $regex_charsetdir= `SELECT '/$rcd[\\\\\/\\\\\]/MYSQL_CHARSETSDIR/'`;
+ 
+ --replace_regex $regex_charsetdir
diff --git a/debian/patches/series b/debian/patches/series
index 0526cf4..c11d471 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 hurd.patch
-main_openssl_1.patch
 scripts__mysqld_safe.sh__signals.patch
 disable_tests.patch
 mysql_va_list.patch
@@ -10,3 +9,5 @@ kfreebsd_tests.patch
 spelling.patch
 fix-mysqldump-test.patch
 hyphens-in-manpages.patch
+regex_plus.patch
+linked_list_mem_failure.patch
diff --git a/debian/po/fr.po b/debian/po/fr.po
index c404291..18d5d21 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the mysql-dfsg-* packages.
 #
 # Translators:
-# Christian Perrier <bubulle@debian.org>, 2004, 2006, 2007, 2009.
+# Christian Perrier <bubulle@debian.org>, 2004, 2006, 2007, 2009, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: mysql-5.5@packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
-"PO-Revision-Date: 2009-08-08 14:56+0200\n"
+"PO-Revision-Date: 2012-05-22 08:30+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "debian.org>\n"
-"X-Generator: Lokalize 0.3\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #. Type: boolean
@@ -177,10 +177,6 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:8001
-#, fuzzy
-#| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for "
-#| "more information."
 msgid ""
 "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
 "information."
@@ -211,18 +207,13 @@ msgstr "Abandon de la gestion de NDB"
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:10001
-#, fuzzy
-#| msgid ""
-#| "MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the "
-#| "new mysql-cluster package and remove all lines starting with \"ndb\" from "
-#| "all config files below /etc/mysql/."
 msgid ""
 "MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster-server package and remove all lines starting with \"ndb\" from "
 "all config files below /etc/mysql/."
 msgstr ""
 "La version 5.5 de MySQL ne gère plus les grappes NDB. Vous devriez utiliser "
-"le paquet mysql-cluster et supprimer toutes les lignes commençant par "
+"le paquet mysql-cluster-server et supprimer toutes les lignes commençant par "
 "« ndb » des fichiers de configuration situés dans /etc/mysql."
 
 #~ msgid ""
diff --git a/debian/po/nl.po b/debian/po/nl.po
index f820a50..74ed57d 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -6,14 +6,15 @@
 #
 msgid ""
 msgstr ""
+"Project-Id-Version: mysql-5.5 5.5.23-2\n"
 "Report-Msgid-Bugs-To: mysql-5.5@packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
-"PO-Revision-Date: 2010-11-21 21:30+0100\n"
-"Last-Translator: Eric Spreen <erispre@gmail.com>\n"
-"Language-Team: Debian-Dutch <debian-l10n-dutch@lists.debian.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2012-05-23 10:26+0200\n"
+"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: boolean
@@ -37,7 +38,7 @@ msgid ""
 "version has been installed previously."
 msgstr ""
 "Zulk een bestand geeft aan dat er eerder een pakket mysql-server met een "
-"hogere versie is geinstalleerd."
+"hogere versie is geïnstalleerd."
 
 #. Type: boolean
 #. Description
@@ -173,20 +174,16 @@ msgstr ""
 msgid "You should check the account's password after the package installation."
 msgstr ""
 "U zou het wachtwoord van het account moeten controleren nadat het pakket is "
-"geïnstalleerd."
+"geïnstalleerd."
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:8001
-#, fuzzy
-#| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
-#| "more information."
 msgid ""
 "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
 "information."
 msgstr ""
-"Leest u het bestand /usr/share/doc/mysql-server-5.1/README.Debian voor meer "
+"Leest u het bestand /usr/share/doc/mysql-server-5.5/README.Debian voor meer "
 "informatie."
 
 #. Type: error
@@ -212,79 +209,11 @@ msgstr "De NDB-cluster lijkt in gebruik te zijn"
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:10001
-#, fuzzy
-#| msgid ""
-#| "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the "
-#| "new mysql-cluster-server package and remove all lines starting with \"ndb"
-#| "\" from all config files below /etc/mysql/."
 msgid ""
 "MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster-server package and remove all lines starting with \"ndb\" from "
 "all config files below /etc/mysql/."
 msgstr ""
-"MySQL-5.1 biedt niet langer ondersteuning voor NDB Cluster. Migreer naar het "
+"MySQL-5.5 biedt niet langer ondersteuning voor NDB Cluster. Migreer naar het "
 "nieuwe pakket mysql-cluster en verwijder alle regels die beginnen met \"ndb"
 "\" van alle configuratiebestanden onder /etc/mysql/."
-
-#~ msgid ""
-#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
-#~ msgstr ""
-#~ "Moet u MySQL-verbindingen accepteren van computers die Debian \"sarge\" "
-#~ "of ouder draaien?"
-
-#, fuzzy
-#~| msgid ""
-#~| "The way passwords were stored was not very secure. This has been "
-#~| "improved with the drawback that clients (e.g. PHP) from hosts running "
-#~| "Debian 3.1 Sarge will not be able to connect to account which are new or "
-#~| "whose password have been changed. See /usr/share/doc/mysql-server-5.5/"
-#~| "README.Debian."
-#~ msgid ""
-#~ "In old versions of MySQL clients on Debian, passwords were not stored "
-#~ "securely. This has been improved since then, however clients (such as "
-#~ "PHP) from hosts running Debian 3.1 Sarge will not be able to connect to "
-#~ "recent accounts or accounts whose password have been changed."
-#~ msgstr ""
-#~ "De wijze waarop wachtwoorden werden bewaard was niet erg veilig. Dit is "
-#~ "verbeterd, maar helaas zullen programma's van computers die Debian 3.1 "
-#~ "Sarge draaien, geen verbinding meer kunnen maken met accounts die nieuw "
-#~ "zijn, of waarvan het wachtwoord is gewijzigd. Zie /usr/share/doc/mysql-"
-#~ "server-5.5/README.Debian."
-
-#~ msgid ""
-#~ "To use mysql you must install an equivalent user and group to the "
-#~ "following and ensure yourself that /var/lib/mysql has the right "
-#~ "permissions (the uid/gid may be different)."
-#~ msgstr ""
-#~ "Om mysql te gebruiken dient u een gebruiker en groep aan te maken, "
-#~ "gelijkwaardig aan onderstaand voorbeeld, en u dient ervoor te zorgen dat /"
-#~ "var/lib/mysql de bijbehorende toegangsrechten heeft (uid en gid mogen "
-#~ "anders zijn)."
-
-#~ msgid ""
-#~ "/etc/passwd:      mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false"
-#~ msgstr ""
-#~ "/etc/passwd:      mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false"
-
-#~ msgid "/etc/group:       mysql:x:101:"
-#~ msgstr "/etc/group:       mysql:x:101:"
-
-#~ msgid "/var/lib/mysql:   drwxr-xr-x   mysql    mysql"
-#~ msgstr "/var/lib/mysql:   drwxr-xr-x   mysql    mysql"
-
-#~ msgid "Remove the databases used by all MySQL versions?"
-#~ msgstr "Databases verwijderen die door alle MySQL versies worden gebruikt?"
-
-#~ msgid ""
-#~ "If you do not provide a password no changes will be made to the account."
-#~ msgstr ""
-#~ "Indien u geen wachtwoord opgeeft zal het account niet worden gewijzigd."
-
-#~ msgid ""
-#~ "When installation finishes, you should verify that the account is "
-#~ "properly protected with a password (see README.Debian for more "
-#~ "information)."
-#~ msgstr ""
-#~ "Wanneer de installatie klaar is, dient u te verifiëren dat het account "
-#~ "netjes beschermd is met een wachtwoord (zie README.Debian voor meer "
-#~ "informatie)."
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 58d4af7..d5f8ac0 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -13,20 +13,20 @@
 # Ilgiz Kalmetev <translator@ilgiz.pp.ru>, 2003.
 # Yuriy Talakan' <yt@amur.elektra.ru>, 2005, 2006.
 # Yuriy Talakan' <yt@drsk.ru>, 2007.
-# Yuri Kozlov <yuray@komyakino.ru>, 2009.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg-5.5 5.5.37-1\n"
+"Project-Id-Version: mysql-dfsg-5.5 5.5.23-2\n"
 "Report-Msgid-Bugs-To: mysql-5.5@packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
-"PO-Revision-Date: 2009-08-06 20:27+0400\n"
+"PO-Revision-Date: 2012-05-23 21:14+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -133,7 +133,7 @@ msgstr ""
 #. Description
 #: ../mysql-server-5.5.templates:6001
 msgid "New password for the MySQL \"root\" user:"
-msgstr "Новый пароль для MySQL пользователя \"root\":"
+msgstr "Новый пароль для MySQL пользователя «root»:"
 
 #. Type: password
 #. Description
@@ -143,7 +143,7 @@ msgid ""
 "the MySQL administrative \"root\" user."
 msgstr ""
 "Хотя и необязательно, но настоятельно рекомендуется установить пароль для "
-"административного пользователя MySQL \"root\"."
+"административного пользователя MySQL «root»."
 
 #. Type: password
 #. Description
@@ -155,13 +155,13 @@ msgstr "Если оставить поле пустым, то пароль из�
 #. Description
 #: ../mysql-server-5.5.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
-msgstr "Повторите ввод пароля для MySQL пользователя \"root\":"
+msgstr "Повторите ввод пароля для MySQL пользователя «root»:"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
-msgstr "Невозможно задать пароль MySQL пользователю \"root\""
+msgstr "Невозможно задать пароль MySQL пользователю «root»"
 
 #. Type: error
 #. Description
@@ -184,10 +184,6 @@ msgstr "Проверьте пароль учётной записи после �
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:8001
-#, fuzzy
-#| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for "
-#| "more information."
 msgid ""
 "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
 "information."
@@ -214,16 +210,11 @@ msgstr "NDB Cluster уже используется"
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:10001
-#, fuzzy
-#| msgid ""
-#| "MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the "
-#| "new mysql-cluster package and remove all lines starting with \"ndb\" from "
-#| "all config files below /etc/mysql/."
 msgid ""
 "MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster-server package and remove all lines starting with \"ndb\" from "
 "all config files below /etc/mysql/."
 msgstr ""
 "MySQL-5.5 больше не поддерживает NDB Cluster. Переходите на новый пакет "
-"mysql-cluster и удалите все строки, начинающиеся с \"ndb\", из всех файлов "
-"настройки в каталоге /etc/mysql/."
+"mysql-cluster-server и удалите все строки, начинающиеся с «ndb», из всех "
+"файлов настройки в каталоге /etc/mysql/."
diff --git a/debian/rules b/debian/rules
index 1516bf1..352c37a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
 DEBVERSION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
 
 export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc
@@ -99,10 +100,10 @@ configure-stamp configure-pic-stamp:
 		-DWITH_LIBEDIT=OFF \
 		$(USE_STATIC_MYSQLD) \
 		$(USE_LINUX_NATIVE_AIO) \
-		-DWITH_SSL=yes \
+		-DWITH_SSL=bundled \
 	    -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
 	    -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
-	    -DSYSTEM_TYPE="debian-linux-gnu" \
+	    -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" \
 	    -DINSTALL_LAYOUT=RPM \
 	    -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
 	    -DINSTALL_PLUGINDIR=lib/mysql/plugin \