[SVN] r858 - /branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/0024-upstream-fix-sieve.dpatch
debian at incase.de
debian at incase.de
Sun Jan 17 20:43:08 UTC 2010
Author: myon
Date: Sun Jan 17 21:43:08 2010
New Revision: 858
URL: https://mail.incase.de/viewcvs?rev=858&root=cyrus22&view=rev
Log:
refresh patch broken by copyright cleanup
Modified:
branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/0024-upstream-fix-sieve.dpatch
Modified: branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/0024-upstream-fix-sieve.dpatch
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/0024-upstream-fix-sieve.dpatch?rev=858&root=cyrus22&r1=857&r2=858&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/0024-upstream-fix-sieve.dpatch (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/debian/patches/0024-upstream-fix-sieve.dpatch Sun Jan 17 21:43:08 2010
@@ -5,80 +5,9 @@
## DP: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sieve/script.c.diff?r1=1.63;r2=1.68
@DPATCH@
---- src/sieve/script.c 2006/11/30 17:11:24 1.63
-+++ src/sieve/script.c 2009/09/02 13:56:18 1.68
-@@ -1,29 +1,47 @@
- /* script.c -- sieve script functions
- * Larry Greenfield
-- * $Id: script.c,v 1.63 2006/11/30 17:11:24 murch Exp $
-+ *
-+ * Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ *
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in
-+ * the documentation and/or other materials provided with the
-+ * distribution.
-+ *
-+ * 3. The name "Carnegie Mellon University" must not be used to
-+ * endorse or promote products derived from this software without
-+ * prior written permission. For permission or any legal
-+ * details, please contact
-+ * Carnegie Mellon University
-+ * Center for Technology Transfer and Enterprise Creation
-+ * 4615 Forbes Avenue
-+ * Suite 302
-+ * Pittsburgh, PA 15213
-+ * (412) 268-7393, fax: (412) 268-7395
-+ * innovation at andrew.cmu.edu
-+ *
-+ * 4. Redistributions of any form whatsoever must retain the following
-+ * acknowledgment:
-+ * "This product includes software developed by Computing Services
-+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-+ *
-+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * $Id: script.c,v 1.68 2009/09/02 13:56:18 brong Exp $
- */
--/***********************************************************
-- Copyright 1999 by Carnegie Mellon University
--
-- All Rights Reserved
--
--Permission to use, copy, modify, and distribute this software and its
--documentation for any purpose and without fee is hereby granted,
--provided that the above copyright notice appear in all copies and that
--both that copyright notice and this permission notice appear in
--supporting documentation, and that the name of Carnegie Mellon
--University not be used in advertising or publicity pertaining to
--distribution of the software without specific, written prior
--permission.
--
--CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
--THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
--FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
--ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
--WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
--ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
--OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--******************************************************************/
-
- #ifdef HAVE_CONFIG_H
- #include <config.h>
-@@ -186,7 +204,7 @@ int sieve_script_parse(sieve_interp_t *i
+--- a/sieve/script.c
++++ b/sieve/script.c
+@@ -204,7 +204,7 @@ int sieve_script_parse(sieve_interp_t *i
return res;
}
@@ -87,7 +16,7 @@
{
while (imapflags->nflags)
free(imapflags->flag[--imapflags->nflags]);
-@@ -318,15 +336,15 @@ static int build_notify_message(sieve_in
+@@ -336,15 +336,15 @@ static int build_notify_message(sieve_in
}
}
@@ -106,7 +35,7 @@
(*out)[*outlen+n]='\0';
(*outlen) += n;
}
-@@ -343,7 +361,7 @@ static int build_notify_message(sieve_in
+@@ -361,7 +361,7 @@ static int build_notify_message(sieve_in
/* find length of plaintext up to next potential variable */
n = strcspn(c+1, "$") + 1; /* skip opening '$' */
/* realloc if necessary */
@@ -115,7 +44,7 @@
allocsize = (*outlen) + n+1 + GROW_AMOUNT;
*out = xrealloc(*out, allocsize);
}
-@@ -536,6 +554,11 @@ int sieve_script_load(const char *fname,
+@@ -554,6 +554,11 @@ int sieve_script_load(const char *fname,
syslog(LOG_ERR, "IOERROR: can not open sieve script %s: %m", fname);
return SIEVE_FAIL;
}
@@ -127,7 +56,7 @@
bc = (sieve_bytecode_t *) xzmalloc(sizeof(sieve_bytecode_t));
-@@ -665,7 +688,7 @@ static int do_sieve_error(int ret,
+@@ -683,7 +688,7 @@ static int do_sieve_error(int ret,
ret |= keep_ret;
if (keep_ret == SIEVE_OK)
snprintf(actions_string+strlen(actions_string),
@@ -136,7 +65,7 @@
"Kept\n");
else {
implicit_keep = 0; /* don't try an implicit keep again */
-@@ -719,7 +742,7 @@ static int do_action_list(sieve_interp_t
+@@ -737,7 +742,7 @@ static int do_action_list(sieve_interp_t
if (ret == SIEVE_OK)
snprintf(actions_string+strlen(actions_string),
@@ -145,7 +74,7 @@
"Rejected with: %s\n", a->u.rej.msg);
break;
-@@ -734,7 +757,7 @@ static int do_action_list(sieve_interp_t
+@@ -752,7 +757,7 @@ static int do_action_list(sieve_interp_t
if (ret == SIEVE_OK)
snprintf(actions_string+strlen(actions_string),
@@ -154,7 +83,7 @@
"Filed into: %s\n",a->u.fil.mailbox);
break;
case ACTION_KEEP:
-@@ -747,7 +770,7 @@ static int do_action_list(sieve_interp_t
+@@ -765,7 +770,7 @@ static int do_action_list(sieve_interp_t
&errmsg);
if (ret == SIEVE_OK)
snprintf(actions_string+strlen(actions_string),
@@ -163,7 +92,7 @@
"Kept\n");
break;
case ACTION_REDIRECT:
-@@ -760,7 +783,7 @@ static int do_action_list(sieve_interp_t
+@@ -778,7 +783,7 @@ static int do_action_list(sieve_interp_t
&errmsg);
if (ret == SIEVE_OK)
snprintf(actions_string+strlen(actions_string),
@@ -172,7 +101,7 @@
"Redirected to %s\n", a->u.red.addr);
break;
case ACTION_DISCARD:
-@@ -771,7 +794,7 @@ static int do_action_list(sieve_interp_t
+@@ -789,7 +794,7 @@ static int do_action_list(sieve_interp_t
&errmsg);
if (ret == SIEVE_OK)
snprintf(actions_string+strlen(actions_string),
@@ -181,7 +110,7 @@
"Discarded\n");
break;
-@@ -797,12 +820,12 @@ static int do_action_list(sieve_interp_t
+@@ -815,12 +820,12 @@ static int do_action_list(sieve_interp_t
if (ret == SIEVE_OK)
snprintf(actions_string+strlen(actions_string),
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list