[SVN] r256 - in trunk/cyrus-imapd-2.2.12/debian/patches: 00list 55-fix-db_err_callback.dpatch

[debian at incase.de]

Author: sven
Date: Sat Jan 14 19:41:45 2006
New Revision: 256

URL: https://mail.incase.de/viewcvs?root=cyrus22?view=rev&rev=256
Log:
Add db_err callback fix for DB 4.3, fix patches/00list accordingly
Added:
    trunk/cyrus-imapd-2.2.12/debian/patches/55-fix-db_err_callback.dpatch   (with props)
Modified:
    trunk/cyrus-imapd-2.2.12/debian/patches/00list

Modified: trunk/cyrus-imapd-2.2.12/debian/patches/00list
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/patches/00list?view=diff&rev=256&p1=trunk/cyrus-imapd-2.2.12/debian/patches/00list&r1=255&p2=trunk/cyrus-imapd-2.2.12/debian/patches/00list&r2=256
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/00list Sat Jan 14 19:41:45 2006
@@ -1,4 +1,3 @@
-00-6662-upstream-off-by-one_in_imap_spool.dpatch
 01-fix_Makefile.in.dpatch
 02-add_mkinstalldirs.dpatch
 03-fix_docs.dpatch
@@ -20,6 +19,7 @@
 19-fix_tls_ssl.dpatch
 20-drac_auth.dpatch
 21-fix_config-parsing.dpatch
+23-upstream-off-by-one_in_imap_spool.dpatch
 22-imapd_index_check.dpatch
 25-update_install-sh.dpatch
 30-update_perlcalling.sh.dpatch
@@ -28,7 +28,9 @@
 45-kolab2-annotations.dpatch
 50-FTBFS-gcc-4.0-fix.dpatch
 51-multiple_mupdate_err.h-fix.dpatch
+55-fix-db_err_callback.dpatch
 61-64bit-quota.dpatch
 65-sieveshell-enhancements.dpatch
 98-use_Debian_config.guess_config.sub.dpatch
 99-update-autoconf.dpatch
+23-upstream-off-by-one_in_imap_spool.dpatch

Added: trunk/cyrus-imapd-2.2.12/debian/patches/55-fix-db_err_callback.dpatch
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/patches/55-fix-db_err_callback.dpatch?view=auto&rev=256
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/patches/55-fix-db_err_callback.dpatch (added)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/55-fix-db_err_callback.dpatch Sat Jan 14 19:41:45 2006
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55-fix-db_err_callback.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c /tmp/dpep.iwhsD7/cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c
+--- cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c	2005-03-12 23:09:22.000000000 +0100
++++ /tmp/dpep.iwhsD7/cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c	2006-01-14 19:39:43.150703236 +0100
+@@ -104,7 +104,11 @@
+     exit(EC_TEMPFAIL);
+ }
+ 
++#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3
+ static void db_err(const char *db_prfx, char *buffer)
++#else
++static void db_err(const DB_ENV *dbenv, const char *db_prfx, const char *buffer)
++#endif
+ {
+     syslog(LOG_WARNING, "DBERROR %s: %s", db_prfx, buffer);
+ }

Propchange: trunk/cyrus-imapd-2.2.12/debian/patches/55-fix-db_err_callback.dpatch
------------------------------------------------------------------------------
    svn:executable = *