diff -Nru mysql++-3.2.2+pristine/debian/changelog mysql++-3.2.2+pristine/debian/changelog --- mysql++-3.2.2+pristine/debian/changelog 2016-04-15 15:48:20.000000000 +0000 +++ mysql++-3.2.2+pristine/debian/changelog 2017-02-18 04:14:33.000000000 +0000 @@ -1,10 +1,23 @@ -mysql++ (3.2.2+pristine-1ubuntu1) xenial; urgency=medium +mysql++ (3.2.2+pristine-2ubuntu1) zesty; urgency=medium - * Rebuild against libmysqlclient20. - * d/p/libmysqlclient_r: build against libmysqlclient, not _r (LP: - #1564871). + * Disable PIE during build on all archs for now. - -- Robie Basak Fri, 15 Apr 2016 15:48:10 +0000 + -- Bhavani Shankar Sat, 18 Feb 2017 09:43:37 +0530 + +mysql++ (3.2.2+pristine-2) unstable; urgency=medium + + * Avoid linking against libmysqlclient_r and link directly against + libmysqlclient instead. Thanks Robie Basak + for the patch. (Closes: #825086) + * Thanks to Michael Prokop for preparing the upload + (all I did was apply his patch integrating Robie's patch) + (Closes: #845444) + * Update to Standards-Version 3.9.8 (no changes) + * Update to debhelper compatibility level 9 (no changes) + * Change dependency on libmysqlclient-dev to default-libmysqlclient-dev + * Enable hardening flags at build time + + -- Roberto C. Sanchez Wed, 23 Nov 2016 12:23:22 -0500 mysql++ (3.2.2+pristine-1) unstable; urgency=low diff -Nru mysql++-3.2.2+pristine/debian/compat mysql++-3.2.2+pristine/debian/compat --- mysql++-3.2.2+pristine/debian/compat 2015-10-14 05:47:08.000000000 +0000 +++ mysql++-3.2.2+pristine/debian/compat 2016-11-23 17:23:22.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru mysql++-3.2.2+pristine/debian/control mysql++-3.2.2+pristine/debian/control --- mysql++-3.2.2+pristine/debian/control 2016-04-15 15:44:34.000000000 +0000 +++ mysql++-3.2.2+pristine/debian/control 2017-02-18 04:14:43.000000000 +0000 @@ -4,14 +4,14 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Athena Capital Research Uploaders: Roberto C. Sanchez -Build-Depends: debhelper (>> 5), cdbs, autotools-dev, libmysqlclient-dev, libssl-dev -Standards-Version: 3.9.6 +Build-Depends: debhelper (>= 9), cdbs, autotools-dev, default-libmysqlclient-dev, libssl-dev +Standards-Version: 3.9.8 Homepage: http://tangentsoft.net/mysql++/ Package: libmysql++-dev Section: libdevel Architecture: any -Depends: libmysql++3v5 (= ${binary:Version}), libmysqlclient-dev, ${misc:Depends} +Depends: libmysql++3v5 (= ${binary:Version}), default-libmysqlclient-dev, ${misc:Depends} Suggests: libmysql++-doc Description: MySQL C++ library bindings (development) MySQL++ is a complex C++ API for MySQL (and other SQL databases diff -Nru mysql++-3.2.2+pristine/debian/libmysql++3v5.lintian-overrides mysql++-3.2.2+pristine/debian/libmysql++3v5.lintian-overrides --- mysql++-3.2.2+pristine/debian/libmysql++3v5.lintian-overrides 2015-10-14 05:47:08.000000000 +0000 +++ mysql++-3.2.2+pristine/debian/libmysql++3v5.lintian-overrides 2016-11-23 17:23:22.000000000 +0000 @@ -1,2 +1,2 @@ libmysql++3v5: package-name-doesnt-match-sonames libmysqlpp3 -libmysql++3v5: no-symbols-control-file usr/lib/libmysqlpp.so.3.2.1 +libmysql++3v5: no-symbols-control-file usr/lib/libmysqlpp.so.3.2.2 diff -Nru mysql++-3.2.2+pristine/debian/patches/do_not_link_against_libmysqlclient_r.patch mysql++-3.2.2+pristine/debian/patches/do_not_link_against_libmysqlclient_r.patch --- mysql++-3.2.2+pristine/debian/patches/do_not_link_against_libmysqlclient_r.patch 1970-01-01 00:00:00.000000000 +0000 +++ mysql++-3.2.2+pristine/debian/patches/do_not_link_against_libmysqlclient_r.patch 2016-11-23 17:23:22.000000000 +0000 @@ -0,0 +1,43 @@ +Description: stop linking against libmysqlclient_r and link directly against libmysqlclient instead + Quoting from Debian's bugreport #825086: + . + Your package currently links against libmysqlclient_r. libmysqlclient_r + was the thread-safe version of libmysqlclient in previous MySQL + releases. However, libmysqlclient has been itself been made thread-safe + since before the current libmysqlclient18. Thus libmysqlclient_r is + currently deprecated and provided as a compatibility symlink only, and + will disappear in MySQL 5.7. This change can be made now, in advance of + a possible future transition to libmysqlclient20, which does not provide + the _r variant. + . + In Ubuntu, we have done this with the attached quilt patch, which I + believe is also applicable to Debian. +Author: Robie Basak + +--- +Bug-Debian: https://bugs.debian.org/825086 +Forwarded: not-needed +Last-Update: 2016-11-23 + +--- mysql++-3.2.2+pristine.orig/config/mysql_loc.m4 ++++ mysql++-3.2.2+pristine/config/mysql_loc.m4 +@@ -35,7 +35,7 @@ AC_DEFUN([MYSQL_C_API_LOCATION], + # + if test "x$acx_pthread_ok" = xyes + then +- MYSQL_C_LIB_NAME=mysqlclient_r ++ MYSQL_C_LIB_NAME=mysqlclient + else + MYSQL_C_LIB_NAME=mysqlclient + fi +--- mysql++-3.2.2+pristine.orig/configure ++++ mysql++-3.2.2+pristine/configure +@@ -12195,7 +12195,7 @@ fi + # + if test "x$acx_pthread_ok" = xyes + then +- MYSQL_C_LIB_NAME=mysqlclient_r ++ MYSQL_C_LIB_NAME=mysqlclient + else + MYSQL_C_LIB_NAME=mysqlclient + fi diff -Nru mysql++-3.2.2+pristine/debian/patches/libmysqlclient_r mysql++-3.2.2+pristine/debian/patches/libmysqlclient_r --- mysql++-3.2.2+pristine/debian/patches/libmysqlclient_r 2016-04-15 15:47:12.000000000 +0000 +++ mysql++-3.2.2+pristine/debian/patches/libmysqlclient_r 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -Author: Robie Basak -Bug-Ubuntu: https://launchpad.net/bugs/1564871 -Forwarded: no -Last-Update: 2016-04-01 -Description: use libmysqlclient instead of libmysqlclient_r - The former supersedes the latter which no longer exists in MySQL 5.7. Patch - both the m4 macro and the configure script directly since autoreconf fails - (some m4 macros missing from the source tree?) - ---- a/config/mysql_loc.m4 -+++ b/config/mysql_loc.m4 -@@ -35,7 +35,7 @@ - # - if test "x$acx_pthread_ok" = xyes - then -- MYSQL_C_LIB_NAME=mysqlclient_r -+ MYSQL_C_LIB_NAME=mysqlclient - else - MYSQL_C_LIB_NAME=mysqlclient - fi ---- a/configure -+++ b/configure -@@ -12195,7 +12195,7 @@ - # - if test "x$acx_pthread_ok" = xyes - then -- MYSQL_C_LIB_NAME=mysqlclient_r -+ MYSQL_C_LIB_NAME=mysqlclient - else - MYSQL_C_LIB_NAME=mysqlclient - fi diff -Nru mysql++-3.2.2+pristine/debian/patches/series mysql++-3.2.2+pristine/debian/patches/series --- mysql++-3.2.2+pristine/debian/patches/series 2016-04-01 13:42:53.000000000 +0000 +++ mysql++-3.2.2+pristine/debian/patches/series 2016-11-23 17:23:22.000000000 +0000 @@ -1 +1 @@ -libmysqlclient_r +do_not_link_against_libmysqlclient_r.patch diff -Nru mysql++-3.2.2+pristine/debian/rules mysql++-3.2.2+pristine/debian/rules --- mysql++-3.2.2+pristine/debian/rules 2016-04-15 15:44:26.000000000 +0000 +++ mysql++-3.2.2+pristine/debian/rules 2017-02-18 04:13:22.000000000 +0000 @@ -3,6 +3,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk +export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + LDFLAGS += -pthread DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)