Bugfix update to 4.11.0, a patch has been committed upstream

This commit is contained in:
giovanni 2012-10-18 08:06:27 +00:00
parent 6c2431a5fb
commit 4da68b33fb
6 changed files with 18 additions and 39 deletions

View File

@ -1,17 +1,14 @@
# $OpenBSD: Makefile,v 1.84 2012/04/28 11:06:12 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.85 2012/10/18 08:06:27 giovanni Exp $
COMMENT-main= imap server for maildir format mailboxes
COMMENT-pop3= pop3 server for maildir format mailboxes
V= 4.10.0
V= 4.11.0
DISTNAME= courier-imap-${V}
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-pop3= courier-pop3-${V}
FULLPKGPATH-pop3= mail/courier-imap,-pop3
REVISION-main= 3
REVISION-pop3= 2
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}

View File

@ -1,5 +1,2 @@
MD5 (courier-imap-4.10.0.tar.bz2) = L5XJm5rROAufOsczzNdBog==
RMD160 (courier-imap-4.10.0.tar.bz2) = THIeuCIal/E/weVSW8vLt7rt+B0=
SHA1 (courier-imap-4.10.0.tar.bz2) = UJsoAbNLc6uusjWHNHHmzJ0kIaQ=
SHA256 (courier-imap-4.10.0.tar.bz2) = jIlXlenuqoyPzH1djfROHc6EVji2NpjXgpcduEIpZhQ=
SIZE (courier-imap-4.10.0.tar.bz2) = 3155953
SHA256 (courier-imap-4.11.0.tar.bz2) = AHinGlQZtFSpqu4X1dSbazsRWjT9r9xti5ZtY1WueJM=
SIZE (courier-imap-4.11.0.tar.bz2) = 3190857

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.8 2012/01/23 09:14:15 giovanni Exp $
--- imap/imapd-ssl.dist.in.orig Wed Apr 13 18:39:29 2011
+++ imap/imapd-ssl.dist.in Wed Dec 14 12:05:23 2011
$OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.9 2012/10/18 08:06:27 giovanni Exp $
--- imap/imapd-ssl.dist.in.orig Fri Jun 22 14:24:14 2012
+++ imap/imapd-ssl.dist.in Sat Sep 22 11:48:04 2012
@@ -72,13 +72,13 @@ SSLLOGGEROPTS="-name=imapd-ssl"
#
# Whether or not to start IMAP over SSL on simap port:
@ -17,7 +17,7 @@ $OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.8 2012/01/23 09:14:15 giovanni Exp $
##NAME: IMAP_TLS_REQUIRED:1
#
@@ -319,8 +319,8 @@ TLS_VERIFYPEER=NONE
@@ -268,8 +268,8 @@ TLS_VERIFYPEER=NONE
# problems with SSL clients. Disable SSL caching by commenting out the
# following settings:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-imap_pop3d-ssl_dist_in,v 1.8 2012/01/23 09:14:15 giovanni Exp $
--- imap/pop3d-ssl.dist.in.orig Wed Apr 13 18:39:29 2011
+++ imap/pop3d-ssl.dist.in Wed Dec 14 12:05:23 2011
@@ -305,8 +305,8 @@ TLS_VERIFYPEER=NONE
$OpenBSD: patch-imap_pop3d-ssl_dist_in,v 1.9 2012/10/18 08:06:27 giovanni Exp $
--- imap/pop3d-ssl.dist.in.orig Fri Jun 22 14:24:14 2012
+++ imap/pop3d-ssl.dist.in Sat Sep 22 11:48:04 2012
@@ -253,8 +253,8 @@ TLS_VERIFYPEER=NONE
# problems with SSL clients. Disable SSL caching by commenting out the
# following settings:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-maildir_configure,v 1.3 2012/01/23 09:14:15 giovanni Exp $
--- maildir/configure.orig Sun Nov 13 03:06:53 2011
+++ maildir/configure Wed Dec 14 12:05:24 2011
@@ -16745,7 +16745,7 @@ if ${ac_cv_lib_fam_FAMOpen+:} false; then :
$OpenBSD: patch-maildir_configure,v 1.4 2012/10/18 08:06:27 giovanni Exp $
--- maildir/configure.orig Sun Jun 3 04:15:18 2012
+++ maildir/configure Sat Sep 22 11:48:05 2012
@@ -16802,7 +16802,7 @@ if ${ac_cv_lib_fam_FAMOpen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -10,7 +10,7 @@ $OpenBSD: patch-maildir_configure,v 1.3 2012/01/23 09:14:15 giovanni Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -16780,7 +16780,7 @@ if test "x$ac_cv_lib_fam_FAMOpen" = xyes; then :
@@ -16837,7 +16837,7 @@ if test "x$ac_cv_lib_fam_FAMOpen" = xyes; then :
LIBFAM=-lfam
cat >>confdefs.h <<_ACEOF
@ -19,7 +19,7 @@ $OpenBSD: patch-maildir_configure,v 1.3 2012/01/23 09:14:15 giovanni Exp $
_ACEOF
@@ -16810,7 +16810,6 @@ fi
@@ -16867,7 +16867,6 @@ fi

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-rfc1035_rfc1035mksocket_c,v 1.1 2012/01/23 09:14:15 giovanni Exp $
--- rfc1035/rfc1035mksocket.c.orig Wed Dec 14 17:29:16 2011
+++ rfc1035/rfc1035mksocket.c Wed Dec 14 17:30:54 2011
@@ -27,9 +27,8 @@ int rfc1035_mksocket(int sock_type, int sock_protocol,
{
#ifdef IPV6_V6ONLY
- if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
- (char *)&on, sizeof(on)) < 0)
- perror("setsockopt IPV6_V6ONLY");
+ (void)setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
+ (void *)&on, sizeof(on));
#endif
return (s);