- Update to 0.53.2 and fix vulnerability -- CVE-2006-2659

PR:		ports/98878
Submitted by:	Milan Obuch <bsd@dino.sk>
Approved by:	maintainer timeout (17 days)
Security:	CVE-2006-2659

5 files changed, 33 insertions, 5 deletions

diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 7f2a2e420efe..8ce3ba11a521 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	courier
-PORTVERSION=	0.52.2
-PORTREVISION=	1
+PORTVERSION=	0.53.2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
diff --git a/mail/courier/Makefile.man b/mail/courier/Makefile.man
index 00a287eea226..f4cd921e08e7 100644
--- a/mail/courier/Makefile.man
+++ b/mail/courier/Makefile.man
@@ -29,6 +29,7 @@ MAN7=	\
 	maildropfilter.7 \
 	maildropgdbm.7
 MAN8=	\
+	aliaslookup.8 \
 	courier.8 \
 	courierfilter.8 \
 	courierldapaliasd.8 \
diff --git a/mail/courier/distinfo b/mail/courier/distinfo
index 21f2d1e81202..44c79feac666 100644
--- a/mail/courier/distinfo
+++ b/mail/courier/distinfo
@@ -1,3 +1,3 @@
-MD5 (courier-0.52.2.tar.bz2) = 73cda41adc5425ade94e1f9005b2218b
-SHA256 (courier-0.52.2.tar.bz2) = 7b717f22c9fe49e0042874d5615bdd7d4adc32659d0818eb7686de3004229beb
-SIZE (courier-0.52.2.tar.bz2) = 6611624
+MD5 (courier-0.53.2.tar.bz2) = 9ac1f892dcd2505a85d4e60edb61120c
+SHA256 (courier-0.53.2.tar.bz2) = 0b44e02652084ca4023646ca0cdd3d173dcbadf919e81aa012b42666b3acf726
+SIZE (courier-0.53.2.tar.bz2) = 6942557
diff --git a/mail/courier/files/patch-rfc2045_rfc2045reply.c b/mail/courier/files/patch-rfc2045_rfc2045reply.c
new file mode 100644
index 000000000000..3daa709ee032
--- /dev/null
+++ b/mail/courier/files/patch-rfc2045_rfc2045reply.c
@@ -0,0 +1,24 @@
+--- 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
diff --git a/mail/courier/pkg-plist b/mail/courier/pkg-plist
index 2635bfd1b5fe..c4de58cd41cf 100644
--- a/mail/courier/pkg-plist
+++ b/mail/courier/pkg-plist
@@ -169,6 +169,7 @@ libexec/filters/perlfilter
 @dirrm libexec/courier/webmail
 @dirrm libexec/courier
 @dirrm libexec/filters
+sbin/aliaslookup
 sbin/courier
 sbin/courieresmtpd
 sbin/courierfilter
@@ -533,6 +534,7 @@ share/courier/sqwebmail/html/en-us/keyimport.html
 share/courier/sqwebmail/html/en-us/ldaplist.html
 share/courier/sqwebmail/html/en-us/ldapsearch.html
 share/courier/sqwebmail/html/en-us/login.html
+share/courier/sqwebmail/html/en-us/loginform.inc.html
 share/courier/sqwebmail/html/en-us/navbar.inc.html
 share/courier/sqwebmail/html/en-us/navbar2.inc.html
 share/courier/sqwebmail/html/en-us/navbar3.inc.html
@@ -545,6 +547,7 @@ share/courier/sqwebmail/html/en-us/printredirect.html
 share/courier/sqwebmail/html/en-us/quickadd.html
 share/courier/sqwebmail/html/en-us/readmsg.html
 share/courier/sqwebmail/html/en-us/redirect.html
+share/courier/sqwebmail/html/en-us/refreshfr.html
 share/courier/sqwebmail/html/en-us/smileys.txt
 share/courier/sqwebmail/html/en-us/spellchk.html
 share/courier/sqwebmail/html/en
@@ -635,6 +638,7 @@ share/courier/sqwebmail/webgpg
 %%PORTDOCS%%%%DOCSDIR%%/html/README.sharedfolders.html
 %%PORTDOCS%%%%DOCSDIR%%/html/SECURITY.webmail.html
 %%PORTDOCS%%%%DOCSDIR%%/html/aliases.html
+%%PORTDOCS%%%%DOCSDIR%%/html/aliaslookup.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bg.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/cancelmsg.html
 %%PORTDOCS%%%%DOCSDIR%%/html/changelog.html