svn commit: r421730 - in head/lang/swi-pl: . files

[John Marino]

Author: marino
Date: Sat Sep 10 19:23:23 2016
New Revision: 421730
URL: https://svnweb.freebsd.org/changeset/ports/421730

Log:
  lang/swi-pl: USES+=ssl and handle SSLv3 method for LibreSSL support
  
  While here, used OPSYS:tl instead of hardcoded freebsd
  
  Approved by:	SSL blanket

Added:
  head/lang/swi-pl/files/
  head/lang/swi-pl/files/patch-packages_ssl_ssl4pl.c   (contents, props changed)
Modified:
  head/lang/swi-pl/Makefile

Modified: head/lang/swi-pl/Makefile
==============================================================================
--- head/lang/swi-pl/Makefile	Sat Sep 10 19:20:58 2016	(r421729)
+++ head/lang/swi-pl/Makefile	Sat Sep 10 19:23:23 2016	(r421730)
@@ -18,14 +18,15 @@ SWIPLDIR=	${PORTNAME:C/-//}-${PORTVERSIO
 
 NOPRECIOUSMAKEVARS=	yes
 USE_XORG=	xft xpm xt
-USES=		gmake jpeg libarchive pathfix pkgconfig shebangfix
+USES=		gmake jpeg libarchive pathfix pkgconfig shebangfix ssl
 MAKE_JOBS_UNSAFE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ARCH=${ARCH}-${OPSYS:tl}
 CONFIGURE_TARGET=	${ARCH}-${OPSYS:tl}
 CONFIGURE_ARGS=	--with-world --without-jpl --enable-shared
 MAKE_ARGS=	DISABLE_PKGS=jpl \
-		ac_cv_lib_ossp_uuid_uuid_create=no ac_cv_lib_uuid_uuid_create=no
+		ac_cv_lib_ossp_uuid_uuid_create=no \
+		ac_cv_lib_uuid_uuid_create=no
 
 SHEBANG_LANG=	swipl
 swipl_OLD_CMD=	/usr/bin/swipl
@@ -70,6 +71,6 @@ post-patch:
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xpce-client \
-		${STAGEDIR}${PREFIX}/lib/${SWIPLDIR}/lib/${ARCH}-freebsd/pl2xpce.so
+		${STAGEDIR}${PREFIX}/lib/${SWIPLDIR}/lib/${ARCH}-${OPSYS:tl}/pl2xpce.so
 
 .include <bsd.port.post.mk>

Added: head/lang/swi-pl/files/patch-packages_ssl_ssl4pl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/swi-pl/files/patch-packages_ssl_ssl4pl.c	Sat Sep 10 19:23:23 2016	(r421730)
@@ -0,0 +1,28 @@
+--- packages/ssl/ssl4pl.c.orig	2015-06-09 09:25:57 UTC
++++ packages/ssl/ssl4pl.c
+@@ -1127,8 +1127,12 @@ pl_ssl_context(term_t role, term_t confi
+ 
+   if (!PL_get_atom(method, &method_name))
+      return PL_domain_error("ssl_method", method);
+-  if (method_name == ATOM_sslv3)
++  if (0)
++    { /* never reached */ }
++#ifndef OPENSSL_NO_SSL3
++  else if (method_name == ATOM_sslv3)
+     ssl_method = SSLv3_method();
++#endif
+ #ifdef HAVE_SSLV2_METHOD
+   else if (method_name == ATOM_sslv2)
+     ssl_method = SSLv2_method();
+@@ -1736,9 +1740,11 @@ pl_ssl_session(term_t stream_t, term_t s
+ 		      PL_INTEGER, (int)session->ssl_version))
+     return FALSE;
+ 
++#ifndef OPENSSL_NO_SSL2
+   if ( !add_key_string(list_t, FUNCTOR_session_key1,
+ 		       session->key_arg_length, session->key_arg) )
+     return FALSE;
++#endif
+ 
+   if ( !add_key_string(list_t, FUNCTOR_master_key1,
+ 		       session->master_key_length, session->master_key) )