Update to 2.5.0 plus a patch from upstream to prevent a segfault

2010-07-08 16:35:58 +00:00 · 2010-07-08 16:35:58 +00:00 · 12a331b551
commit 12a331b551
parent 88b336cb63
6 changed files with 46 additions and 88 deletions
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.32 2010/04/21 07:23:58 giovanni Exp $
+# $OpenBSD: Makefile,v 1.33 2010/07/08 16:35:58 giovanni Exp $

 COMMENT-main=		mail delivery agent with filtering abilities
 COMMENT-utils=		quota tools for the Courier mail suite

-V=			2.4.3
+V=			2.5.0
 DISTNAME=		maildrop-$V
 PKGNAME-main=		maildrop-$V
 FULLPKGNAME-utils=	courier-utils-$V
@ -73,10 +73,16 @@ CONFIGURE_ARGS+=	--enable-trusted-users="root _courier"
 CONFIGURE_ARGS+=	--enable-trusted-groups="wheel _courier"
 .endif

+MODULES=		converters/libiconv \
+			devel/gettext
+
+LIB_DEPENDS=		idn::devel/libidn
+
 WANTLIB-utils=		c

 WANTLIB-main=		c gdbm m stdc++
-LIB_DEPENDS-main=	gdbm.>=3::databases/gdbm \
+LIB_DEPENDS-main=	${LIB_DEPENDS} \
+			gdbm.>=3::databases/gdbm \
 			pcre.>=1::devel/pcre \
 			courierauth::mail/courier-authlib

--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@ -1,5 +1,5 @@
-MD5 (maildrop-2.4.3.tar.bz2) = FbdSi6Xnq3bmdllq9rzRyQ==
-RMD160 (maildrop-2.4.3.tar.bz2) = yq6QJ3XG+zRw09nrpwsiDVCtF+g=
-SHA1 (maildrop-2.4.3.tar.bz2) = F71ZoCwdHuqyq0lpKGqP5atNORQ=
-SHA256 (maildrop-2.4.3.tar.bz2) = tPVPX/ZZvwnhlxQdpdGQlwkbxLBfsZp/c9HLuZau0xA=
-SIZE (maildrop-2.4.3.tar.bz2) = 2413480
+MD5 (maildrop-2.5.0.tar.bz2) = 792aEySqDFtCenfTBe1eyw==
+RMD160 (maildrop-2.5.0.tar.bz2) = rXiAus5ubmE12bwlrsc5fXrJaDc=
+SHA1 (maildrop-2.5.0.tar.bz2) = 4JJV3sF515blWvAIqKU2R5rsVaw=
+SHA256 (maildrop-2.5.0.tar.bz2) = SaNaKb9XuF4YV3yMJwVQrkP1p3LdI00/OzVkuIxO9K0=
+SIZE (maildrop-2.5.0.tar.bz2) = 2413245
--- a/mail/maildrop/patches/patch-maildrop_configure
+++ b/mail/maildrop/patches/patch-maildrop_configure
@ -1,12 +1,12 @@
-$OpenBSD: patch-maildrop_configure,v 1.4 2010/04/21 07:23:58 giovanni Exp $
--- maildrop/configure.orig	Fri Dec 25 23:14:47 2009
-+++ maildrop/configure	Mon Jan 11 17:06:04 2010
-@@ -19265,15 +19265,12 @@ fi
+$OpenBSD: patch-maildrop_configure,v 1.5 2010/07/08 16:35:58 giovanni Exp $
+--- maildrop/configure.orig	Sun May 30 23:36:43 2010
+++ maildrop/configure	Fri Jun 25 09:17:14 2010
+@@ -16697,16 +16697,12 @@ fi
 $as_echo "$maildrop_cv_SYS_INSTALL_RESET_GID" >&6; }
 
 # Check whether --with-default-maildrop was given.
-if test "${with_default_maildrop+set}" = set; then
-+if false; then
+-if test "${with_default_maildrop+set}" = set; then :
+if false; then :
   withval=$with_default_maildrop; maildrop_cv_SYS_INSTALL_MBOXDIR="$withval"
 else
   # Courier defaults to ./Maildir
@ -15,7 +15,8 @@ $OpenBSD: patch-maildrop_configure,v 1.4 2010/04/21 07:23:58 giovanni Exp $
 -	then
 -		maildrop_cv_SYS_INSTALL_MBOXDIR=./Maildir
 -	fi
+-
 +	maildrop_cv_SYS_INSTALL_MBOXDIR=./Maildir
- 
 fi
 
+ 
--- a/mail/maildrop/patches/patch-maildrop_maildrop_1_in
+++ b/mail/maildrop/patches/patch-maildrop_maildrop_1_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-maildrop_maildrop_1_in,v 1.4 2010/04/21 07:23:58 giovanni Exp $
--- maildrop/maildrop.1.in.orig	Sat Sep  5 23:44:19 2009
-+++ maildrop/maildrop.1.in	Mon Jan 11 17:06:04 2010
-@@ -192,7 +192,7 @@ is not owned by the user, or if it has any group or wo
- \fBmaildrop\fR
- is heavily optimized and tries to use as little resources as possible\&.
- \fBmaildrop\fR
-reads smalle messages into memory, then filters and/or delivers the message directly from memory\&. For larger messages,
-+reads smaller messages into memory, then filters and/or delivers the message directly from memory\&. For larger messages,
- \fBmaildrop\fR
- accesses the message directly from the file\&. If the standard input is not a file,
- \fBmaildrop\fR
--- a/mail/maildrop/patches/patch-rfc2045_reformime_1
+++ b/mail/maildrop/patches/patch-rfc2045_reformime_1
@ -1,52 +1,6 @@
-$OpenBSD: patch-rfc2045_reformime_1,v 1.1 2010/04/21 07:23:59 giovanni Exp $
--- rfc2045/reformime.1.orig	Tue Mar 30 12:58:02 2010
-+++ rfc2045/reformime.1	Tue Mar 30 12:59:02 2010
-@@ -1,26 +1,26 @@
-.\"  <!-- $Id: patch-rfc2045_reformime_1,v 1.1 2010/04/21 07:23:59 giovanni Exp $ -->
-.\"  <!-- Copyright 1998 - 2009 Double Precision, Inc.  See COPYING for -->
-.\"  <!-- distribution information. -->
-+ \"  <!-- $Id: patch-rfc2045_reformime_1,v 1.1 2010/04/21 07:23:59 giovanni Exp $ -->
-+ \"  <!-- Copyright 1998 - 2009 Double Precision, Inc.  See COPYING for -->
-+ \"  <!-- distribution information. -->
- '\" t
-.\"     Title: reformime
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 02/19/2010
-.\"    Manual: Double Precision, Inc.
-.\"    Source: Double Precision, Inc.
-.\"  Language: English
-.\"
-+ \"     Title: reformime
-+ \"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-+ \" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+ \"      Date: 02/19/2010
-+ \"    Manual: Double Precision, Inc.
-+ \"    Source: Double Precision, Inc.
-+ \"  Language: English
-+ \"
- .TH "REFORMIME" "1" "02/19/2010" "Double Precision, Inc." "Double Precision, Inc."
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-+ \" -----------------------------------------------------------------
-+ \" * set default formatting
-+ \" -----------------------------------------------------------------
-+ \" disable hyphenation
- .nh
-.\" disable justification (adjust text to left margin only)
-+ \" disable justification (adjust text to left margin only)
- .ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-+ \" -----------------------------------------------------------------
-+ \" * MAIN CONTENT STARTS HERE *
-+ \" -----------------------------------------------------------------
- .SH "NAME"
- reformime \- MIME E\-mail reformatting tool
- .SH "SYNOPSIS"
+$OpenBSD: patch-rfc2045_reformime_1,v 1.2 2010/07/08 16:35:58 giovanni Exp $
+--- rfc2045/reformime.1.orig	Sat May  1 17:34:46 2010
+++ rfc2045/reformime.1	Fri Jun 25 09:15:40 2010
@@ -35,7 +35,7 @@ is a utility for reformatting MIME messages\&.
 Generally,
 \fBreformime\fR
@ -74,7 +28,7 @@ $OpenBSD: patch-rfc2045_reformime_1,v 1.1 2010/04/21 07:23:59 giovanni Exp $
 MIME headers\&.
 .RE
 .PP
-@@ -400,11 +400,11 @@ is a structured header with RFC 2822 addresses\&.
+@@ -411,11 +411,11 @@ options\&.
 .SH "SEE ALSO"
 .PP
 
--- a/mail/maildrop/patches/patch-rfc822_rfc822_c
+++ b/mail/maildrop/patches/patch-rfc822_rfc822_c
@ -1,14 +1,23 @@
-$OpenBSD: patch-rfc822_rfc822_c,v 1.1 2010/04/21 07:23:59 giovanni Exp $
--- rfc822/rfc822.c.orig	Fri Mar  5 19:39:55 2010
-+++ rfc822/rfc822.c	Fri Mar  5 19:40:25 2010
-@@ -631,8 +631,8 @@ static int rfc822_print_common_nameaddr(const struct r
+$OpenBSD: patch-rfc822_rfc822_c,v 1.2 2010/07/08 16:35:58 giovanni Exp $
+--- rfc822/rfc822.c.orig	Mon Nov 23 04:27:19 2009
+++ rfc822/rfc822.c	Tue Jun 29 15:15:32 2010
+@@ -627,6 +627,9 @@ static int rfc822_print_common_nameaddr(const struct r
+ 	p=(*decode_func)(addrbuf, chset, 1);
+ 	free(addrbuf);
+ 
+	if (!p)
+		return -1;
+
+ 	if (print_braces)
 		(*print_func)(' ', ptr);
 
+@@ -640,9 +643,6 @@ static int rfc822_print_common_nameaddr(const struct r
 
-	for (q=p; *q; ++q)
-		if (*q != '.' && *q != '@' && strchr(RFC822_SPECIALS, *q))
-+	for (q=p; (void *)q; ++q)
-+		if ((void *)q != '.' && (void *)q != '@' && strchr(RFC822_SPECIALS, *q))
- 		{
- 			print_braces=1;
- 			break;
+ 	if (print_braces)
+ 		(*print_func)('<', ptr);
+-
+-	if (!p)
+-		return -1;
+ 
+ 	for (addrbuf=p; *p; p++)
+ 		(*print_func)(*p, ptr);