From owner-svn-ports-head@freebsd.org Fri Jan 25 21:02:29 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0FD1114C321A; Fri, 25 Jan 2019 21:02:29 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A602072B41; Fri, 25 Jan 2019 21:02:28 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 996C2DD2C; Fri, 25 Jan 2019 21:02:28 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0PL2SVZ024321; Fri, 25 Jan 2019 21:02:28 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0PL2RPi024317; Fri, 25 Jan 2019 21:02:27 GMT (envelope-from mi@FreeBSD.org) Message-Id: <201901252102.x0PL2RPi024317@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Fri, 25 Jan 2019 21:02:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491204 - in head/security/libssh: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mi X-SVN-Commit-Paths: in head/security/libssh: . files X-SVN-Commit-Revision: 491204 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A602072B41 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.94)[-0.942,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jan 2019 21:02:29 -0000 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@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 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x20700000L) + + #include + #include 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