Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Dec 2016 19:22:10 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r428317 - in head/net/tn5250: . files
Message-ID:  <201612101922.uBAJMAam010969@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Sat Dec 10 19:22:10 2016
New Revision: 428317
URL: https://svnweb.freebsd.org/changeset/ports/428317

Log:
  net/tn5250: Fix build without SSLv2/3
  
    - Add patch fixing build without SSLv2/3
    - Switch USE_OPENSSL to USES= ssl
  
  Approved by:	SSL blanket

Added:
  head/net/tn5250/files/
  head/net/tn5250/files/patch-lib5250_sslstream.c   (contents, props changed)
Modified:
  head/net/tn5250/Makefile

Modified: head/net/tn5250/Makefile
==============================================================================
--- head/net/tn5250/Makefile	Sat Dec 10 19:12:54 2016	(r428316)
+++ head/net/tn5250/Makefile	Sat Dec 10 19:22:10 2016	(r428317)
@@ -10,8 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	5250 Telnet protocol and Terminal
 
-USES=		libtool ncurses
-USE_OPENSSL=	yes
+USES=		libtool ncurses ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-os-dir=no --with-ssl=${OPENSSLBASE}
 USE_LDCONFIG=	yes

Added: head/net/tn5250/files/patch-lib5250_sslstream.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/tn5250/files/patch-lib5250_sslstream.c	Sat Dec 10 19:22:10 2016	(r428317)
@@ -0,0 +1,24 @@
+--- lib5250/sslstream.c.orig	2008-11-21 08:12:21 UTC
++++ lib5250/sslstream.c
+@@ -368,13 +368,19 @@ int tn5250_ssl_stream_init (Tn5250Stream
+         methstr[4] = '\0';
+    }
+ 
++#ifndef OPENSSL_NO_SSL2
+    if (!strcmp(methstr, "ssl2")) {
+         meth = SSLv2_client_method();         
+         TN5250_LOG(("SSL Method = SSLv2_client_method()\n"));
+-   } else if (!strcmp(methstr, "ssl3")) {
++   } else 
++#endif
++#ifndef OPENSSL_NO_SSL3
++   if (!strcmp(methstr, "ssl3")) {
+         meth = SSLv3_client_method();         
+         TN5250_LOG(("SSL Method = SSLv3_client_method()\n"));
+-   } else {
++   } else 
++#endif
++   {
+         meth = SSLv23_client_method();         
+         TN5250_LOG(("SSL Method = SSLv23_client_method()\n"));
+    }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612101922.uBAJMAam010969>