From e571df172083435f7a75788b706a79a5ca342148 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 29 Mar 2016 22:05:47 +0000
Subject: Don't hard-code SSLv2. Bump revision.

---
 benchmarks/postal/Makefile                   |  4 ++--
 benchmarks/postal/distinfo                   |  4 +++-
 benchmarks/postal/patches/patch-basictcp.cpp | 17 +++++++++++++++++
 benchmarks/postal/patches/patch-tcp.cpp      | 17 +++++++++++++++++
 4 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 benchmarks/postal/patches/patch-basictcp.cpp
 create mode 100644 benchmarks/postal/patches/patch-tcp.cpp

(limited to 'benchmarks')

diff --git a/benchmarks/postal/Makefile b/benchmarks/postal/Makefile
index 56bb9167279..8ef1f52073a 100644
--- a/benchmarks/postal/Makefile
+++ b/benchmarks/postal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2016/03/05 11:28:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.22 2016/03/29 22:05:47 joerg Exp $
 
 DISTNAME=	postal-0.70
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.coker.com.au/postal/
 EXTRACT_SUFX=	.tgz
diff --git a/benchmarks/postal/distinfo b/benchmarks/postal/distinfo
index 46f367da0a3..a02b1f31360 100644
--- a/benchmarks/postal/distinfo
+++ b/benchmarks/postal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 00:25:51 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/03/29 22:05:47 joerg Exp $
 
 SHA1 (postal-0.70.tgz) = d02dc900eb645aa993c5747fa434a0af4b0fb7e0
 RMD160 (postal-0.70.tgz) = 2b23ab0d60abfeaad32adf7ba65134d0f267294a
@@ -10,7 +10,9 @@ SHA1 (patch-ab) = 38ed0b1ad550b31e8d46639e43b243e0e2b99cf5
 SHA1 (patch-ad) = 3707f465c6a69c94fd862fb7863a3c8cb6519366
 SHA1 (patch-ae) = 094165c454fb87c9cbacfae6e9ab2bb38f4d15a2
 SHA1 (patch-af) = ce387f94ff18a9a6b67dfe5a07740cc8340e6cfb
+SHA1 (patch-basictcp.cpp) = fb29a5b4ae0a59681a28ca96cdc52a632a2f1b29
 SHA1 (patch-bhmusers.cpp) = 4cdbb026eb8da5bc42aae304e35869542e19ac60
 SHA1 (patch-bhmusers.h) = 430fdea85b33a331442b67d988b203715171dcad
 SHA1 (patch-smtp.cpp) = a91db5779f1ef8cf6d514c1304d20d01a4548772
 SHA1 (patch-smtp.h) = 876ece300ee53085b61bb1d16efffa907e733a43
+SHA1 (patch-tcp.cpp) = 6a41a7629607d0238d85bf754b3eb59c407d2757
diff --git a/benchmarks/postal/patches/patch-basictcp.cpp b/benchmarks/postal/patches/patch-basictcp.cpp
new file mode 100644
index 00000000000..9b061102d8e
--- /dev/null
+++ b/benchmarks/postal/patches/patch-basictcp.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-basictcp.cpp,v 1.1 2016/03/29 22:05:47 joerg Exp $
+
+--- basictcp.cpp.orig	2016-03-28 18:41:34.420033652 +0000
++++ basictcp.cpp
+@@ -103,10 +103,10 @@ int base_tcp::ConnectTLS()
+   m_sslMeth = NULL;
+   m_sslCtx = NULL;
+   m_ssl = NULL;
+-  m_sslMeth = SSLv2_client_method();
++  m_sslMeth = SSLv23_client_method();
+   if(m_sslMeth == NULL)
+   {
+-    fprintf(stderr, "Can't get SSLv2_client_method.\n");
++    fprintf(stderr, "Can't get SSLv23_client_method.\n");
+     return 2;
+   }
+   m_sslCtx = SSL_CTX_new(m_sslMeth);
diff --git a/benchmarks/postal/patches/patch-tcp.cpp b/benchmarks/postal/patches/patch-tcp.cpp
new file mode 100644
index 00000000000..2e92c32926e
--- /dev/null
+++ b/benchmarks/postal/patches/patch-tcp.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-tcp.cpp,v 1.1 2016/03/29 22:05:47 joerg Exp $
+
+--- tcp.cpp.orig	2016-03-28 18:41:37.150020392 +0000
++++ tcp.cpp
+@@ -178,10 +178,10 @@ int tcp::ConnectTLS()
+ #ifdef USE_OPENSSL
+   m_sslCtx = NULL;
+   m_ssl = NULL;
+-  m_sslMeth = SSLv2_client_method();
++  m_sslMeth = SSLv23_client_method();
+   if(m_sslMeth == NULL)
+   {
+-    fprintf(stderr, "Can't get SSLv2_client_method.\n");
++    fprintf(stderr, "Can't get SSLv23_client_method.\n");
+     error();
+     return 2;
+   }
-- 
cgit v1.2.3