- Update to 0.4.0

Thanks to:	fluffy@

5 files changed, 31 insertions, 36 deletions

diff --git a/security/libssh/Makefile b/security/libssh/Makefile
index 402af1e6c473..9d8ab5dc41ec 100644
--- a/security/libssh/Makefile
+++ b/security/libssh/Makefile
@@ -6,24 +6,37 @@
 #
 
 PORTNAME=	libssh
-PORTVERSION=	0.3.4
+PORTVERSION=	0.4.0
 CATEGORIES=	security devel
-MASTER_SITES=	http://www.libssh.org/files/
+MASTER_SITES=	http://www.libssh.org/files/ \
+		LOCAL/avl
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	A library implementing the SSH1 and SSH2 protocol
 
+OPTIONS=	GCRYPT	"Build with libgcrypt"	off
+
 MAKE_JOBS_SAFE=	yes
 USE_CMAKE=	yes
 CMAKE_SOURCE_PATH=	${WRKSRC}
 CONFIGURE_WRKSRC=	${CMAKE_SOURCE_PATH}/build
 BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
-USE_OPENSSL=	yes
+INSTALL_WRKSRC?=	${BUILD_WRKSRC}
 USE_LDCONFIG=	yes
 
+.include <bsd.port.options.mk>
+
+.if defined(WITH_GCRYPT)
+LIB_DEPENDS+=	gcrypt.16:${PORTSDIR}/security/libgcrypt
+CMAKE_ARGS+=	-DWITH_GCRYPT:BOOL=ON
+.else
+USE_OPENSSL=	yes
+.endif
+
 post-patch:
-	@${MKDIR} ${WRKSRC}/build
-	@${RM} ${WRKSRC}/cmake/Modules/UseDoxygen.cmake
+	@${MKDIR} ${BUILD_WRKSRC}
+	@${RM} ${PATCH_WRKSRC}/cmake/Modules/UseDoxygen.cmake
+	@${REINPLACE_CMD} -e '/add_subdirectory.*s)/d' \
+		${PATCH_WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/security/libssh/distinfo b/security/libssh/distinfo
index 490d88741852..257bac50af7f 100644
--- a/security/libssh/distinfo
+++ b/security/libssh/distinfo
@@ -1,3 +1,3 @@
-MD5 (libssh-0.3.4.tar.gz) = 1563f1f78cfa1ff32d214137ac62c818
-SHA256 (libssh-0.3.4.tar.gz) = d22477fa90252bf615fd0755c44006a2f9223d9da6fa04e00fa398e4a2c15761
-SIZE (libssh-0.3.4.tar.gz) = 224320
+MD5 (libssh-0.4.0.tar.gz) = bcb3d567bacd54c9f6b5b0e8c4d1102c
+SHA256 (libssh-0.4.0.tar.gz) = 95093117de68c163901ef99441e3e5d7c343fcc60d0651195870df3af4c5a5d5
+SIZE (libssh-0.4.0.tar.gz) = 250094
diff --git a/security/libssh/files/patch-CMakeLists.txt b/security/libssh/files/patch-CMakeLists.txt
deleted file mode 100644
index 10b2bf88da68..000000000000
--- a/security/libssh/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- CMakeLists.txt.orig	2009-07-14 18:53:07.000000000 +1000
-+++ CMakeLists.txt	2009-07-23 21:41:59.000000000 +1000
-@@ -55,16 +55,3 @@
- add_subdirectory(doc)
- add_subdirectory(include)
- add_subdirectory(libssh)
--
--# build samples
--include_directories(${CMAKE_SOURCE_DIR}/include)
--
--if (UNIX AND NOT WIN32)
--  if (WITH_SFTP AND WITH_SERVER)
--    add_executable(samplessh sample.c)
--    add_executable(samplesshd samplesshd.c)
--
--    target_link_libraries(samplessh ${LIBSSH_SHARED_LIBRARY})
--    target_link_libraries(samplesshd ${LIBSSH_SHARED_LIBRARY})
--  endif (WITH_SFTP AND WITH_SERVER)
--endif (UNIX AND NOT WIN32)
diff --git a/security/libssh/pkg-descr b/security/libssh/pkg-descr
index 14e8600c87e9..7f724a2cb5b4 100644
--- a/security/libssh/pkg-descr
+++ b/security/libssh/pkg-descr
@@ -10,12 +10,13 @@ libssh features:
  * Full C library functions for manipulating a client-side SSH connection
  * SSH2 and SSH1 protocol compliant
  * Fully configurable sessions
- * Server support
- * Support for AES-128,AES-192,AES-256,blowfish,3des in cbc mode
+ * Server support, SSH agent authentication support
+ * Support for AES-128, AES-192, AES-256, Blowfish, 3DES in CBC mode
  * Use multiple SSH connections in a same process, at same time
  * Use multiple channels in the same connection
  * Thread safety when using different sessions at same time
- * Basic but correct SFTP implementation (secure file transfer)
+ * POSIX-like SFTP implementation with openssh extension support
+ * SCP implementation
  * RSA and DSS server public key supported
  * Compression support (with zlib)
  * Public key (RSA and DSS), password and keyboard-interactive authentication
diff --git a/security/libssh/pkg-plist b/security/libssh/pkg-plist
index 193d939b08d0..6de352eecef7 100644
--- a/security/libssh/pkg-plist
+++ b/security/libssh/pkg-plist
@@ -1,9 +1,9 @@
-lib/libssh.so
-lib/libssh.so.3
-lib/libssh.so.3.4.0
+include/libssh/callbacks.h
 include/libssh/libssh.h
-include/libssh/sftp.h
-include/libssh/crypto.h
 include/libssh/server.h
+include/libssh/sftp.h
 include/libssh/ssh2.h
+lib/libssh.so
+lib/libssh.so.4
+lib/libssh.so.4.0.0
 @dirrm include/libssh