Attachment 72659 Details for Bug 105573 – courier-0.53.2-0.53.3-diff

courier-0.53.2-0.53.3-diff

courier-0.53.2-0.53.3-diff (text/x-diff; charset="us-ascii"), 4.36 KB, created by bsd on 2006-12-10 17:25:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: bsd

Created: 2006-12-10 17:25:47 UTC

Size: 4.36 KB

patch

obsolete

>diff -urN courier.orig/Makefile courier/Makefile
>--- courier.orig/Makefile	Thu Jun 29 20:47:30 2006
>+++ courier/Makefile	Sun Dec 10 11:18:36 2006
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	courier
>-PORTVERSION=	0.53.2
>+PORTVERSION=	0.53.3
> CATEGORIES=	mail ipv6
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	courier
>@@ -259,6 +259,12 @@
> CONFIGURE_ARGS+=--with-ipv6
> .else
> CONFIGURE_ARGS+=--without-ipv6
>+.endif
>+
>+.if ${OSVERSION} < 500000
>+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-maildir::maildirfilter.c \
>+		${FILESDIR}/extrapatch-webmail::folder.c \
>+		${FILESDIR}/extrapatch-webmail::newmsg.c
> .endif
> 
> pre-everything::
>diff -urN courier.orig/distinfo courier/distinfo
>--- courier.orig/distinfo	Thu Jun 29 20:47:30 2006
>+++ courier/distinfo	Sun Dec 10 11:17:13 2006
>@@ -1,3 +1,3 @@
>-MD5 (courier-0.53.2.tar.bz2) = 9ac1f892dcd2505a85d4e60edb61120c
>-SHA256 (courier-0.53.2.tar.bz2) = 0b44e02652084ca4023646ca0cdd3d173dcbadf919e81aa012b42666b3acf726
>-SIZE (courier-0.53.2.tar.bz2) = 6942557
>+MD5 (courier-0.53.3.tar.bz2) = e75013df7deebd463656b81cc3e245f4
>+SHA256 (courier-0.53.3.tar.bz2) = e6aa3e9572e96f65dd06c01f76a926724c9e243e2b824004eef441a3a3276144
>+SIZE (courier-0.53.3.tar.bz2) = 6944509
>diff -urN courier.orig/files/extrapatch-maildir::maildirfilter.c courier/files/extrapatch-maildir::maildirfilter.c
>--- courier.orig/files/extrapatch-maildir::maildirfilter.c	Thu Jan  1 01:00:00 1970
>+++ courier/files/extrapatch-maildir::maildirfilter.c	Sat Dec  9 22:45:27 2006
>@@ -0,0 +1,18 @@
>+--- maildir/maildirfilter.c.orig	Sat Jul  1 02:44:48 2006
>++++ maildir/maildirfilter.c	Sat Dec  9 21:38:05 2006
>+@@ -100,13 +100,13 @@
>+ 
>+ 	/* rule name: may not already exist */
>+ 	*errcode=MF_ERR_EXISTS;
>+-	
>++{
>+ 	struct maildirfilterrule *pom;
>+ 	for (pom=r->first; pom->next; pom=pom->next) {
>+ 	    if (p!=pom && !strcmp(name, pom->rulename))
>+ 		return (-1);
>+ 	}
>+-
>++}
>+ 	/* rule type: we must know what it is */
>+ 
>+ 	switch (type)	{
>diff -urN courier.orig/files/extrapatch-webmail::folder.c courier/files/extrapatch-webmail::folder.c
>--- courier.orig/files/extrapatch-webmail::folder.c	Thu Jan  1 01:00:00 1970
>+++ courier/files/extrapatch-webmail::folder.c	Sat Dec  9 22:45:55 2006
>@@ -0,0 +1,20 @@
>+--- webmail/folder.c.orig	Sun Jul 23 00:09:04 2006
>++++ webmail/folder.c	Sat Dec  9 22:23:23 2006
>+@@ -287,7 +287,7 @@
>+ 			(unsigned long)pos);
>+ 		return;
>+ 	    }
>+-	    
>++{
>+ 	    char *cur = malloc(strlen(deldir)+5);
>+ 	    strcpy(cur, deldir);
>+ 	    strcat(cur, "/cur");
>+@@ -298,7 +298,7 @@
>+ 	    maildir_info_destroy(&minfo);
>+ 	    free(deldir);
>+ 	    free(cur);
>+-	    
>++}
>+ 	}
>+ 	else if (*cgi("cmdmove"))
>+ 	{
>diff -urN courier.orig/files/extrapatch-webmail::newmsg.c courier/files/extrapatch-webmail::newmsg.c
>--- courier.orig/files/extrapatch-webmail::newmsg.c	Thu Jan  1 01:00:00 1970
>+++ courier/files/extrapatch-webmail::newmsg.c	Sat Dec  9 22:46:22 2006
>@@ -0,0 +1,18 @@
>+--- webmail/newmsg.c.orig	Sun Jul 30 21:01:42 2006
>++++ webmail/newmsg.c	Sat Dec  9 22:27:06 2006
>+@@ -630,13 +630,14 @@
>+ 	printf("<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"4\" class=\"new-message-box\"><tr><td>\n");
>+ 
>+ 	printf("<table border=\"0\" width=\"100%%\">\n");
>++{
>+ 	int wbnochangingfrom=auth_getoptionenvint("wbnochangingfrom");
>+ 	if (wbnochangingfrom < 2)
>+ 		newmsg_header_rfc822(fromlab, "headerfrom", curfrom,
>+ 			*cgi("from") ? cgi("from"):
>+ 			pref_from && *pref_from ? pref_from:
>+ 			login_fromhdr(), wbnochangingfrom ? 1:0);
>+-
>++}
>+ 	printf("<tr valign=\"middle\"><th align=\"right\">"
>+ 	       "<p class=\"new-message-header\">"
>+ 	       "<span class=\"new-message-header-addressbook\">"
>diff -urN courier.orig/files/patch-rfc2045_rfc2045reply.c courier/files/patch-rfc2045_rfc2045reply.c
>--- courier.orig/files/patch-rfc2045_rfc2045reply.c	Thu Jun 29 20:47:31 2006
>+++ courier/files/patch-rfc2045_rfc2045reply.c	Thu Jan  1 01:00:00 1970
>@@ -1,24 +0,0 @@
>---- rfc2045/rfc2045reply.c.orig	Thu Jun 29 15:07:18 2006
>-+++ rfc2045/rfc2045reply.c	Thu Jun 29 15:07:47 2006
>-@@ -592,6 +592,10 @@
>- 	int errflag=0;
>- 	struct rfc2045headerinfo *hi;
>- 
>-+#if	HAVE_UNICODE
>-+	const struct unicode_info *uiptr=NULL;
>-+#endif
>-+
>- 	oldtocc=0;
>- 	oldtolist=0;
>- 	oldfrom=0;
>-@@ -600,9 +604,8 @@
>- 	oldmsgid=0;
>- 	oldreferences=0;
>- 	whowrote=0;
>--#if	HAVE_UNICODE
>--	const struct unicode_info *uiptr=NULL;
>- 
>-+#if	HAVE_UNICODE
>- 	if (ri->charset && *(ri->charset))
>- 		uiptr = unicode_find(ri->charset);
>- #endif

Actions: View

Attachments on bug 105573: 72655 | 72656 | 72657 | 72658 | 72659 | 72660