ping... anyone?
as usual, comments, tests, oks are welcome. // gsoares
On Mon, Nov 9, 2015 at 8:21 PM, Gleydson Soares <gsoa...@gmail.com> wrote:
> here is an update to stunnel 5.26
> OK?
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/stunnel/Makefile,v
> retrieving revision 1.78
> diff -u -p -u -p -r1.78 Makefile
> --- Makefile 14 Oct 2015 02:05:06 -0000 1.78
> +++ Makefile 9 Nov 2015 23:15:29 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT= SSL encryption wrapper for standard network daemons
>
> -DISTNAME= stunnel-5.24
> +DISTNAME= stunnel-5.26
> CATEGORIES= security
>
> MAINTAINER= Gleydson Soares <gsoa...@openbsd.org>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/security/stunnel/distinfo,v
> retrieving revision 1.36
> diff -u -p -u -p -r1.36 distinfo
> --- distinfo 14 Oct 2015 02:05:06 -0000 1.36
> +++ distinfo 9 Nov 2015 23:15:29 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (stunnel-5.24.tar.gz) = qy5aEDTUIpUd2tIbVy63+o77TEzgS8hlNsaEXz0CsH4=
> -SIZE (stunnel-5.24.tar.gz) = 631730
> +SHA256 (stunnel-5.26.tar.gz) = LJDUaQEe7Y3JTwAwE+PAVd5v22h+8ecfoAQoHX98JyY=
> +SIZE (stunnel-5.26.tar.gz) = 635710
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: /cvs/ports/security/stunnel/patches/patch-Makefile_in,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 patch-Makefile_in
> --- patches/patch-Makefile_in 25 Jun 2015 14:44:30 -0000 1.11
> +++ patches/patch-Makefile_in 9 Nov 2015 23:15:29 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-Makefile_in,v 1.11 2015/06/25 14:44:30 gsoares Exp $
> ---- Makefile.in.orig Mon Jun 1 11:25:53 2015
> -+++ Makefile.in Fri Jun 12 12:44:13 2015
> -@@ -355,7 +355,7 @@ top_build_prefix = @top_build_prefix@
> +--- Makefile.in.orig Mon Nov 2 13:32:06 2015
> ++++ Makefile.in Mon Nov 9 18:12:39 2015
> +@@ -357,7 +357,7 @@ top_build_prefix = @top_build_prefix@
> top_builddir = @top_builddir@
> top_srcdir = @top_srcdir@
> ACLOCAL_AMFLAGS = -I m4
> Index: patches/patch-src_ctx_c
> ===================================================================
> RCS file: patches/patch-src_ctx_c
> diff -N patches/patch-src_ctx_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_ctx_c 9 Nov 2015 23:15:29 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- src/ctx.c.orig Mon Nov 9 18:13:44 2015
> ++++ src/ctx.c Mon Nov 9 18:15:24 2015
> +@@ -349,7 +349,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
> + /**************************************** initialize OpenSSL CONF */
> +
> + NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
> +-#if OPENSSL_VERSION_NUMBER>=0x10002000L
> ++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
> + SSL_CONF_CTX *cctx;
> + NAME_LIST *curr;
> + char *cmd, *param;
> Index: patches/patch-src_options_c
> ===================================================================
> RCS file: /cvs/ports/security/stunnel/patches/patch-src_options_c,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-src_options_c
> --- patches/patch-src_options_c 14 Oct 2015 02:05:06 -0000 1.2
> +++ patches/patch-src_options_c 9 Nov 2015 23:15:29 -0000
> @@ -3,9 +3,9 @@ $OpenBSD: patch-src_options_c,v 1.2 2015
> use SSLv23_client_method() required to build with libressl since that it
> haven't
> TLS_client_method() for now.
>
> ---- src/options.c.orig Tue Oct 6 13:16:11 2015
> -+++ src/options.c Tue Oct 6 05:52:42 2015
> -@@ -2507,7 +2507,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
> +--- src/options.c.orig Tue Nov 3 07:44:03 2015
> ++++ src/options.c Mon Nov 9 18:12:39 2015
> +@@ -2539,7 +2539,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
> -@@ -2519,7 +2519,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
> +@@ -2551,7 +2551,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
> if(strcasecmp(opt, "sslVersion"))
> break;
> if(!strcasecmp(arg, "all")) {
>
