summaryrefslogtreecommitdiffstats
path: root/debian/patches/30_tdb_logging_func.diff
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/30_tdb_logging_func.diff')
-rw-r--r--debian/patches/30_tdb_logging_func.diff43
1 files changed, 43 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.
+ *