From nobody@FreeBSD.org  Fri Jul 24 22:07:18 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 26CB01065672
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 24 Jul 2009 22:07:18 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 147C28FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 24 Jul 2009 22:07:18 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n6OM7HIM058805
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 24 Jul 2009 22:07:17 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n6OM7Hpb058804;
	Fri, 24 Jul 2009 22:07:17 GMT
	(envelope-from nobody)
Message-Id: <200907242207.n6OM7Hpb058804@www.freebsd.org>
Date: Fri, 24 Jul 2009 22:07:17 GMT
From: Milan Obuch <bsd@dino.sk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [mail/courier] update to 0.62
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         137112
>Category:       ports
>Synopsis:       [mail/courier] update to 0.62
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 24 22:10:01 UTC 2009
>Closed-Date:    Sat Aug 08 11:18:55 UTC 2009
>Last-Modified:  Sat Aug  8 11:20:01 UTC 2009
>Originator:     Milan Obuch
>Release:        6.4, 7.2, 8.0
>Organization:
>Environment:
>Description:
Update to new version
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN courier/Makefile courier-0.62.0/Makefile
--- courier/Makefile	2009-03-07 17:08:32.000000000 +0100
+++ courier-0.62.0/Makefile	2009-06-04 09:51:07.000000000 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier
-PORTVERSION=	0.61.1
+PORTVERSION=	0.62.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -181,6 +181,13 @@
 OPTIONS+=off
 .endif
 
+OPTIONS+=WEBMAILFLAGS "webmail show flags patch"
+.if defined(WITH_WEBMAILFLAGS)
+OPTIONS+=on
+.else
+OPTIONS+=off
+.endif
+
 OPTIONS+=WEBMAILXFACE "experimental webmail X-Face patch"
 .if defined(WITH_WEBMAILXFACE)
 OPTIONS+=on
@@ -195,6 +202,20 @@
 OPTIONS+=off
 .endif
 
+OPTIONS+=SYSTEMALIASES "symlink system /etc/aliases"
+.if !defined(WITHOUT_SYSTEMALIASES)
+OPTIONS+=on
+.else
+OPTIONS+=off
+.endif
+
+OPTIONS+=EMPTYALIASES "create empty aliases file"
+.if defined(WITH_EMPTYALIASES)
+OPTIONS+=on
+.else
+OPTIONS+=off
+.endif
+
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/Makefile.doc"
 .include "${.CURDIR}/Makefile.man"
@@ -213,6 +234,22 @@
 SUB_LIST+=	WITHLDAP="@comment "
 .endif
 
+.if defined(WITH_SYSTEMALIASES) && !defined(WITHOUT_SYSTEMALIASES)
+PLIST_SUB+=	WITHSYSTEMALIASES=""
+SUB_LIST+=	WITHSYSTEMALIASES=""
+.else
+PLIST_SUB+=	WITHSYSTEMALIASES="@comment "
+SUB_LIST+=	WITHSYSTEMALIASES="@comment "
+.endif
+
+.if defined(WITH_EMPTYALIASES) && !defined(WITHOUT_EMPTYALIASES)
+PLIST_SUB+=	WITHEMPTYALIASES=""
+SUB_LIST+=	WITHEMPTYALIASES=""
+.else
+PLIST_SUB+=	WITHEMPTYALIASES="@comment "
+SUB_LIST+=	WITHEMPTYALIASES="@comment "
+.endif
+
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
 .endif
@@ -286,6 +323,11 @@
 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-webmail__msg2html.c
 .endif
 
+.if defined(WITH_WEBMAILFLAGS) || !defined(WITHOUT_WEBMAILFLAGS)
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-webmail__folder.c ${FILESDIR}/extra-patch-webmail__maildir.c
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-webmail__maildir.h ${FILESDIR}/extra-patch-webmail__images__sqwebmail.css
+.endif
+
 .if defined(WITH_WEBMAILRSENT) || !defined(WITHOUT_WEBMAILRSENT)
 CONFIGURE_ARGS+=--enable-autorenamesent
 .else
diff -urN courier/Makefile.man courier-0.62.0/Makefile.man
--- courier/Makefile.man	2009-03-07 17:08:32.000000000 +0100
+++ courier-0.62.0/Makefile.man	2009-06-04 10:13:00.000000000 +0200
@@ -62,11 +62,11 @@
 .if defined(WITH_LDAP) && !defined(WITHOUT_LDAP)
 #MAN8+=	courierldapaliasd.8
 .endif
-	
+
 .if defined(WITH_SENDFAX) && !defined(WITHOUT_SENDFAX)
 MAN8+=	courierfax.8
 .endif
-	
+
 .if defined(WITH_UUCP) && !defined(WITHOUT_UUCP)
 MAN8+=	courieruucp.8
 MLINKS+=courieruucp.8 makeuucpneighbors.8
diff -urN courier/Makefile.own courier-0.62.0/Makefile.own
--- courier/Makefile.own	2008-12-19 13:42:03.000000000 +0100
+++ courier-0.62.0/Makefile.own	2009-06-04 10:13:55.000000000 +0200
@@ -58,7 +58,10 @@
 	libexec/filters/dupfilter \
 	libexec/filters/perlfilter \
 	sbin/courier \
-	sbin/courierldapaliasd \
 	sbin/couriertcpd \
 	sbin/showconfig \
 	sbin/webmaild
+
+.if defined(WITH_LDAP) && !defined(WITHOUT_LDAP)
+OWNER0+=sbin/courierldapaliasd
+.endif
diff -urN courier/distinfo courier-0.62.0/distinfo
--- courier/distinfo	2009-03-07 17:08:32.000000000 +0100
+++ courier-0.62.0/distinfo	2009-05-13 14:55:10.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (courier-0.61.1.tar.bz2) = a0feca15632f376401d865765ff172e3
-SHA256 (courier-0.61.1.tar.bz2) = 979ff8342f53478c8f14cb79290d1a795433375c8ad18fc5aa950595a9973c90
-SIZE (courier-0.61.1.tar.bz2) = 7229642
+MD5 (courier-0.62.0.tar.bz2) = 2b7acca41c778c241ed08f3ea633d8ea
+SHA256 (courier-0.62.0.tar.bz2) = af826d6759be544127bcee95e4812649defdb4d4ff55193955b2c5d911d8e755
+SIZE (courier-0.62.0.tar.bz2) = 7314085
diff -urN courier/files/courier.sh.in courier-0.62.0/files/courier.sh.in
--- courier/files/courier.sh.in	2009-07-24 23:57:46.000000000 +0200
+++ courier-0.62.0/files/courier.sh.in	2008-12-19 13:42:03.000000000 +0100
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/mail/courier/files/courier.sh.in,v 1.4 2009/07/15 16:55:45 dougb Exp $
+# $FreeBSD: ports/mail/courier/files/courier.sh.in,v 1.3 2008/12/19 12:42:03 stefan Exp $
 #
 # Adapted for FreeBSD from courier.sysvinit
 #
@@ -11,6 +11,10 @@
 # REQUIRE: LOGIN courier_authdaemond
 # BEFORE:  securelevel
 # KEYWORD: shutdown
+#
+# NOTE for FreeBSD 5.0+:
+# If you want this script to start with the base rc scripts
+# move courier.sh to /etc/rc.d/courier
 
 prefix="%%PREFIX%%"
 exec_prefix="${prefix}"
diff -urN courier/files/pkg-install.in courier-0.62.0/files/pkg-install.in
--- courier/files/pkg-install.in	2009-01-05 22:05:45.000000000 +0100
+++ courier-0.62.0/files/pkg-install.in	2009-06-03 15:03:25.000000000 +0200
@@ -39,7 +39,7 @@
 
 replace() {
     local orig repl
-    
+
     orig=$1
     repl=$2
     if [ -e ${orig} ]; then
diff -urN courier/files/pkg-message.in courier-0.62.0/files/pkg-message.in
--- courier/files/pkg-message.in	2006-02-14 13:00:05.000000000 +0100
+++ courier-0.62.0/files/pkg-message.in	2009-06-03 15:04:08.000000000 +0200
@@ -23,15 +23,15 @@
 	To enable Courier-MTA to start at boot time,
 	set these variables in your /etc/rc.conf file:
 
-		courier_enable="YES"                                
-		sendmail_enable="NONE"                                
+		courier_enable="YES"
+		sendmail_enable="NONE"
 
 	Also, you will want to disable some Sendmail 
 	specific daily maintenance routines in your
 	/etc/periodic.conf file:
 
 		daily_clean_hoststat_enable="NO"
-		daily_status_mail_rejects_enable="NO"                                      
+		daily_status_mail_rejects_enable="NO"
 		daily_status_include_submit_mailq="NO"
 		daily_submit_queuerun="NO"
 
diff -urN courier/pkg-descr courier-0.62.0/pkg-descr
--- courier/pkg-descr	2004-01-15 16:12:32.000000000 +0100
+++ courier-0.62.0/pkg-descr	2009-06-03 15:02:23.000000000 +0200
@@ -1,7 +1,7 @@
 Courier is a modular multiprotocol mail server that's designed to
 strike a balance between reasonable performance, flexibility and
 features:
-   
+
  * Can be configured to function as an intermediate mail relay, or
    as a mail server that receives mail for one or more domains, or
    anything in between.
diff -urN courier/pkg-plist courier-0.62.0/pkg-plist
--- courier/pkg-plist	2008-12-19 13:42:03.000000000 +0100
+++ courier-0.62.0/pkg-plist	2009-06-04 13:59:53.000000000 +0200
@@ -63,7 +63,7 @@
 bin/testmxlookup
 bin/webmlmd
 bin/webmlmd.rc
-etc/courier/aliases/system
+@comment etc/courier/aliases/system
 etc/courier/courierd.dist
 etc/courier/crontab
 etc/courier/dsndelayed.txt
@@ -111,7 +111,8 @@
 etc/courier/sqwebmaild.dist
 etc/courier/webmail.authpam
 etc/courier/webmlmrc.dist
-@exec [ -e /etc/aliases ] && ln -sf /etc/aliases %D/etc/courier/aliases/system
+%%WITHSYSTEMALIASES%%@exec [ -e /etc/aliases ] && ln -sf /etc/aliases %D/etc/courier/aliases/system
+%%WITHEMPTYALIASES%%@exec true > %D/etc/courier/aliases/system
 @exec [ -f %D/etc/courier/courierd.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/courierd.dist
 @exec [ -f %D/etc/courier/esmtpd-msa.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/esmtpd-msa.dist
 @exec [ -f %D/etc/courier/esmtpd-ssl.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/esmtpd-ssl.dist
@@ -174,7 +175,7 @@
 @dirrm libexec/courier/modules
 @dirrm libexec/courier/webmail
 @dirrm libexec/courier
-@dirrm libexec/filters
+@dirrmtry libexec/filters
 sbin/aliaslookup
 sbin/courier
 sbin/courieresmtpd


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Sat Aug 8 08:07:39 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=137112 
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Sat Aug 8 11:18:54 UTC 2009 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=137112 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/137112: commit references a PR
Date: Sat,  8 Aug 2009 11:18:55 +0000 (UTC)

 rafan       2009-08-08 11:18:45 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/courier         Makefile Makefile.man Makefile.own 
                          distinfo pkg-descr pkg-plist 
     mail/courier/files   courier.sh.in pkg-install.in 
                          pkg-message.in 
   Log:
   - Update to 0.62
   
   PR:             ports/137112
   Submitted by:   Milan Obuch <bsd at dino.sk> (maintainer)
   
   Revision  Changes    Path
   1.51      +43 -1     ports/mail/courier/Makefile
   1.12      +2 -2      ports/mail/courier/Makefile.man
   1.7       +4 -1      ports/mail/courier/Makefile.own
   1.24      +3 -3      ports/mail/courier/distinfo
   1.5       +5 -1      ports/mail/courier/files/courier.sh.in
   1.3       +2 -2      ports/mail/courier/files/pkg-install.in
   1.3       +3 -3      ports/mail/courier/files/pkg-message.in
   1.4       +1 -1      ports/mail/courier/pkg-descr
   1.19      +4 -3      ports/mail/courier/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
