remove wourarounds for broken NetBSD-4 builtin openssl, it will not be used anymore.

6 files changed, 4 insertions, 66 deletions

diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 350afc2484b..808f23bb7aa 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2014/02/12 23:18:06 tron Exp $
+# $NetBSD: Makefile,v 1.31 2014/02/13 06:24:36 obache Exp $
 
 DISTNAME=	cyrus-imapd-2.3.18
 PKGREVISION=	10
@@ -77,14 +77,6 @@ pre-build:
 BUILDLINK_API_DEPENDS.cyrus-sasl+=	cyrus-sasl>=2.1.17
 .include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-
-# NetBSD's libssl is built without bn/bn_const.c (PR#37505)
-.if !empty(MACHINE_PLATFORM:MNetBSD-4.*-*)
-#.  if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
-CFLAGS+=	-DOPENSSL_LACK_BN_CONST
-#.  endif
-.endif
-
 .include "../../security/tcp_wrappers/buildlink3.mk"
 
 # Only imap/mupdate needs to be build with pthreads support, so selectively
diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo
index 226659b6217..5f361a2002e 100644
--- a/mail/cyrus-imapd23/distinfo
+++ b/mail/cyrus-imapd23/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2012/11/23 12:35:57 joerg Exp $
+$NetBSD: distinfo,v 1.9 2014/02/13 06:24:36 obache Exp $
 
 SHA1 (cyrus-imapd-2.3.18.tar.gz) = 5051f315ffd84c9a623c6da209528d5aff39ed72
 RMD160 (cyrus-imapd-2.3.18.tar.gz) = b9d351b5c73c4e87019fb8aa0efd0a8a29ac6a40
@@ -16,7 +16,6 @@ SHA1 (patch-aj) = a2d3aba6b2bf4383740f0b1bd48cb6d4027a6d70
 SHA1 (patch-ak) = de75847f1ace85591109096fb3a33d78763cd479
 SHA1 (patch-al) = 70b17f045298492978e3756d4a211f35e90b9bb9
 SHA1 (patch-am) = d06b62f9ea153560d84ec013861839071e4ab700
-SHA1 (patch-an) = b3ac809f2807a1766197958e807eb99cb42847f0
 SHA1 (patch-ao) = 784363a1802cbaf08e62bbbd2020fe592be0a126
 SHA1 (patch-ap) = 4a794b806b20270e2b9b551bfae21352389e1352
 SHA1 (patch-lib_charset.c) = cf25747c17ce815aa37259a57e4e86a428086afe
diff --git a/mail/cyrus-imapd23/patches/patch-an b/mail/cyrus-imapd23/patches/patch-an
deleted file mode 100644
index ee5d4c13a98..00000000000
--- a/mail/cyrus-imapd23/patches/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2010/02/11 08:27:09 obache Exp $
-
---- imap/tls.c.orig	2008-11-14 22:24:38.000000000 +0000
-+++ imap/tls.c
-@@ -223,7 +223,7 @@ static RSA *tmp_rsa_cb(SSL * s __attribu
-     return (rsa_tmp);
- }
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
-+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_LACK_BN_CONST)
- /* Logic copied from OpenSSL apps/s_server.c: give the TLS context
-  * DH params to work with DHE-* cipher suites. Hardcoded fallback
-  * in case no DH params in tls_key_file or tls_cert_file.
-@@ -735,7 +735,7 @@ int     tls_init_serverengine(const char
-     }
-     SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb);
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
-+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_LACK_BN_CONST)
-     /* Load DH params for DHE-* key exchanges */
-     SSL_CTX_set_tmp_dh(s_ctx, load_dh_param(s_key_file, s_cert_file));
-     /* FIXME: Load ECDH params for ECDHE suites when 0.9.9 is released */
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index f1d83d067d8..339f8ccc230 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2014/02/12 23:18:06 tron Exp $
+# $NetBSD: Makefile,v 1.35 2014/02/13 06:24:36 obache Exp $
 
 DISTNAME=	cyrus-imapd-2.4.17
 PKGREVISION=	7
@@ -78,14 +78,6 @@ pre-build:
 BUILDLINK_API_DEPENDS.cyrus-sasl+=	cyrus-sasl>=2.1.17
 .include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-
-# NetBSD's libssl is built without bn/bn_const.c (PR#37505)
-.if !empty(MACHINE_PLATFORM:MNetBSD-4.*-*)
-#.  if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
-CFLAGS+=	-DOPENSSL_LACK_BN_CONST
-#.  endif
-.endif
-
 .include "../../security/tcp_wrappers/buildlink3.mk"
 
 # Only imap/mupdate needs to be build with pthreads support, so selectively
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index f96c19d18b7..f46609256e2 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2012/12/16 02:55:46 obache Exp $
+$NetBSD: distinfo,v 1.18 2014/02/13 06:24:36 obache Exp $
 
 SHA1 (cyrus-imapd-2.4.17.tar.gz) = cc869dea08ad663fc32d9ab628992a1711cfbb1b
 RMD160 (cyrus-imapd-2.4.17.tar.gz) = c28e971515130eea23067b7015047a120edba86f
@@ -7,6 +7,5 @@ SHA1 (patch-ac) = d6b2e8c00a3605773bf7718d29ccfb0b82f59323
 SHA1 (patch-ah) = 4bc62dfdeafdca83ddac02aff0ffd05db28fe0b9
 SHA1 (patch-ai) = 9167678988f411479d187b232eb10ad8622b4151
 SHA1 (patch-am) = e100e13d5137116f5bd7674e954031b2615e5ab1
-SHA1 (patch-an) = 94aac408657e2315246c7cdaac2524c68eeb7c24
 SHA1 (patch-ao) = c01c9d32b4d73cbc32d2ad8bfca8b8b021ca2474
 SHA1 (patch-imap_mailbox.c) = 2a00d97525edb0768cbf4cfd2e1ad5e5f915bc62
diff --git a/mail/cyrus-imapd24/patches/patch-an b/mail/cyrus-imapd24/patches/patch-an
deleted file mode 100644
index f6047777fbc..00000000000
--- a/mail/cyrus-imapd24/patches/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.2 2011/06/22 01:05:37 obache Exp $
-
---- imap/tls.c.orig	2011-06-21 19:50:39.000000000 +0000
-+++ imap/tls.c
-@@ -223,7 +223,7 @@ static RSA *tmp_rsa_cb(SSL * s __attribu
-     return (rsa_tmp);
- }
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
-+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_LACK_BN_CONST)
- /* Logic copied from OpenSSL apps/s_server.c: give the TLS context
-  * DH params to work with DHE-* cipher suites. Hardcoded fallback
-  * in case no DH params in tls_key_file or tls_cert_file.
-@@ -741,7 +741,7 @@ int     tls_init_serverengine(const char
-     }
-     SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb);
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
-+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_LACK_BN_CONST)
-     /* Load DH params for DHE-* key exchanges */
-     SSL_CTX_set_tmp_dh(s_ctx, load_dh_param(s_key_file, s_cert_file));
-     /* FIXME: Load ECDH params for ECDHE suites when 0.9.9 is released */