[Pkg-mysql-commits] r2116 - mysql-5.5/branches/wheezy/debian

[Nicholas Bamber]

tags 673865 pending
thanks

Author: periapt
Date: 2012-05-22 06:15:04 +0000 (Tue, 22 May 2012)
New Revision: 2116

Modified:
   mysql-5.5/branches/wheezy/debian/changelog
   mysql-5.5/branches/wheezy/debian/control
   mysql-5.5/branches/wheezy/debian/rules
Log:
Revert having libssl-dev as a build dependency and changed
WITH_SSL option to 'bundled' from 'yes' (Closes: #590905)
and (Closes: #673865)

Modified: mysql-5.5/branches/wheezy/debian/changelog
===================================================================
--- mysql-5.5/branches/wheezy/debian/changelog	2012-05-21 05:57:43 UTC (rev 2115)
+++ mysql-5.5/branches/wheezy/debian/changelog	2012-05-22 06:15:04 UTC (rev 2116)
@@ -1,10 +1,8 @@
 mysql-5.5 (5.5.23+dfsg-1) UNRELEASED; urgency=low
 
-  * Changes to prevent certain failures to build from scratch
-    when building against MySQL 5.5 (Closes: #590905)
-    - Patched mysql_config so that it no longer mandates -lssl -lcrypto
-    - Added libwrap0-dev as a dependency of libmysqld-dev, libmysqld-pic
-    - Added libaio-dev as a Linux dependency of libmysqld-dev, libmysqld-pic
+  * Revert having libssl-dev as a build dependency and changed
+    WITH_SSL option to 'bundled' from 'yes' (Closes: #590905)
+    and (Closes: #673865)
   * Standardized debian/watch and get-orig-source and made DFSG exclusion
     of Docs/mysql.info explicit (Closes: #673528)
   * Located and installed upstream changelog

Modified: mysql-5.5/branches/wheezy/debian/control
===================================================================
--- mysql-5.5/branches/wheezy/debian/control	2012-05-21 05:57:43 UTC (rev 2115)
+++ mysql-5.5/branches/wheezy/debian/control	2012-05-22 06:15:04 UTC (rev 2116)
@@ -4,7 +4,7 @@
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
 Uploaders: Norbert Tretkowski <norbert at tretkowski.de>,
  Clint Byrum <clint at ubuntu.com>, Nicholas Bamber <nicholas at 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), libreadline-dev, po-debconf, psmisc, chrpath, doxygen-latex, ghostscript, 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), libreadline-dev, po-debconf, psmisc, chrpath, doxygen-latex, ghostscript, 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/
@@ -27,8 +27,7 @@
 Package: libmysqld-pic
 Architecture: any
 Section: libdevel
-Depends: libmysqlclient-dev (>= ${source:Version}), ${misc:Depends},
- libwrap0-dev (>= 7.6-8.3), libaio-dev[linux-any]
+Depends: libmysqlclient-dev (>= ${source:Version}), ${misc:Depends}
 Description: PIC version of MySQL embedded server development files
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -40,8 +39,7 @@
 Package: libmysqld-dev
 Architecture: any
 Section: libdevel
-Depends: libmysqlclient-dev (>= ${source:Version}), ${misc:Depends},
- libwrap0-dev (>= 7.6-8.3), libaio-dev[linux-any]
+Depends: libmysqlclient-dev (>= ${source:Version}), ${misc:Depends}
 Description: MySQL embedded database development files
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query

Modified: mysql-5.5/branches/wheezy/debian/rules
===================================================================
--- mysql-5.5/branches/wheezy/debian/rules	2012-05-21 05:57:43 UTC (rev 2115)
+++ mysql-5.5/branches/wheezy/debian/rules	2012-05-22 06:15:04 UTC (rev 2116)
@@ -99,7 +99,7 @@
 		-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" \
@@ -177,12 +177,6 @@
 	install -m 0644 -o root -g root $(BUILDDIR_PIC)/libmysqld/libmysqld.a $(TMP)/usr/lib/mysql/libmysqld_pic.a
 	# mysql_config won't report the -fPIC, so give libmysqld-pic users a way to get their flags
 	install -m 0755 -o root -g root $(BUILDDIR_PIC)/scripts/mysql_config $(TMP)/usr/bin/mysql_config_pic
-	# As per #590905 we don't want mysql_config saying -lssl -lcrypto
-	# because those libraries are overkill for most packages.
-	# Patch mysql_config inline rather using quilt because the latter
-	# seems not to work, though I don't know why. Comments hold
-	# but not the real bit of work. The source is scripts/mysql_config.sh.
-	sed -i -e's/-lssl -lcrypto //' $(TMP)/usr/bin/mysql_config*
 	# mysql-client
 	install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/
 	install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/