Package: libnss-mysql-bg
Version: 1.5-2
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
*** /tmp/tmpZm3V2r/bug_body
In Ubuntu, the attached patch was applied to achieve the following:
libmysqlclient is multi-arch now, so /usr/lib doesn't have libmysqlclient.*
anymore.
mysql_config has been included since mysql 5.0, so it should be used instead.
This
patch should probably go upstream as well.
* - acinclude.m4: patch to use mysql_config to find libs
- d/rules: use dh_autoreconf to pick up acinclude.m4 changes.
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-12-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u libnss-mysql-bg-1.5/debian/changelog libnss-mysql-bg-1.5/debian/changelog
diff -u libnss-mysql-bg-1.5/debian/control libnss-mysql-bg-1.5/debian/control
--- libnss-mysql-bg-1.5/debian/control
+++ libnss-mysql-bg-1.5/debian/control
@@ -1,8 +1,9 @@
Source: libnss-mysql-bg
Section: admin
Priority: optional
-Build-Depends: debhelper (>= 7), libmysqlclient-dev, dpatch
+Build-Depends: debhelper (>= 7), libmysqlclient-dev, dpatch, dh-autoreconf
Standards-Version: 3.8.3
Package: libnss-mysql-bg
diff -u libnss-mysql-bg-1.5/debian/rules libnss-mysql-bg-1.5/debian/rules
--- libnss-mysql-bg-1.5/debian/rules
+++ libnss-mysql-bg-1.5/debian/rules
@@ -35,6 +35,7 @@
configure: configure-stamp
configure-stamp: patch
dh_testdir
+ dh_autoreconf
./configure
touch configure-stamp
@@ -51,6 +52,7 @@
rm -f build-stamp configure-stamp
[ ! -f Makefile ] || $(MAKE) distclean
rm -f config.log
+ dh_autoreconf_clean
dh_clean
dpatch deapply-all
rm -rf debian/patched
diff -u libnss-mysql-bg-1.5/debian/patches/00list libnss-mysql-bg-1.5/debian/patches/00list
--- libnss-mysql-bg-1.5/debian/patches/00list
+++ libnss-mysql-bg-1.5/debian/patches/00list
@@ -3,0 +4 @@
+10_fix_acinclude.dpatch
only in patch2:
unchanged:
--- libnss-mysql-bg-1.5.orig/debian/patches/10_fix_acinclude.dpatch
+++ libnss-mysql-bg-1.5/debian/patches/10_fix_acinclude.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix_acinclude.dpatch by <cl...@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix acinclude mysqlclient search to use mysql_config.
+
+@DPATCH@
+--- libnss-mysql-bg-1.5.orig/acinclude.m4
++++ libnss-mysql-bg-1.5/acinclude.m4
+@@ -52,33 +52,7 @@
+ AC_MSG_CHECKING([for MySQL libraries])
+ dnl Check for share first, then static, such that static
+ dnl will take precedence
+-for f in $baselist; do
+- if test -f "$f/lib/libmysqlclient.so"
+- then
+- MYSQL_LIB_DIR="$f/lib"
+- break
+- fi
+-
+- if test -f "$f/lib/mysql/libmysqlclient.so"
+- then
+- MYSQL_LIB_DIR="$f/lib/mysql"
+- break
+- fi
+-done
+-
+-for f in $baselist; do
+- if test -f "$f/lib/libmysqlclient.a"
+- then
+- MYSQL_LIB_DIR="$f/lib"
+- break
+- fi
+-
+- if test -f "$f/lib/mysql/libmysqlclient.a"
+- then
+- MYSQL_LIB_DIR="$f/lib/mysql"
+- break
+- fi
+-done
++MYSQL_LIB_DIR=`mysql_config --variable=pkglibdir`
+
+ if test -n "$MYSQL_LIB_DIR"
+ then
