following diff updates stunnel to the latest release. works here @amd64
it was slightly tested... so I'm looking for test reports, someone willing? OKs?
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/stunnel/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- Makefile 11 Mar 2016 20:28:31 -0000 1.82
+++ Makefile 22 Apr 2016 01:06:22 -0000
@@ -2,7 +2,7 @@
COMMENT= SSL encryption wrapper for standard network daemons
-DISTNAME= stunnel-5.29
+DISTNAME= stunnel-5.31
CATEGORIES= security
MAINTAINER= Gleydson Soares <gsoa...@openbsd.org>
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/stunnel/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo 13 Jan 2016 12:39:55 -0000 1.39
+++ distinfo 22 Apr 2016 01:06:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (stunnel-5.29.tar.gz) = Q5CWJUA+pjT6fLg5nVj6+OfxHBt7KQl0kUaZUfVt9VE=
-SIZE (stunnel-5.29.tar.gz) = 637806
+SHA256 (stunnel-5.31.tar.gz) = p0a3GrPcbCPqyw2vc0JGeHDkOskzQwkF6xsdBQu64Lc=
+SIZE (stunnel-5.31.tar.gz) = 639381
cvs server: Diffing patches
Index: patches/patch-src_ctx_c
===================================================================
RCS file: /cvs/ports/security/stunnel/patches/patch-src_ctx_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_ctx_c
--- patches/patch-src_ctx_c 4 Dec 2015 01:38:56 -0000 1.2
+++ patches/patch-src_ctx_c 22 Apr 2016 01:06:22 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_ctx_c,v 1.2 2015/12/04 01:38:56 gsoares Exp $
---- src/ctx.c.orig Mon Nov 30 11:15:43 2015
-+++ src/ctx.c Thu Dec 3 19:26:54 2015
-@@ -351,7 +351,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
+--- src/ctx.c.orig Fri Feb 19 16:18:43 2016
++++ src/ctx.c Thu Apr 21 21:59:31 2016
+@@ -363,7 +363,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
/**************************************** initialize OpenSSL CONF */
NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
Index: patches/patch-src_options_c
===================================================================
RCS file: /cvs/ports/security/stunnel/patches/patch-src_options_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_options_c
--- patches/patch-src_options_c 13 Jan 2016 12:39:55 -0000 1.5
+++ patches/patch-src_options_c 22 Apr 2016 01:06:22 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-src_options_c,v 1.5 2016
use SSLv23_client_method() required to build with libressl since that it
haven't
TLS_client_method() for now.
---- src/options.c.orig Tue Jan 5 06:20:12 2016
-+++ src/options.c Tue Jan 12 19:57:30 2016
-@@ -2559,7 +2559,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
+--- src/options.c.orig Fri Jan 15 13:45:23 2016
++++ src/options.c Thu Apr 21 21:59:31 2016
+@@ -2579,7 +2579,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
/* sslVersion */
switch(cmd) {
case CMD_BEGIN:
@@ -14,7 +14,7 @@ TLS_client_method() for now.
section->client_method=(SSL_METHOD *)TLS_client_method();
section->server_method=(SSL_METHOD *)TLS_server_method();
#else
-@@ -2571,7 +2571,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
+@@ -2591,7 +2591,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
if(strcasecmp(opt, "sslVersion"))
break;
if(!strcasecmp(arg, "all")) {
Index: patches/patch-src_verify_c
===================================================================
RCS file: /cvs/ports/security/stunnel/patches/patch-src_verify_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_verify_c
--- patches/patch-src_verify_c 14 Oct 2015 02:05:06 -0000 1.2
+++ patches/patch-src_verify_c 22 Apr 2016 01:06:22 -0000
@@ -3,8 +3,8 @@ $OpenBSD: patch-src_verify_c,v 1.2 2015/
disable OpenSSL 1.0.2 X509_check_* functions, so it can build with libressl.
---- src/verify.c.orig Wed Sep 23 07:00:08 2015
-+++ src/verify.c Tue Oct 6 05:52:42 2015
+--- src/verify.c.orig Fri Feb 19 16:18:43 2016
++++ src/verify.c Thu Apr 21 21:59:31 2016
@@ -51,7 +51,7 @@ NOEXPORT int add_dir_lookup(X509_STORE *, char *);
NOEXPORT int verify_callback(int, X509_STORE_CTX *);
NOEXPORT int verify_checks(CLI *, int, X509_STORE_CTX *);
@@ -14,7 +14,7 @@ disable OpenSSL 1.0.2 X509_check_* funct
NOEXPORT int cert_check_subject(CLI *, X509_STORE_CTX *);
#endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
NOEXPORT int cert_check_local(X509_STORE_CTX *);
-@@ -280,7 +280,7 @@ NOEXPORT int cert_check(CLI *c, X509_STORE_CTX *callba
+@@ -274,7 +274,7 @@ NOEXPORT int cert_check(CLI *c, X509_STORE_CTX *callba
}
if(depth==0) { /* additional peer certificate checks */
@@ -23,7 +23,7 @@ disable OpenSSL 1.0.2 X509_check_* funct
if(!cert_check_subject(c, callback_ctx))
return 0; /* reject */
#endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
-@@ -291,7 +291,7 @@ NOEXPORT int cert_check(CLI *c, X509_STORE_CTX *callba
+@@ -285,7 +285,7 @@ NOEXPORT int cert_check(CLI *c, X509_STORE_CTX *callba
return 1; /* accept */
}
