[SVN] r472 - in /trunk/cyrus-imapd-2.2.13/debian/patches:
0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch 00list
debian at incase.de
debian at incase.de
Thu May 25 21:50:54 UTC 2006
Author: astronut
Date: Thu May 25 23:50:50 2006
New Revision: 472
URL: https://mail.incase.de/viewcvs?rev=472&root=cyrus22&view=rev
Log:
Add upstream sasl compatibility patch
Added:
trunk/cyrus-imapd-2.2.13/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch (with props)
Modified:
trunk/cyrus-imapd-2.2.13/debian/patches/00list
Added: trunk/cyrus-imapd-2.2.13/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch?rev=472&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch (added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch Thu May 25 23:50:50 2006
@@ -1,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch by Benjamin Seidenberg <astronut at dlgeek.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream compatibility fix for SASL 2.1.22
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/imtest/imtest.c cyrus-imapd-2.2.13/imtest/imtest.c
+--- cyrus-imapd-2.2.13~/imtest/imtest.c 2006-05-05 21:04:25.000000000 -0400
++++ cyrus-imapd-2.2.13/imtest/imtest.c 2006-05-25 17:49:37.000000000 -0400
+@@ -1,7 +1,7 @@
+ /* imtest.c -- IMAP/POP3/NNTP/LMTP/SMTP/MUPDATE/MANAGESIEVE test client
+ * Ken Murchison (multi-protocol implementation)
+ * Tim Martin (SASL implementation)
+- * $Id: imtest.c,v 1.107 2006/01/20 20:31:23 jeaton Exp $
++ * $Id: imtest.c,v 1.108 2006/05/25 15:23:07 murch Exp $
+ *
+ * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
+ *
+@@ -886,6 +886,12 @@
+ }
+
+ if (*str != '\r') {
++ /* trim CRLF */
++ char *p = str + strlen(str) - 1;
++ if (p >= str && *p == '\n') *p-- = '\0';
++ if (p >= str && *p == '\r') *p-- = '\0';
++
++ /* alloc space for decoded response */
+ len = strlen(str) + 1;
+ *line = malloc(len);
+ if ((*line) == NULL) {
Propchange: trunk/cyrus-imapd-2.2.13/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/00list?rev=472&root=cyrus22&r1=471&r2=472&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Thu May 25 23:50:50 2006
@@ -9,6 +9,7 @@
0009-upstream-remove-redundant-wildcard-check.dpatch
0010-upstream-fix-libRSAglue-linkage.dpatch
0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
+0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
01-fix_Makefile.in.dpatch
02-add_mkinstalldirs.dpatch
03-fix_docs.dpatch
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list