This diff allows building courier-imap with no SSLv3 support in libssl.

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile
--- Makefile    15 Jul 2015 21:14:06 -0000      1.97
+++ Makefile    19 Jul 2015 01:31:14 -0000
@@ -29,7 +29,8 @@ WANTLIB-pop3+=                idn pcre ${MODGETTEXT_WA
 
 USE_GMAKE=             Yes
 USE_GROFF=             Yes
-CONFIGURE_STYLE=       gnu
+CONFIGURE_STYLE=       autoconf autoheader
+AUTOCONF_VERSION=      2.69
 
 CONFIGURE_ENV=         LDFLAGS="-L${LOCALBASE}/lib" \
                        CXXFLAGS="-I${LOCALBASE}/include" \
Index: patches/patch-libs_tcpd_config_h_in
===================================================================
RCS file: patches/patch-libs_tcpd_config_h_in
diff -N patches/patch-libs_tcpd_config_h_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_tcpd_config_h_in 19 Jul 2015 01:31:14 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- libs/tcpd/config.h.in.orig Sat Dec 13 07:23:32 2014
++++ libs/tcpd/config.h.in      Sat Jul 18 19:10:41 2015
+@@ -46,6 +46,9 @@
+ /* Whether pipe() is SvR4-style that's a bidirectional pipe */
+ #undef HAVE_SPIPE_SVR4
+ 
++/* Define to 1 if you have the `SSLv3_method' function. */
++#undef HAVE_SSLV3_METHOD
++
+ /* Define to 1 if you have the <stdint.h> header file. */
+ #undef HAVE_STDINT_H
+ 
Index: patches/patch-libs_tcpd_configure_ac
===================================================================
RCS file: patches/patch-libs_tcpd_configure_ac
diff -N patches/patch-libs_tcpd_configure_ac
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_tcpd_configure_ac        19 Jul 2015 01:31:14 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libs/tcpd/configure.ac.orig        Sat Jul 18 19:01:58 2015
++++ libs/tcpd/configure.ac     Sat Jul 18 19:03:20 2015
+@@ -507,7 +507,7 @@ RAND_pseudo_bytes(dummy, 1);
+ ]
+ )
+               LIBS="-lssl $LIBS"
+-              AC_CHECK_FUNCS(TLSv1_1_method TLSv1_2_method)
++              AC_CHECK_FUNCS(SSLv3_method TLSv1_1_method TLSv1_2_method)
+               LIBS="$save_LIBS"
+ 
+               TLSLIBRARY="$LIBCOURIERTLSOPENSSL"
Index: patches/patch-libs_tcpd_libcouriertls_c
===================================================================
RCS file: patches/patch-libs_tcpd_libcouriertls_c
diff -N patches/patch-libs_tcpd_libcouriertls_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_tcpd_libcouriertls_c     19 Jul 2015 01:31:14 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- libs/tcpd/libcouriertls.c.orig     Wed Oct 22 02:00:12 2014
++++ libs/tcpd/libcouriertls.c  Sat Jul 18 19:12:58 2015
+@@ -74,7 +74,9 @@ struct proto_ops op_list[] =
+     { "TLSv1",     &TLSv1_method,   SSL_OP_ALL },
+     { "TLS1",      &TLSv1_method,   SSL_OP_ALL },
+     { "SSL3+",     &SSLv23_method,  SSL_OP_ALL|SSL_OP_NO_SSLv2 },
++#ifdef HAVE_SSLV3_METHOD
+     { "SSL3",      &SSLv3_method,   SSL_OP_ALL },
++#endif
+     { "SSL23",     &SSLv23_method,  SSL_OP_ALL },
+     { "",          &SSLv23_method,  
SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 },
+     { NULL,        &SSLv23_method,  
SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 },


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to