From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 13 10:00:53 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F15EFCF; Mon, 13 Apr 2015 10:00:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 30631E76; Mon, 13 Apr 2015 10:00:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3DA0rqG090589; Mon, 13 Apr 2015 10:00:53 GMT (envelope-from johans@FreeBSD.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3DA0qXT090583; Mon, 13 Apr 2015 10:00:52 GMT (envelope-from johans@FreeBSD.org) Message-Id: <201504131000.t3DA0qXT090583@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: johans set sender to johans@FreeBSD.org using -f From: Johan van Selst Date: Mon, 13 Apr 2015 10:00:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r383905 - branches/2015Q2/security/libssh X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2015 10:00:53 -0000 Author: johans Date: Mon Apr 13 10:00:51 2015 New Revision: 383905 URL: https://svnweb.freebsd.org/changeset/ports/383905 Log: MFH: r383813 - Update to libssh 0.6.4 (security and bugfix release) https://www.libssh.org/2014/12/19/libssh-0-6-4-security-and-bugfix-release/ - This version does not compile with gcrypt: force use of openssl - Adopt port Approved by: ports-secteam Modified: branches/2015Q2/security/libssh/Makefile branches/2015Q2/security/libssh/distinfo branches/2015Q2/security/libssh/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/security/libssh/Makefile ============================================================================== --- branches/2015Q2/security/libssh/Makefile Mon Apr 13 08:11:42 2015 (r383904) +++ branches/2015Q2/security/libssh/Makefile Mon Apr 13 10:00:51 2015 (r383905) @@ -2,24 +2,24 @@ # $FreeBSD$ PORTNAME= libssh -DISTVERSION= 0.6.3 -PORTREVISION= 1 +DISTVERSION= 0.6.4 CATEGORIES= security devel -MASTER_SITES= https://red.libssh.org/attachments/download/87/ +MASTER_SITES= https://red.libssh.org/attachments/download/107/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= johans@FreeBSD.org COMMENT= Library implementing the SSH1 and SSH2 protocol LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING OPTIONS_DEFINE= SSH1 STATIC -OPTIONS_RADIO= CRYPTO -OPTIONS_RADIO_CRYPTO= GCRYPT OPENSSL -OPTIONS_DEFAULT= OPENSSL STATIC +# Version 0.6.4 does not build with GCRYPT +#OPTIONS_RADIO= CRYPTO +#OPTIONS_RADIO_CRYPTO= GCRYPT OPENSSL +#OPTIONS_DEFAULT= OPENSSL STATIC OPTIONS_SUB= yes -USES= cmake:outsource cpe tar:xz +USES= cmake:outsource cpe USE_LDCONFIG= yes CMAKE_ARGS= -DWITH_EXAMPLES:BOOL=OFF \ Modified: branches/2015Q2/security/libssh/distinfo ============================================================================== --- branches/2015Q2/security/libssh/distinfo Mon Apr 13 08:11:42 2015 (r383904) +++ branches/2015Q2/security/libssh/distinfo Mon Apr 13 10:00:51 2015 (r383905) @@ -1,2 +1,2 @@ -SHA256 (libssh-0.6.3.tar.xz) = 2bb5d7c595059f990a8915c190169257328ffa828ced0c05b09bbe186092cacb -SIZE (libssh-0.6.3.tar.xz) = 279492 +SHA256 (libssh-0.6.4.tar.gz) = 7e3205e2e95bf35b23b83a6485a7d59abe7c7546d01b728f691cf0c374216b52 +SIZE (libssh-0.6.4.tar.gz) = 381835 Modified: branches/2015Q2/security/libssh/pkg-plist ============================================================================== --- branches/2015Q2/security/libssh/pkg-plist Mon Apr 13 08:11:42 2015 (r383904) +++ branches/2015Q2/security/libssh/pkg-plist Mon Apr 13 10:00:51 2015 (r383905) @@ -5,15 +5,15 @@ include/libssh/server.h include/libssh/sftp.h %%SSH1%%include/libssh/ssh1.h include/libssh/ssh2.h -lib/cmake/libssh/libssh-config.cmake -lib/cmake/libssh/libssh-config-version.cmake +lib/cmake/libssh/libssh/libssh-config.cmake +lib/cmake/libssh/libssh/libssh-config-version.cmake %%STATIC%%lib/libssh.a lib/libssh.so lib/libssh.so.4 -lib/libssh.so.4.4.1 +lib/libssh.so.4.5.0 %%STATIC%%lib/libssh_threads.a lib/libssh_threads.so lib/libssh_threads.so.4 -lib/libssh_threads.so.4.4.1 +lib/libssh_threads.so.4.5.0 libdata/pkgconfig/libssh.pc libdata/pkgconfig/libssh_threads.pc