Tue Mar 29 22:05:47 2016 UTC ()
Don't hard-code SSLv2. Bump revision.


(joerg)
diff -r1.21 -r1.22 pkgsrc/benchmarks/postal/Makefile
diff -r1.9 -r1.10 pkgsrc/benchmarks/postal/distinfo
diff -r0 -r1.1 pkgsrc/benchmarks/postal/patches/patch-basictcp.cpp
diff -r0 -r1.1 pkgsrc/benchmarks/postal/patches/patch-tcp.cpp
cvs diff -r1.21 -r1.22 pkgsrc/benchmarks/postal/Makefile (expand / switch to unified diff)

--- pkgsrc/benchmarks/postal/Makefile 2016/03/05 11:28:06 1.21
+++ pkgsrc/benchmarks/postal/Makefile 2016/03/29 22:05:47 1.22
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.21 2016/03/05 11:28:06 jperkin Exp $ 1# $NetBSD: Makefile,v 1.22 2016/03/29 22:05:47 joerg Exp $
2 2
3DISTNAME= postal-0.70 3DISTNAME= postal-0.70
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= benchmarks 5CATEGORIES= benchmarks
6MASTER_SITES= http://www.coker.com.au/postal/ 6MASTER_SITES= http://www.coker.com.au/postal/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= david@silicium.ath.cx 9MAINTAINER= david@silicium.ath.cx
10HOMEPAGE= http://www.coker.com.au/postal/ 10HOMEPAGE= http://www.coker.com.au/postal/
11COMMENT= Tool for benchmarking SMTP/POP servers 11COMMENT= Tool for benchmarking SMTP/POP servers
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17 17
cvs diff -r1.9 -r1.10 pkgsrc/benchmarks/postal/distinfo (expand / switch to unified diff)

--- pkgsrc/benchmarks/postal/distinfo 2015/11/03 00:25:51 1.9
+++ pkgsrc/benchmarks/postal/distinfo 2016/03/29 22:05:47 1.10
@@ -1,16 +1,18 @@ @@ -1,16 +1,18 @@
1$NetBSD: distinfo,v 1.9 2015/11/03 00:25:51 agc Exp $ 1$NetBSD: distinfo,v 1.10 2016/03/29 22:05:47 joerg Exp $
2 2
3SHA1 (postal-0.70.tgz) = d02dc900eb645aa993c5747fa434a0af4b0fb7e0 3SHA1 (postal-0.70.tgz) = d02dc900eb645aa993c5747fa434a0af4b0fb7e0
4RMD160 (postal-0.70.tgz) = 2b23ab0d60abfeaad32adf7ba65134d0f267294a 4RMD160 (postal-0.70.tgz) = 2b23ab0d60abfeaad32adf7ba65134d0f267294a
5SHA512 (postal-0.70.tgz) = 81356d32e56559a267994c2a18fa7b83c04556423f650404aeb7a8ce3d43d9fbd036b0fa545bccdc8caff8b375f95707031858046f4f99242f4cb23c7809bdb5 5SHA512 (postal-0.70.tgz) = 81356d32e56559a267994c2a18fa7b83c04556423f650404aeb7a8ce3d43d9fbd036b0fa545bccdc8caff8b375f95707031858046f4f99242f4cb23c7809bdb5
6Size (postal-0.70.tgz) = 99965 bytes 6Size (postal-0.70.tgz) = 99965 bytes
7SHA1 (patch-Makefile.in) = 45f7357ff4407033818599a76b9c929b6c09b127 7SHA1 (patch-Makefile.in) = 45f7357ff4407033818599a76b9c929b6c09b127
8SHA1 (patch-aa) = 0d85ec46202e0077d7f435547158eff65eab8a69 8SHA1 (patch-aa) = 0d85ec46202e0077d7f435547158eff65eab8a69
9SHA1 (patch-ab) = 38ed0b1ad550b31e8d46639e43b243e0e2b99cf5 9SHA1 (patch-ab) = 38ed0b1ad550b31e8d46639e43b243e0e2b99cf5
10SHA1 (patch-ad) = 3707f465c6a69c94fd862fb7863a3c8cb6519366 10SHA1 (patch-ad) = 3707f465c6a69c94fd862fb7863a3c8cb6519366
11SHA1 (patch-ae) = 094165c454fb87c9cbacfae6e9ab2bb38f4d15a2 11SHA1 (patch-ae) = 094165c454fb87c9cbacfae6e9ab2bb38f4d15a2
12SHA1 (patch-af) = ce387f94ff18a9a6b67dfe5a07740cc8340e6cfb 12SHA1 (patch-af) = ce387f94ff18a9a6b67dfe5a07740cc8340e6cfb
 13SHA1 (patch-basictcp.cpp) = fb29a5b4ae0a59681a28ca96cdc52a632a2f1b29
13SHA1 (patch-bhmusers.cpp) = 4cdbb026eb8da5bc42aae304e35869542e19ac60 14SHA1 (patch-bhmusers.cpp) = 4cdbb026eb8da5bc42aae304e35869542e19ac60
14SHA1 (patch-bhmusers.h) = 430fdea85b33a331442b67d988b203715171dcad 15SHA1 (patch-bhmusers.h) = 430fdea85b33a331442b67d988b203715171dcad
15SHA1 (patch-smtp.cpp) = a91db5779f1ef8cf6d514c1304d20d01a4548772 16SHA1 (patch-smtp.cpp) = a91db5779f1ef8cf6d514c1304d20d01a4548772
16SHA1 (patch-smtp.h) = 876ece300ee53085b61bb1d16efffa907e733a43 17SHA1 (patch-smtp.h) = 876ece300ee53085b61bb1d16efffa907e733a43
 18SHA1 (patch-tcp.cpp) = 6a41a7629607d0238d85bf754b3eb59c407d2757
File Added: pkgsrc/benchmarks/postal/patches/patch-basictcp.cpp
$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);
File Added: pkgsrc/benchmarks/postal/patches/patch-tcp.cpp
$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;
   }