View | Details | Raw Unified | Return to bug 132228 | Differences between
and this patch

Collapse All | Expand All

(-)courier/Makefile (-4 / +38 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	courier
8
PORTNAME=	courier
9
PORTVERSION=	0.60.0
9
PORTVERSION=	0.61.1
10
CATEGORIES=	mail ipv6
10
CATEGORIES=	mail ipv6
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	courier
12
MASTER_SITE_SUBDIR=	courier
Lines 54-60 Link Here
54
MAILGID=	465
54
MAILGID=	465
55
ETCDIR=		${PREFIX}/etc
55
ETCDIR=		${PREFIX}/etc
56
SYSCONFDIR=	${ETCDIR}/courier
56
SYSCONFDIR=	${ETCDIR}/courier
57
USERDB?=	${ETCDIR}/userdb
58
LIBEXECDIR=	${PREFIX}/libexec
57
LIBEXECDIR=	${PREFIX}/libexec
59
LOCALSTATEDIR=	/var/spool/courier
58
LOCALSTATEDIR=	/var/spool/courier
60
CACHEDIR=	/var/spool/webmail
59
CACHEDIR=	/var/spool/webmail
Lines 79-85 Link Here
79
		LDFLAGS='${LDFLAGS}'
78
		LDFLAGS='${LDFLAGS}'
80
MAKE_ENV:=	${CONFIGURE_ENV}
79
MAKE_ENV:=	${CONFIGURE_ENV}
81
80
82
CONFIGURE_ARGS=	--disable-root-check --with-db=db \
81
CONFIGURE_ARGS=	--disable-root-check \
82
		--with-db=db \
83
		--enable-syslog=1 --enable-use-flock \
83
		--enable-syslog=1 --enable-use-flock \
84
		--program-transform-name=s,^,, \
84
		--program-transform-name=s,^,, \
85
		--enable-utf7-folder-encoding \
85
		--enable-utf7-folder-encoding \
Lines 90-96 Link Here
90
		--with-mailgid=${MAILGID} \
90
		--with-mailgid=${MAILGID} \
91
		--with-etcdir=${ETCDIR} \
91
		--with-etcdir=${ETCDIR} \
92
		--sysconfdir=${SYSCONFDIR} \
92
		--sysconfdir=${SYSCONFDIR} \
93
		--with-userdb=${USERDB} \
94
		--datadir=${DATADIR} \
93
		--datadir=${DATADIR} \
95
		--libexecdir=${LIBEXECDIR} \
94
		--libexecdir=${LIBEXECDIR} \
96
		--localstatedir=${LOCALSTATEDIR} \
95
		--localstatedir=${LOCALSTATEDIR} \
Lines 175-180 Link Here
175
OPTIONS+=off
174
OPTIONS+=off
176
.endif
175
.endif
177
176
177
OPTIONS+=MAILDROPFLAGS "maildrop set flags patch"
178
.if defined(WITH_MAILDROPFLAGS)
179
OPTIONS+=on
180
.else
181
OPTIONS+=off
182
.endif
183
184
OPTIONS+=WEBMAILXFACE "experimental webmail X-Face patch"
185
.if defined(WITH_WEBMAILXFACE)
186
OPTIONS+=on
187
.else
188
OPTIONS+=off
189
.endif
190
191
OPTIONS+=WEBMAILRSENT "enable Autorename Sent folder"
192
.if !defined(WITHOUT_WEBMAILRSENT)
193
OPTIONS+=on
194
.else
195
OPTIONS+=off
196
.endif
197
178
.include <bsd.port.pre.mk>
198
.include <bsd.port.pre.mk>
179
.include "${.CURDIR}/Makefile.doc"
199
.include "${.CURDIR}/Makefile.doc"
180
.include "${.CURDIR}/Makefile.man"
200
.include "${.CURDIR}/Makefile.man"
Lines 258-263 Link Here
258
CONFIGURE_ARGS+=--without-ipv6
278
CONFIGURE_ARGS+=--without-ipv6
259
.endif
279
.endif
260
280
281
.if defined(WITH_MAILDROPFLAGS) || !defined(WITHOUT_MAILDROPFLAGS)
282
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-maildrop__maildir.C
283
.endif
284
285
.if defined(WITH_WEBMAILXFACE) || !defined(WITHOUT_WEBMAILXFACE)
286
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-webmail__msg2html.c
287
.endif
288
289
.if defined(WITH_WEBMAILRSENT) || !defined(WITHOUT_WEBMAILRSENT)
290
CONFIGURE_ARGS+=--enable-autorenamesent
291
.else
292
CONFIGURE_ARGS+=--disable-autorenamesent
293
.endif
294
261
pre-everything::
295
pre-everything::
262
	@${ECHO_MSG} "===> --------------------------------------------------------"
296
	@${ECHO_MSG} "===> --------------------------------------------------------"
263
	@${ECHO_MSG} "===>	Run 'make config' to (re)configure ${PKGNAME}"
297
	@${ECHO_MSG} "===>	Run 'make config' to (re)configure ${PKGNAME}"
(-)courier/Makefile.man (+1 lines)
Lines 49-54 Link Here
49
	mkimapdcert.8 \
49
	mkimapdcert.8 \
50
	mkpop3dcert.8 \
50
	mkpop3dcert.8 \
51
	pop3d.8 \
51
	pop3d.8 \
52
	pop3d.8-ssl \
52
	submit.8
53
	submit.8
53
54
54
MLINKS=	dot-forward.1 dotforward.1 \
55
MLINKS=	dot-forward.1 dotforward.1 \
(-)courier/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (courier-0.60.0.tar.bz2) = 688d4b44c0d7438c5c47c0a65835846d
1
MD5 (courier-0.61.1.tar.bz2) = a0feca15632f376401d865765ff172e3
2
SHA256 (courier-0.60.0.tar.bz2) = c13da0a0b76c4a59aa219d037129b8305293d1091143027f2dfd631b9e470e64
2
SHA256 (courier-0.61.1.tar.bz2) = 979ff8342f53478c8f14cb79290d1a795433375c8ad18fc5aa950595a9973c90
3
SIZE (courier-0.60.0.tar.bz2) = 7067430
3
SIZE (courier-0.61.1.tar.bz2) = 7229642
(-)courier/files/extra-patch-maildrop__maildir.C (+33 lines)
Line 0 Link Here
1
--- maildrop/maildir.C.orig	Thu Jan 15 04:12:13 2004
2
+++ maildrop/maildir.C	Thu Jul  5 00:09:38 2007
3
@@ -137,7 +137,6 @@
4
 			tmpname=createInfo.tmpname;
5
 			newname=createInfo.newname;
6
 			tmpname += '\0';
7
-			newname += '\0';
8
 			maildir_tmpcreate_free(&createInfo);
9
 
10
 			file.fd(f);
11
@@ -181,6 +180,22 @@
12
 {
13
 	if (is_open)
14
 	{
15
+		Buffer b;
16
+
17
+		b="MFLAGS";
18
+
19
+		const char *f=GetVarStr(b);
20
+
21
+		if (f && strlen(f) > 0)
22
+		{
23
+			newname += ':';
24
+			newname += '2';
25
+			newname += ',';
26
+			newname += f;
27
+		}
28
+
29
+		newname += '\0';
30
+
31
 		Buffer keywords;
32
 
33
 		keywords="KEYWORDS";
(-)courier/files/extra-patch-webmail__msg2html.c (+44 lines)
Line 0 Link Here
1
--- webmail/msg2html.c.orig	2007-07-11 03:36:04.000000000 +0200
2
+++ webmail/msg2html.c	2007-12-21 08:42:02.000000000 +0100
3
@@ -451,6 +451,7 @@
4
 char	*header, *value;
5
 char	*save_subject=0;
6
 char	*save_date=0;
7
+char	*save_xface=0;
8
 off_t	start_pos, end_pos, start_body;
9
 struct	rfc2045id *p, newpart;
10
 off_t	dummy;
11
@@ -523,6 +524,13 @@
12
 			free(header);
13
 			continue;
14
 		}
15
+		if (strcmp(header, "x-face") == 0)
16
+		{
17
+			if (save_xface)	free(save_xface);
18
+			save_xface=strdup(value);
19
+			free(header);
20
+			continue;
21
+		}
22
 		if (isaddressheader(header))
23
 		{
24
 			print_header_uc(info, header);
25
@@ -575,7 +583,18 @@
26
 	if (flag && info->message_rfc822_action)
27
 		(*info->message_rfc822_action)(idptr);
28
 
29
-	printf("</table>\n<hr width=\"100%%\" />\n");
30
+	if (save_xface)
31
+	{
32
+		char *q=cgiurlencode(save_xface);
33
+		printf("</table>\n</td><td align=\"right\"><img width=\"48\" heigth=\"48\" src=\"http://www.dairiki.org/xface/xface.php?xface=");
34
+	        printf("%s", q);
35
+		printf("&amp;preview=1\"></td></tr><tr><td colspan=\"2\"><hr width=\"100%%\">\n");
36
+	        free(q);
37
+	}
38
+	else
39
+	{
40
+		printf("</table>\n<hr width=\"100%%\" />\n");
41
+	}
42
 
43
 	if (!flag && info->gpgdir && libmail_gpg_has_gpg(info->gpgdir) == 0
44
 	    && libmail_gpgmime_has_mimegpg(rfc)

Return to bug 132228