[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-147-g4fca2dc
Alexander Golovko
alexandro at ankalagon.ru
Sat Jun 2 16:23:21 UTC 2012
The following commit has been merged in the master branch:
commit 4fca2dcac2addec1cdf6be1980a9aefb0138e166
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date: Sat Jun 2 20:14:58 2012 +0400
simplify fix-mysql-autoconf.patch
remove some unused changes
fix offsets in other patches
diff --git a/debian/patches/fix-mysql-autoconf.patch b/debian/patches/fix-mysql-autoconf.patch
index fde64fc..5f19c7f 100644
--- a/debian/patches/fix-mysql-autoconf.patch
+++ b/debian/patches/fix-mysql-autoconf.patch
@@ -6,11 +6,11 @@ Bug: http://bugs.bacula.org/view.php?id=1829
Author: Ben Hutchings <ben at decadent.org.uk>
Reviewed-by: Alexander Golovko <alexandro at ankalagon.ru>
Reviewed-by: Luca Capello <luca at pca.it>
-Last-Update: 2012-05-20
+Last-Update: 2012-06-02
--- a/autoconf/bacula-macros/db.m4
+++ b/autoconf/bacula-macros/db.m4
-@@ -327,8 +327,16 @@
+@@ -327,8 +327,15 @@ AC_ARG_WITH(mysql,
AC_HELP_STRING([--with-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the MySQL base install directory, default is to search through a number of common places for the MySQL files.]),
[
if test "$withval" != "no"; then
@@ -23,62 +23,11 @@ Last-Update: 2012-05-20
+ SQL_INCLUDE="$(mysql_config --cflags)"
+ SQL_LFLAGS="$(mysql_config --libs_r || mysql_config --libs)"
+ MYSQL_BINDIR="$(dirname "$MYSQL_CONFIG")"
-+ else
-+ if test -f /usr/local/mysql/include/mysql/mysql.h; then
++ elif test -f /usr/local/mysql/include/mysql/mysql.h; then
MYSQL_INCDIR=/usr/local/mysql/include/mysql
if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a \
-o -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.so; then
-@@ -337,7 +345,7 @@
- MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
- fi
- MYSQL_BINDIR=/usr/local/mysql/bin
-- elif test -f /usr/include/mysql/mysql.h; then
-+ elif test -f /usr/include/mysql/mysql.h; then
- MYSQL_INCDIR=/usr/include/mysql
- if test -f /usr/lib64/mysql/libmysqlclient_r.a \
- -o -f /usr/lib64/mysql/libmysqlclient_r.so; then
-@@ -352,7 +360,7 @@
- MYSQL_LIBDIR=/usr/lib
- fi
- MYSQL_BINDIR=/usr/bin
-- elif test -f /usr/include/mysql.h; then
-+ elif test -f /usr/include/mysql.h; then
- MYSQL_INCDIR=/usr/include
- if test -f /usr/lib64/libmysqlclient_r.a \
- -o -f /usr/lib64/libmysqlclient_r.so; then
-@@ -361,7 +369,7 @@
- MYSQL_LIBDIR=/usr/lib
- fi
- MYSQL_BINDIR=/usr/bin
-- elif test -f /usr/local/include/mysql/mysql.h; then
-+ elif test -f /usr/local/include/mysql/mysql.h; then
- MYSQL_INCDIR=/usr/local/include/mysql
- if test -f /usr/local/lib64/mysql/libmysqlclient_r.a \
- -o -f /usr/local/lib64/mysql/libmysqlclient_r.so; then
-@@ -370,7 +378,7 @@
- MYSQL_LIBDIR=/usr/local/lib/mysql
- fi
- MYSQL_BINDIR=/usr/local/bin
-- elif test -f /usr/local/include/mysql.h; then
-+ elif test -f /usr/local/include/mysql.h; then
- MYSQL_INCDIR=/usr/local/include
- if test -f /usr/local/lib64/libmysqlclient_r.a \
- -o -f /usr/local/lib64/libmysqlclient_r.so; then
-@@ -379,9 +387,10 @@
- MYSQL_LIBDIR=/usr/local/lib
- fi
- MYSQL_BINDIR=/usr/local/bin
-- else
-- AC_MSG_RESULT(no)
-- AC_MSG_ERROR(Unable to find mysql.h in standard locations)
-+ else
-+ AC_MSG_RESULT(no)
-+ AC_MSG_ERROR(Unable to find mysql.h in standard locations)
-+ fi
- fi
- else
- if test -f $withval/include/mysql/mysql.h; then
-@@ -413,11 +422,15 @@
+@@ -413,11 +420,15 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the My
AC_MSG_ERROR(Invalid MySQL directory $withval - unable to find mysql.h under $withval)
fi
fi
diff --git a/debian/patches/fix-mysql55-sql-syntax.patch b/debian/patches/fix-mysql55-sql-syntax.patch
index cb58378..fac4e07 100644
--- a/debian/patches/fix-mysql55-sql-syntax.patch
+++ b/debian/patches/fix-mysql55-sql-syntax.patch
@@ -11,7 +11,7 @@ diff --git a/src/cats/make_mysql_tables.in b/src/cats/make_mysql_tables.in
index 37a10d2..6cf24a3 100644
--- a/src/cats/make_mysql_tables.in
+++ b/src/cats/make_mysql_tables.in
-@@ -324,8 +324,8 @@ CREATE TABLE UnsavedFiles (
+@@ -323,8 +323,8 @@ CREATE TABLE UnsavedFiles (
CREATE TABLE Counters (
Counter TINYBLOB NOT NULL,
diff --git a/debian/patches/fix-readline-ncurses-depends.patch b/debian/patches/fix-readline-ncurses-depends.patch
index 1dd575b..1ba441a 100644
--- a/debian/patches/fix-readline-ncurses-depends.patch
+++ b/debian/patches/fix-readline-ncurses-depends.patch
@@ -7,7 +7,7 @@ Last-Update: 2012-05-19
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
-@@ -854,9 +854,6 @@ AC_ARG_ENABLE(readline,
+@@ -855,9 +855,6 @@ AC_ARG_ENABLE(readline,
fi
]
)
@@ -17,7 +17,7 @@ Last-Update: 2012-05-19
got_readline="no"
READLINE_SRC=
-@@ -883,7 +880,7 @@ if test x$support_readline = xyes; then
+@@ -884,7 +881,7 @@ if test x$support_readline = xyes; then
AC_CHECK_HEADER(${with_readline}/readline.h,
[
AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
@@ -26,7 +26,7 @@ Last-Update: 2012-05-19
got_readline="yes"
], [
echo " "
-@@ -900,7 +897,7 @@ if test x$support_readline = xyes; then
+@@ -901,7 +898,7 @@ if test x$support_readline = xyes; then
AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
got_readline="yes"
CONS_INC="-I/usr/include/readline"
@@ -35,7 +35,7 @@ Last-Update: 2012-05-19
], [
dnl Did not find standard library, so try Bacula's default
AC_CHECK_HEADER(${TOP_DIR}/depkgs/readline/readline.h,
-@@ -908,7 +905,7 @@ if test x$support_readline = xyes; then
+@@ -909,7 +906,7 @@ if test x$support_readline = xyes; then
AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
got_readline="yes"
CONS_INC="-I${TOP_DIR}/depkgs/readline"
--
Bacula, a network backup, recovery and verification program
More information about the pkg-bacula-commits
mailing list