From martti@morse.home.net  Sun Nov 12 08:25:58 2000
Return-Path: <martti@morse.home.net>
Received: from morse.home.net (ppp75.piuha.net [195.165.196.75])
	by hub.freebsd.org (Postfix) with ESMTP id 5EB1537B479
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 12 Nov 2000 08:25:53 -0800 (PST)
Received: (from martti@localhost)
	by morse.home.net (8.11.1/8.11.1) id eACGQGA21860;
	Sun, 12 Nov 2000 18:26:16 +0200 (EET)
	(envelope-from martti)
Message-Id: <200011121626.eACGQGA21860@morse.home.net>
Date: Sun, 12 Nov 2000 18:26:16 +0200 (EET)
From: martti.kuparinen@piuha.net
Sender: martti@morse.home.net
Reply-To: martti.kuparinen@piuha.net
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] ports/mail/cyrus update
X-Send-Pr-Version: 3.2

>Number:         22791
>Category:       ports
>Synopsis:       [PATCH] ports/mail/cyrus update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 12 08:30:01 PST 2000
>Closed-Date:    Thu Dec 21 00:28:45 PST 2000
>Last-Modified:  Thu Dec 21 00:28:56 PST 2000
>Originator:     Martti Kuparinen
>Release:        FreeBSD 4.2-BETA i386
>Organization:
piuha.net
>Environment:

	

>Description:

Update the Cyrus package to the latest stable version (1.6.22 -> 1.6.24).
This release contains numerous minor bugfixes...

Please close ports/20749 !!!

>How-To-Repeat:

	

>Fix:

diff -urN /usr/ports/mail/cyrus/Makefile cyrus/Makefile
--- /usr/ports/mail/cyrus/Makefile	Mon Oct  9 19:12:05 2000
+++ cyrus/Makefile	Sun Nov 12 15:53:17 2000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus
-PORTVERSION= 	1.6.22
+PORTVERSION= 	1.6.24
 CATEGORIES=	mail tcl82
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		${MASTER_SITE_LOCAL} \
diff -urN /usr/ports/mail/cyrus/distinfo cyrus/distinfo
--- /usr/ports/mail/cyrus/distinfo	Sat May 13 20:18:14 2000
+++ cyrus/distinfo	Sun Nov 12 15:57:05 2000
@@ -1 +1 @@
-MD5 (cyrus-imapd-1.6.22.tar.gz) = 1a0b4d466c8662a60313a0bb51a65ea2
+MD5 (cyrus-imapd-1.6.24.tar.gz) = 490a246e787581e0bbc558788ff5f562
diff -urN /usr/ports/mail/cyrus/files/patch-ca cyrus/files/patch-ca
--- /usr/ports/mail/cyrus/files/patch-ca	Thu Jan  1 02:00:00 1970
+++ cyrus/files/patch-ca	Sun Nov 12 18:00:49 2000
@@ -0,0 +1,10 @@
+--- sieve/comparator.h.orig	Sun Nov 12 18:00:13 2000
++++ sieve/comparator.h	Sun Nov 12 18:00:19 2000
+@@ -31,6 +31,7 @@
+ #ifdef HAVE_RX
+ #include <rxposix.h>
+ #else
++#include <sys/types.h>
+ #include <regex.h>
+ #endif
+ #endif

>Release-Note:
>Audit-Trail:

From: "Scot W. Hetzel" <hetzels@westbend.net>
To: <martti.kuparinen@piuha.net>, <FreeBSD-gnats-submit@FreeBSD.ORG>
Cc:  
Subject: Re: ports/22791: [PATCH] ports/mail/cyrus update
Date: Mon, 13 Nov 2000 13:59:51 -0600

 PR 22465 needs to be applied before this patch, as it removes a conflict
 between Cyrus-SASl and Cyrus-IMAPD for the /var/pwcheck directory.
 
 Should be no conflicts between PR 22791 and PR 22465.
 
 Scot
 
 
 
State-Changed-From-To: open->closed 
State-Changed-By: will 
State-Changed-When: Thu Dec 21 00:28:45 PST 2000 
State-Changed-Why:  
Committed, thanks. 

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