mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00
Code Issues Releases Activity

Remove any mention of SSH1 -- it is no longer provided by the code,

Browse Source 
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
This commit is contained in:
Mikhail Teterin 2019-01-25 21:02:27 +00:00
parent 3a4d871633
commit a0e48abe9f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=491204
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
security/libssh/Makefile
View File

@ -7,12 +7,12 @@ CATEGORIES= security devel
MASTER_SITES= https://www.libssh.org/files/0.8/
MAINTAINER= johans@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
@ -31,10 +31,6 @@ 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

12
security/libssh/files/patch-src_libcrypto-compat.h Normal file
View File

@ -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>

2
security/libssh/pkg-descr
View File

@ -8,7 +8,7 @@ without third-party programs others than libcrypto (from openssl).
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

1
security/libssh/pkg-plist
View File

@ -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