From root@inch.com  Sun Jun 23 10:31:21 2002
Return-Path: <root@inch.com>
Received: from arutam.inch.com (ns.inch.com [216.223.192.21])
	by hub.freebsd.org (Postfix) with ESMTP id 981D037B404
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 23 Jun 2002 10:31:20 -0700 (PDT)
Received: from DellBSD.inch.com (DellBSD.inch.com [216.223.192.89])
	by arutam.inch.com (8.12.2/8.12.2/UTIL-INCH-3.0.6) with ESMTP id g5NHVJSb006290
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 23 Jun 2002 13:31:19 -0400 (EDT)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by localhost.inch.com (Postfix) with ESMTP id D5E8558B7
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 23 Jun 2002 13:31:11 -0400 (EDT)
Received: by DellBSD.inch.com (Postfix, from userid 0)
	id 2B54658B6; Sun, 23 Jun 2002 13:31:10 -0400 (EDT)
Message-Id: <20020623173110.2B54658B6@DellBSD.inch.com>
Date: Sun, 23 Jun 2002 13:31:10 -0400 (EDT)
From: Scott Lambert <lambert@lambertfam.org>
Reply-To: Scott Lambert <lambert@lambertfam.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update of courier-imap port.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         39717
>Category:       ports
>Synopsis:       update of courier-imap port.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    nbm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 23 10:40:01 PDT 2002
>Closed-Date:    Sun Aug 04 13:34:32 PDT 2002
>Last-Modified:  Sun Aug 04 13:34:32 PDT 2002
>Originator:     Scott Lambert
>Release:        FreeBSD 4.6-RELEASE i386
>Organization:
>Environment:
System: FreeBSD DellBSD.inch.com 4.6-RELEASE FreeBSD 4.6-RELEASE #8: Sat Jun 15 21:46:48 EDT 2002 root@DellBSD.inch.com:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	Update to the mail/courier-imap port.

        I've had this in the queue for some time and it seems someone   
        has already submitted an update to 1.4.6.                       

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

        I figure I'll go ahead and submit this as an option to the
        maintainer.  Ben Lovett <blovett@bsdguru.com> the originator of
        the other PR, caught some pkg-plist changes I had missed.  I've
        integrated his changes into my diffs.

        I made changes to the MYSQL portion of the Makefile to get mine
        to work.  I later found out my MySQL interoperablility problem
        was operator error, but I don't know if the MYSQL additional
        configure args were necessary.  I do not believe they could hurt
        anything, so they have been left in.

	I also added the install of authtest in ${PREFIX}/sbin.  It is
	a useful utility for testing authentication without having to
	go through pop3d or imapd.

	As the other PR says, files/patch-rfc822_parsedt.c is no longer
	required.

        I should make a patch to etc/authmysqlrc.dist to set the
        MYSQL_SOCKET to /tmp/mysql.sock, but I am supposed to be doing
        other things today.  If the maintainer would like to make that
        change, it would make me happy. :-)

>How-To-Repeat:
	
>Fix:

	apply this patch to ports/mail/courier-imap/ and remove 
	ports/mail/courier-imap/files/patch-rfc822_parsedt.c

--- courier-imap.diff begins here ---
diff -ur courier-imap/Makefile courier-imap-snap/Makefile
--- courier-imap/Makefile	Sat Jun 22 15:38:27 2002
+++ courier-imap-snap/Makefile	Tue Jun 18 18:31:51 2002
@@ -2,12 +2,12 @@
 # Date created:		19 Feb 2000
 # Whom:			Neil Blakey-Milner
 #
-# $FreeBSD: ports/mail/courier-imap/Makefile,v 1.31 2002/06/20 12:19:21 nectar Exp $
+# $FreeBSD: ports/mail/courier-imap/Makefile,v 1.30 2002/05/08 19:28:10 nbm Exp $
 #
 
 PORTNAME=	courier-imap
-PORTVERSION=	1.4.3
-PORTREVISION=	1
+PORTVERSION=	1.4.6.20020613
+PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -79,6 +79,8 @@
 PLIST_SUB+=	MYSQLFLAG="@comment "
 .else
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+CONFIGURE_ARGS+=	\
+		--with-authmysql
 PLIST_SUB+=	MYSQLFLAG=""
 .endif
 
@@ -126,6 +128,7 @@
 		${WRKSRC}/Makefile.in
 
 post-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/authlib/authtest ${PREFIX}/sbin/
 	@${MKDIR} ${PREFIX}/share/doc/courier-imap
 	@${INSTALL_DATA} ${WRKSRC}/imap/imapd.cnf ${PREFIX}/etc/courier-imap/imapd.cnf.dist
 	@${INSTALL_DATA} ${WRKSRC}/imap/pop3d.cnf ${PREFIX}/etc/courier-imap/pop3d.cnf.dist
diff -ur courier-imap/distinfo courier-imap-snap/distinfo
--- courier-imap/distinfo	Fri Mar 29 16:48:28 2002
+++ courier-imap-snap/distinfo	Thu Jun 13 15:52:25 2002
@@ -1 +1 @@
-MD5 (courier-imap-1.4.3.tar.gz) = 26aa7d71affa94fe9adcfb4f043ecd3d
+MD5 (courier-imap-1.4.6.20020613.tar.gz) = d94ca8f2723a9a789999d62240d16e79
Only in courier-imap/files: patch-rfc822_parsedt.c
diff -ur courier-imap/pkg-plist courier-imap-snap/pkg-plist
--- courier-imap/pkg-plist	Wed May  8 21:17:51 2002
+++ courier-imap-snap/pkg-plist	Sun Jun 23 13:09:34 2002
@@ -29,9 +29,16 @@
 libexec/courier-imap/makedatprog
 libexec/courier-imap/pop3d-ssl.rc
 libexec/courier-imap/pop3d.rc
+sbin/authtest
 sbin/imaplogin
 sbin/pop3login
 sbin/userdbpw
+sbin/mkimapdcert
+sbin/mkpop3dcert
+sbin/vchkpw2userdb
+sbin/makeuserdb
+sbin/pw2userdb
+sbin/userdb
 share/courier-imap/makeuserdb
 share/courier-imap/mkimapdcert
 share/courier-imap/mkpop3dcert
--- courier-imap.diff ends here ---




>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->nbm 
Responsible-Changed-By: ijliao 
Responsible-Changed-When: Sun Jun 23 21:35:30 PDT 2002 
Responsible-Changed-Why:  
over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39717 
State-Changed-From-To: open->closed 
State-Changed-By: nbm 
State-Changed-When: Sun Aug 4 13:33:32 PDT 2002 
State-Changed-Why:  
courier-imap now installs authtest binary, and has been upgraded. 
Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39717 
>Unformatted:
