svn commit: r491204 - in head/security/libssh: . files

[Mikhail Teterin]

Author: mi
Date: Fri Jan 25 21:02:27 2019
New Revision: 491204
URL: https://svnweb.freebsd.org/changeset/ports/491204

Log:
  Remove any mention of SSH1 -- it is no longer provided by the code,
  but trying to enable the port's option causes the port to fail to
  package.
  
  Add a shim to allow compiling against LibreSSL
  
  PR:		233346, 232437
  Submitted by:	Arrigo Marchiori, Franco Fichtner
  Approved by:	maintainer timeout

Added:
  head/security/libssh/files/
  head/security/libssh/files/patch-src_libcrypto-compat.h   (contents, props changed)
Modified:
  head/security/libssh/Makefile
  head/security/libssh/pkg-descr
  head/security/libssh/pkg-plist

Modified: head/security/libssh/Makefile
==============================================================================
--- head/security/libssh/Makefile	Fri Jan 25 20:31:21 2019	(r491203)
+++ head/security/libssh/Makefile	Fri Jan 25 21:02:27 2019	(r491204)
@@ -7,12 +7,12 @@ CATEGORIES=	security devel
 MASTER_SITES=	https://www.libssh.org/files/0.8/
 
 MAINTAINER=	johans at FreeBSD.org
-COMMENT=	Library implementing the SSH1 and SSH2 protocol
+COMMENT=	Library implementing the SSH2 protocol
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS_DEFINE=	SSH1 STATIC GSSAPI
+OPTIONS_DEFINE=	STATIC GSSAPI
 OPTIONS_RADIO=	CRYPTO
 OPTIONS_RADIO_CRYPTO=	GCRYPT OPENSSL
 OPTIONS_DEFAULT=	OPENSSL STATIC GSSAPI
@@ -30,10 +30,6 @@ GCRYPT_CMAKE_ON=	-DWITH_GCRYPT:BOOL=ON
 GCRYPT_CMAKE_OFF=	-DWITH_GCRYPT:BOOL=OFF
 
 OPENSSL_USES=		ssl
-
-SSH1_DESC=		Build with SSH1 support
-SSH1_CMAKE_ON=		-DWITH_SSH1:BOOL=ON
-SSH1_CMAKE_OFF=		-DWITH_SSH1:BOOL=OFF
 
 STATIC_CMAKE_ON=	-DWITH_STATIC_LIB:BOOL=ON
 STATIC_CMAKE_OFF=	-DWITH_STATIC_LIB:BOOL=OFF

Added: head/security/libssh/files/patch-src_libcrypto-compat.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/libssh/files/patch-src_libcrypto-compat.h	Fri Jan 25 21:02:27 2019	(r491204)
@@ -0,0 +1,12 @@
+--- src/libcrypto-compat.h	2018-10-19 05:11:14 UTC
++++ src/libcrypto-compat.h
+@@ -2,7 +2,8 @@
+ #define LIBCRYPTO_COMPAT_H
+ 
+ #include <openssl/opensslv.h>
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++    (defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x20700000L)
+ 
+ #include <openssl/rsa.h>
+ #include <openssl/dsa.h>

Modified: head/security/libssh/pkg-descr
==============================================================================
--- head/security/libssh/pkg-descr	Fri Jan 25 20:31:21 2019	(r491203)
+++ head/security/libssh/pkg-descr	Fri Jan 25 21:02:27 2019	(r491204)
@@ -8,7 +8,7 @@ without third-party programs others than libcrypto (fr
 libssh features:
 
  * Full C library functions for manipulating a client-side SSH connection
- * SSH2 and SSH1 protocol compliant
+ * SSH2 protocol compliant
  * Fully configurable sessions
  * Server support, SSH agent authentication support
  * Support for AES-128, AES-192, AES-256, Blowfish, 3DES in CBC mode

Modified: head/security/libssh/pkg-plist
==============================================================================
--- head/security/libssh/pkg-plist	Fri Jan 25 20:31:21 2019	(r491203)
+++ head/security/libssh/pkg-plist	Fri Jan 25 21:02:27 2019	(r491204)
@@ -4,7 +4,6 @@ include/libssh/libssh.h
 include/libssh/libsshpp.hpp
 include/libssh/server.h
 include/libssh/sftp.h
-%%SSH1%%include/libssh/ssh1.h
 include/libssh/ssh2.h
 lib/cmake/libssh/libssh/libssh-config.cmake
 lib/cmake/libssh/libssh/libssh-config-version.cmake