[Pkg-Cyrus-imapd-Debian-devel] [SVN] r183 - in trunk/cyrus-imapd-2.2.12/debian: changelog patches/00list patches/70-libdb-libcyrusdb.dpatch patches/75-timsieved_SSL_handling.dpatch

[debian at incase.de]

Author: sven
Date: Mon Nov 14 14:57:41 2005
New Revision: 183

URL: https://mail.incase.de/viewcvs?root=cyrus22?view=rev&rev=183
Log:
Add patch to fix BDB usage to be compatible with BerkeleyDB 4.3
Add patch to fix TLS/SSL shutdown in timsieved
Added:
    trunk/cyrus-imapd-2.2.12/debian/patches/70-libdb-libcyrusdb.dpatch   (with props)
    trunk/cyrus-imapd-2.2.12/debian/patches/75-timsieved_SSL_handling.dpatch   (with props)
Modified:
    trunk/cyrus-imapd-2.2.12/debian/changelog
    trunk/cyrus-imapd-2.2.12/debian/patches/00list

Modified: trunk/cyrus-imapd-2.2.12/debian/changelog
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/changelog?view=diff&rev=183&p1=trunk/cyrus-imapd-2.2.12/debian/changelog&r1=182&p2=trunk/cyrus-imapd-2.2.12/debian/changelog&r2=183
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.12/debian/changelog Mon Nov 14 14:57:41 2005
@@ -1,3 +1,11 @@
+cyrus22-imapd (2.2.12-0.9) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Add patch to be compatible with BerkeleyDB 4.3
+  * Add patch to fix TLS/SSL shutdown in timsieved
+
+ -- Sven Mueller <debian at incase.de>  Mon, 14 Nov 2005 14:56:20 +0100
+
 cyrus22-imapd (2.2.12-0.8) unstable; urgency=low
 
   [ Sven Mueller ]

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=183&p1=trunk/cyrus-imapd-2.2.12/debian/patches/00list&r1=182&p2=trunk/cyrus-imapd-2.2.12/debian/patches/00list&r2=183
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/00list Mon Nov 14 14:57:41 2005
@@ -29,5 +29,7 @@
 51-multiple_mupdate_err.h-fix.dpatch
 61-64bit-quota.dpatch
 65-sieveshell-enhancements.dpatch
+70-libdb-libcyrusdb.dpatch
+75-timsieved_SSL_handling.dpatch
 98-use_Debian_config.guess_config.sub.dpatch
 99-update-autoconf.dpatch

Added: trunk/cyrus-imapd-2.2.12/debian/patches/70-libdb-libcyrusdb.dpatch
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/patches/70-libdb-libcyrusdb.dpatch?view=auto&rev=183
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/patches/70-libdb-libcyrusdb.dpatch (added)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/70-libdb-libcyrusdb.dpatch Mon Nov 14 14:57:41 2005
@@ -1,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70-libdb-libcyrusdb.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix up libdb usage to be compatible with Berkeley DB 4.3
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c /tmp/dpep.5YhzEc/cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c
+--- cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c	2005-11-11 17:13:14.000000000 +0100
++++ /tmp/dpep.5YhzEc/cyrus-imapd-2.2.12/lib/cyrusdb_berkeley.c	2005-11-14 14:52:22.630129984 +0100
+@@ -109,6 +109,11 @@
+     syslog(LOG_WARNING, "DBERROR %s: %s", db_prfx, buffer);
+ }
+ 
++static void db_err43(DB_ENV *dbenv, const char *db_prfx, char *buffer)
++{
++    syslog(LOG_WARNING, "DBERROR %s: %s", db_prfx, buffer);
++}
++
+ static int init(const char *dbdir, int myflags)
+ {
+     int r, do_retry = 1;
+@@ -149,7 +154,13 @@
+ #endif
+     }
+ 
+-    dbenv->set_errcall(dbenv, db_err);
++    if (maj >4) 
++        dbenv->set_errcall(dbenv, db_err43);
++    else if ( (maj == 4)&&(min > 2) ) 
++        dbenv->set_errcall(dbenv, db_err43);
++    else
++        dbenv->set_errcall(dbenv, db_err);
++    
+     snprintf(errpfx, sizeof(errpfx), "db%d", DB_VERSION_MAJOR);
+     dbenv->set_errpfx(dbenv, errpfx);
+ 

Propchange: trunk/cyrus-imapd-2.2.12/debian/patches/70-libdb-libcyrusdb.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: trunk/cyrus-imapd-2.2.12/debian/patches/75-timsieved_SSL_handling.dpatch
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/patches/75-timsieved_SSL_handling.dpatch?view=auto&rev=183
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/patches/75-timsieved_SSL_handling.dpatch (added)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/75-timsieved_SSL_handling.dpatch Mon Nov 14 14:57:41 2005
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 75-timsieved_SSL_handling.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix SSL/TLS shutdown handling
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.12/timsieved/timsieved.c /tmp/dpep.PdXYyu/cyrus-imapd-2.2.12/timsieved/timsieved.c
+--- cyrus-imapd-2.2.12/timsieved/timsieved.c	2005-11-11 17:13:15.000000000 +0100
++++ /tmp/dpep.PdXYyu/cyrus-imapd-2.2.12/timsieved/timsieved.c	2005-11-14 14:54:38.926791219 +0100
+@@ -136,6 +136,10 @@
+ 
+     if (sieved_logfd != -1) close(sieved_logfd);
+ 
++#ifdef HAVE_SSL
++    tls_shutdown_serverengine();
++#endif
++
+     cyrus_done();
+ 
+     cyrus_reset_stdio();

Propchange: trunk/cyrus-imapd-2.2.12/debian/patches/75-timsieved_SSL_handling.dpatch
------------------------------------------------------------------------------
    svn:executable = *