Hi, here is an update to 4.10.0, I added a patch to disable a bogus
warning (IPV6_ONLY is not implemented on OpenBSD and setsockopt gives an
error).
ok ? Comments ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.78
diff -u -p -r1.78 Makefile
--- Makefile 2 Dec 2011 14:36:15 -0000 1.78
+++ Makefile 14 Dec 2011 16:43:08 -0000
@@ -3,14 +3,11 @@
COMMENT-main= imap server for maildir format mailboxes
COMMENT-pop3= pop3 server for maildir format mailboxes
-V= 4.9.3
+V= 4.10.0
DISTNAME= courier-imap-${V}
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-pop3= courier-pop3-${V}
FULLPKGPATH-pop3= mail/courier-imap,-pop3
-
-REVISION-main= 2
-REVISION-pop3= 1
CATEGORIES= mail
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/courier-imap/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 9 Jun 2011 13:10:23 -0000 1.15
+++ distinfo 14 Dec 2011 16:43:08 -0000
@@ -1,5 +1,5 @@
-MD5 (courier-imap-4.9.3.tar.bz2) = cD3bsJBWlDbb2mHQ1iseuA==
-RMD160 (courier-imap-4.9.3.tar.bz2) = qDeTzZgN9cGS51klQGDMOtFksR4=
-SHA1 (courier-imap-4.9.3.tar.bz2) = b0mZfISCR2FPJKKgS/ho7ip71AQ=
-SHA256 (courier-imap-4.9.3.tar.bz2) =
JzRLYkzqryLl8SubdiU+qs0zcjvjEIsQSqbSX0ZBGT4=
-SIZE (courier-imap-4.9.3.tar.bz2) = 3049553
+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
Index: patches/patch-imap_imapd-ssl_dist_in
===================================================================
RCS file: /cvs/ports/mail/courier-imap/patches/patch-imap_imapd-ssl_dist_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-imap_imapd-ssl_dist_in
--- patches/patch-imap_imapd-ssl_dist_in 9 May 2011 09:30:26 -0000
1.7
+++ patches/patch-imap_imapd-ssl_dist_in 14 Dec 2011 16:43:08 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.7 2011/05/09 09:30:26 giovanni Exp $
---- imap/imapd-ssl.dist.in.orig Mon Apr 4 17:02:32 2011
-+++ imap/imapd-ssl.dist.in Wed Apr 13 15:53:46 2011
+--- 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
@@ -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
##NAME: IMAP_TLS_REQUIRED:1
#
-@@ -322,8 +322,8 @@ TLS_VERIFYPEER=NONE
+@@ -319,8 +319,8 @@ TLS_VERIFYPEER=NONE
# problems with SSL clients. Disable SSL caching by commenting out the
# following settings:
Index: patches/patch-imap_pop3d-ssl_dist_in
===================================================================
RCS file: /cvs/ports/mail/courier-imap/patches/patch-imap_pop3d-ssl_dist_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-imap_pop3d-ssl_dist_in
--- patches/patch-imap_pop3d-ssl_dist_in 9 May 2011 09:30:26 -0000
1.7
+++ patches/patch-imap_pop3d-ssl_dist_in 14 Dec 2011 16:43:08 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-imap_pop3d-ssl_dist_in,v 1.7 2011/05/09 09:30:26 giovanni Exp $
---- imap/pop3d-ssl.dist.in.orig Mon Apr 4 17:02:32 2011
-+++ imap/pop3d-ssl.dist.in Wed Apr 13 15:53:46 2011
-@@ -308,8 +308,8 @@ TLS_VERIFYPEER=NONE
+--- 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
# problems with SSL clients. Disable SSL caching by commenting out the
# following settings:
Index: patches/patch-maildir_configure
===================================================================
RCS file: /cvs/ports/mail/courier-imap/patches/patch-maildir_configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-maildir_configure
--- patches/patch-maildir_configure 9 May 2011 09:30:26 -0000 1.2
+++ patches/patch-maildir_configure 14 Dec 2011 16:43:08 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-maildir_configure,v 1.2 2011/05/09 09:30:26 giovanni Exp $
---- maildir/configure.orig Mon Apr 4 17:04:53 2011
-+++ maildir/configure Wed Apr 13 15:58:52 2011
-@@ -15904,7 +15904,7 @@ if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then :
+--- 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 :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10,7 +10,7 @@ $OpenBSD: patch-maildir_configure,v 1.2
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -15939,7 +15939,7 @@ if test "x$ac_cv_lib_fam_FAMOpen" = x""yes; then :
+@@ -16780,7 +16780,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.2
_ACEOF
-@@ -15969,7 +15969,6 @@ fi
+@@ -16810,7 +16810,6 @@ fi
Index: patches/patch-rfc1035_rfc1035mksocket_c
===================================================================
RCS file: patches/patch-rfc1035_rfc1035mksocket_c
diff -N patches/patch-rfc1035_rfc1035mksocket_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-rfc1035_rfc1035mksocket_c 14 Dec 2011 16:43:08 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- 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);
