svn commit: r386027 - head/security/libssh

[Raphael Kubo da Costa]

Author: rakuco
Date: Sun May 10 20:25:58 2015
New Revision: 386027
URL: https://svnweb.freebsd.org/changeset/ports/386027

Log:
  Update to 0.6.5 to fix CVE-2015-3146 (null pointer dereference).
  
  This release also fixed the bug in 0.6.4 that prevented the GCRYPT option
  from working.
  
  PR:		200106
  Approved by:	johans
  MFH:		2015Q2
  Security:	0b040e24-f751-11e4-b24d-5453ed2e2b49

Modified:
  head/security/libssh/Makefile
  head/security/libssh/distinfo
  head/security/libssh/pkg-plist

Modified: head/security/libssh/Makefile
==============================================================================
--- head/security/libssh/Makefile	Sun May 10 20:24:26 2015	(r386026)
+++ head/security/libssh/Makefile	Sun May 10 20:25:58 2015	(r386027)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	libssh
-DISTVERSION=	0.6.4
+DISTVERSION=	0.6.5
 CATEGORIES=	security devel
-MASTER_SITES=	https://red.libssh.org/attachments/download/107/
+MASTER_SITES=	https://red.libssh.org/attachments/download/121/
 
 MAINTAINER=	johans at FreeBSD.org
 COMMENT=	Library implementing the SSH1 and SSH2 protocol
@@ -13,13 +13,12 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	SSH1 STATIC
-# Version 0.6.4 does not build with GCRYPT
-#OPTIONS_RADIO=	CRYPTO
-#OPTIONS_RADIO_CRYPTO=	GCRYPT OPENSSL
-#OPTIONS_DEFAULT=	OPENSSL STATIC
+OPTIONS_RADIO=	CRYPTO
+OPTIONS_RADIO_CRYPTO=	GCRYPT OPENSSL
+OPTIONS_DEFAULT=	OPENSSL STATIC
 OPTIONS_SUB=	yes
 
-USES=		cmake:outsource cpe
+USES=		cmake:outsource cpe tar:xz
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DWITH_EXAMPLES:BOOL=OFF \

Modified: head/security/libssh/distinfo
==============================================================================
--- head/security/libssh/distinfo	Sun May 10 20:24:26 2015	(r386026)
+++ head/security/libssh/distinfo	Sun May 10 20:25:58 2015	(r386027)
@@ -1,2 +1,2 @@
-SHA256 (libssh-0.6.4.tar.gz) = 7e3205e2e95bf35b23b83a6485a7d59abe7c7546d01b728f691cf0c374216b52
-SIZE (libssh-0.6.4.tar.gz) = 381835
+SHA256 (libssh-0.6.5.tar.xz) = 0fd52763e033d5e9b1cd55f60a74e619731c5ba630938eec95682dbe4cf7dc2c
+SIZE (libssh-0.6.5.tar.xz) = 281564

Modified: head/security/libssh/pkg-plist
==============================================================================
--- head/security/libssh/pkg-plist	Sun May 10 20:24:26 2015	(r386026)
+++ head/security/libssh/pkg-plist	Sun May 10 20:25:58 2015	(r386027)
@@ -1,6 +1,7 @@
 include/libssh/callbacks.h
 include/libssh/legacy.h
 include/libssh/libssh.h
+include/libssh/libsshpp.hpp
 include/libssh/server.h
 include/libssh/sftp.h
 %%SSH1%%include/libssh/ssh1.h
@@ -10,10 +11,10 @@ lib/cmake/libssh/libssh/libssh-config-ve
 %%STATIC%%lib/libssh.a
 lib/libssh.so
 lib/libssh.so.4
-lib/libssh.so.4.5.0
+lib/libssh.so.4.5.1
 %%STATIC%%lib/libssh_threads.a
 lib/libssh_threads.so
 lib/libssh_threads.so.4
-lib/libssh_threads.so.4.5.0
+lib/libssh_threads.so.4.5.1
 libdata/pkgconfig/libssh.pc
 libdata/pkgconfig/libssh_threads.pc