cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
giovanni 2010-07-08 16:29:58 +00:00
parent c695437ad9
commit 88b336cb63
7 changed files with 38 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mail/courier-imap/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.59 2010/04/21 07:18:25 giovanni Exp $
# $OpenBSD: Makefile,v 1.60 2010/07/08 16:29:58 giovanni Exp $
COMMENT-main= imap server for maildir format mailboxes
COMMENT-pop3= pop3 server for maildir format mailboxes
V= 4.7.0
V= 4.8.0
DISTNAME= courier-imap-${V}
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-pop3= courier-pop3-${V}
@ -33,7 +33,8 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CXXFLAGS="-I${LOCALBASE}/include" \
CPPFLAGS="-I${LOCALBASE}/include"
LIB_DEPENDS= courierauthsasl.>=0,courierauth.>=0::mail/courier-authlib
LIB_DEPENDS= courierauthsasl.>=0,courierauth.>=0::mail/courier-authlib \
idn::devel/libidn
COURIERSTATE= /var/run/courier
EXAMPLE_DIR= ${PREFIX}/share/examples/courier
@ -90,6 +91,8 @@ MULTI_PACKAGES= -main -pop3
LIB_DEPENDS-main= ${LIB_DEPENDS} \
gdbm.>=3::databases/gdbm
WANTLIB-main= ${WANTLIB} ssl crypto
MODULES= converters/libiconv \
devel/gettext
CNFFILES= etc/courier/imapd-ssl.dist etc/courier/imapd.dist \
etc/courier/pop3d-ssl.dist etc/courier/pop3d.dist \

10
mail/courier-imap/distinfo
View File

@ -1,5 +1,5 @@
MD5 (courier-imap-4.7.0.tar.bz2) = 5phIkOGuzzzGsJmhYZMk5g==
RMD160 (courier-imap-4.7.0.tar.bz2) = KrF2j7dxTP4pHtzADJbMJ2rxJ4I=
SHA1 (courier-imap-4.7.0.tar.bz2) = lynzrdhpJWOGXaUWfP6I8iJ8OWg=
SHA256 (courier-imap-4.7.0.tar.bz2) = oKms7ns2OZ0iZmrFruIsvF21KZagd5HgM78fe643C58=
SIZE (courier-imap-4.7.0.tar.bz2) = 3414328
MD5 (courier-imap-4.8.0.tar.bz2) = h8UB5l6uedZntRI99q6J8g==
RMD160 (courier-imap-4.8.0.tar.bz2) = z8C+7GiTwVXPlxLZIAAjIBaa0MU=
SHA1 (courier-imap-4.8.0.tar.bz2) = 9ojOqHxmGBNiYizpy9RxDXUmjPw=
SHA256 (courier-imap-4.8.0.tar.bz2) = 7HURpDmJIKBPO7YM8SCOKamlQyuu/001ak7BQhE7+/I=
SIZE (courier-imap-4.8.0.tar.bz2) = 3362734

21
mail/courier-imap/patches/patch-imap_courierpop3d_8_in
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-imap_courierpop3d_8_in,v 1.1 2010/04/21 07:18:25 giovanni Exp $
--- imap/courierpop3d.8.in.orig Fri Jan 8 20:00:30 2010
+++ imap/courierpop3d.8.in Fri Jan 8 20:01:00 2010
@@ -27,7 +27,6 @@
.de SH-xref
.ie n \{\
.\}
-.toupper \\$*
.el \{\
\\$*
.\}
@@ -56,9 +55,6 @@
.ft B
.ne (2v + 1u)
.ie n \{\
-.\" if n (TTY output), use uppercase
-.toupper \\$*
-.\}
.el \{\
.nr an-break-flag 0
.\" if not n (not TTY), use normal case (not uppercase)

21
mail/courier-imap/patches/patch-imap_imapd_8_in
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-imap_imapd_8_in,v 1.1 2010/04/21 07:18:25 giovanni Exp $
--- imap/imapd.8.in.orig Fri Jan 8 20:00:17 2010
+++ imap/imapd.8.in Fri Jan 8 20:00:46 2010
@@ -27,7 +27,6 @@
.de SH-xref
.ie n \{\
.\}
-.toupper \\$*
.el \{\
\\$*
.\}
@@ -56,9 +55,6 @@
.ft B
.ne (2v + 1u)
.ie n \{\
-.\" if n (TTY output), use uppercase
-.toupper \\$*
-.\}
.el \{\
.nr an-break-flag 0
.\" if not n (not TTY), use normal case (not uppercase)

21
mail/courier-imap/patches/patch-maildir_maildiracl_1_in
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-maildir_maildiracl_1_in,v 1.1 2010/04/21 07:18:25 giovanni Exp $
--- maildir/maildiracl.1.in.orig Fri Jan 8 19:57:10 2010
+++ maildir/maildiracl.1.in Fri Jan 8 19:59:39 2010
@@ -27,7 +27,6 @@
.de SH-xref
.ie n \{\
.\}
-.toupper \\$*
.el \{\
\\$*
.\}
@@ -56,9 +55,6 @@
.ft B
.ne (2v + 1u)
.ie n \{\
-.\" if n (TTY output), use uppercase
-.toupper \\$*
-.\}
.el \{\
.nr an-break-flag 0
.\" if not n (not TTY), use normal case (not uppercase)

21
mail/courier-imap/patches/patch-maildir_maildirmake_1_in
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-maildir_maildirmake_1_in,v 1.1 2010/04/21 07:18:25 giovanni Exp $
--- maildir/maildirmake.1.in.orig Fri Jan 8 19:57:25 2010
+++ maildir/maildirmake.1.in Fri Jan 8 19:59:58 2010
@@ -27,7 +27,6 @@
.de SH-xref
.ie n \{\
.\}
-.toupper \\$*
.el \{\
\\$*
.\}
@@ -56,9 +55,6 @@
.ft B
.ne (2v + 1u)
.ie n \{\
-.\" if n (TTY output), use uppercase
-.toupper \\$*
-.\}
.el \{\
.nr an-break-flag 0
.\" if not n (not TTY), use normal case (not uppercase)

27
mail/courier-imap/patches/patch-rfc822_rfc822_c Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-rfc822_rfc822_c,v 1.1 2010/07/08 16:29:58 giovanni Exp $
--- rfc822/rfc822.c.orig Sun Nov 22 22:22:24 2009
+++ rfc822/rfc822.c Tue Jun 29 13:19:53 2010
@@ -627,10 +627,12 @@ 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);
-
for (q=p; *q; ++q)
if (*q != '.' && *q != '@' && strchr(RFC822_SPECIALS, *q))
{
@@ -640,9 +642,6 @@ static int rfc822_print_common_nameaddr(const struct r
if (print_braces)
(*print_func)('<', ptr);
-
- if (!p)
- return -1;
for (addrbuf=p; *p; p++)
(*print_func)(*p, ptr);