Adding debian version 1.4.10-1.debian/1.4.10-1debian

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 67 insertions, 0 deletions

diff --git a/debian/patches/30_tdb_logging_func.diff b/debian/patches/30_tdb_logging_func.diff
new file mode 100644
index 0000000..2135442
--- /dev/null
+++ b/debian/patches/30_tdb_logging_func.diff
@@ -0,0 +1,43 @@
+Author: Jelmer Vernooij <jelmer@samba.org>
+Status: Not forwarded upstream
+Description: Provide public symbol tdb_logging_function removed upstream without major version change. (bug #511011)
+
+diff -ur tdb-1.2.9/ABI/tdb-1.2.1.sigs tdb-1.2.9+git20120207.new/ABI/tdb-1.2.1.sigs
+--- tdb-1.2.9/ABI/tdb-1.2.1.sigs	2012-02-07 15:07:35.000000000 +0100
++++ tdb-1.2.9+git20120207.new/ABI/tdb-1.2.1.sigs	2012-02-07 15:23:51.000000000 +0100
+@@ -48,6 +48,7 @@
+ tdb_lockall_read_nonblock: int (struct tdb_context *)
+ tdb_lockall_unmark: int (struct tdb_context *)
+ tdb_log_fn: tdb_log_func (struct tdb_context *)
++tdb_logging_function: void tdb_logging_function(struct tdb_context *, tdb_log_func)
+ tdb_map_size: size_t (struct tdb_context *)
+ tdb_mmap: void (struct tdb_context *)
+ tdb_munmap: int (struct tdb_context *)
+diff -ur tdb-1.2.9/common/open.c tdb-1.2.9+git20120207.new/common/open.c
+--- tdb-1.2.9/common/open.c	2012-02-07 15:07:35.000000000 +0100
++++ tdb-1.2.9+git20120207.new/common/open.c	2012-02-07 15:23:51.000000000 +0100
+@@ -539,6 +539,11 @@
+         tdb->log = *log_ctx;
+ }
+ 
++_PUBLIC_ void tdb_logging_function(struct tdb_context *tdb, tdb_log_func fn)
++{
++	tdb->log.log_fn = fn;
++}
++
+ _PUBLIC_ void *tdb_get_logging_private(struct tdb_context *tdb)
+ {
+ 	return tdb->log.log_private;
+diff -ur tdb-1.2.9/include/tdb.h tdb-1.2.9+git20120207.new/include/tdb.h
+--- tdb-1.2.9/include/tdb.h	2012-02-07 15:07:35.000000000 +0100
++++ tdb-1.2.9+git20120207.new/include/tdb.h	2012-02-07 15:24:06.000000000 +0100
+@@ -233,6 +233,9 @@
+  */
+ _PUBLIC_ int tdb_reopen_all(int parent_longlived);
+ 
++
++__attribute__((deprecated)) void tdb_logging_function(struct tdb_context *tdb, tdb_log_func);
++
+ /**
+  * @brief Set a different tdb logging function.
+  *
diff --git a/debian/patches/40_test_transaction_expand_non_fatal.diff b/debian/patches/40_test_transaction_expand_non_fatal.diff
new file mode 100644
index 0000000..e1812a6
--- /dev/null
+++ b/debian/patches/40_test_transaction_expand_non_fatal.diff
@@ -0,0 +1,22 @@
+Description: Make test transaction-expand non-fatal
+ The test tdb1-run-transaction-expand fails on some architectures. This patch
+ makes the test non-fatal for now.
+Author: Ivo De Decker <ivo.dedecker@ugent.be>
+Bug-Debian: http://bugs.debian.org/674749
+Forwarded: no
+Last-Update: 2012-05-28
+
+--- a/wscript
++++ b/wscript
+@@ -238,8 +238,9 @@
+             if ret != 0:
+                 print("%s failed:" % f)
+                 samba_utils.RUN_COMMAND("cat " + os.path.join(testdir, 'test-output'))
+-                ecode = ret
+-                break
++                if f != 'tdb1-run-transaction-expand':
++                    ecode = ret
++                    break
+ 
+     if ecode == 0:
+         cmd = os.path.join(blddir, 'tdbtorture')
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c7610ae
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+30_tdb_logging_func.diff
+40_test_transaction_expand_non_fatal.diff