Update to 0.6.3 to fix CVE-2014-0017.

While here, get rid of a lot of cruft:
- Use an https in MASTER_SITES and stop using a snapshot URL for the
  tarballs.
- Switch to an out-of-source CMake build with USES=cmake:outsource, and get
  rid of all the messing around with CMAKE_SOURCE_PATH and *_WRKSRC.
- Move the LICENSE block to the right place to pet portlint.
- Explicitly set CMAKE_ARGS with some options which we were already
  implicitly assuming to be set.
- Disable examples and tests via CMAKE_ARGS instead of using an ugly sed
  call.
- Do not pass WITH_OPENSSL=ON/OFF to CMake, this has no effect in the build
  system.
- Stop gratuitously including bsd.port.options.mk.
- Remove sed calls and patches related to the libssh_threads. I fixed some
  of the problems a few releases ago upstream, and the things I've removed
  now just look unnecessary.

PR:		187595
Approved by:	fluffy (implicit, and 230 days of timeout)
MFH:		2014Q4
Security:	f8c88d50-5fb3-11e4-81bd-5453ed2e2b49

4 files changed, 17 insertions, 64 deletions

diff --git a/security/libssh/Makefile b/security/libssh/Makefile
index 87c4d701a915..b8f73faeaae3 100644
--- a/security/libssh/Makefile
+++ b/security/libssh/Makefile
@@ -2,38 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	libssh
-DISTVERSION=	0.6.1
-PORTREVISION=	1
+DISTVERSION=	0.6.3
 CATEGORIES=	security devel
-MASTER_SITES=	http://git.libssh.org/projects/libssh.git/snapshot/ \
-		LOCAL/fluffy
+MASTER_SITES=	https://red.libssh.org/attachments/download/87/
 
 MAINTAINER=	fluffy@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
 OPTIONS_SUB=	yes
 
-USES=		cmake tar:bzip2
-CMAKE_SOURCE_PATH=	${WRKSRC}
-CONFIGURE_WRKSRC=	${CMAKE_SOURCE_PATH}/build
-BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC?=	${BUILD_WRKSRC}
+USES=		cmake:outsource tar:xz
 USE_LDCONFIG=	yes
 
-LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
+CMAKE_ARGS=	-DWITH_EXAMPLES:BOOL=OFF \
+		-DWITH_GSSAPI:BOOL=ON \
+		-DWITH_TESTING:BOOL=OFF \
+		-DWITH_ZLIB:BOOL=ON
 
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
 GCRYPT_CMAKE_ON=	-DWITH_GCRYPT:BOOL=ON
 GCRYPT_CMAKE_OFF=	-DWITH_GCRYPT:BOOL=OFF
 
 OPENSSL_USE=		openssl=yes
-OPENSSL_CMAKE_ON=	-DWITH_OPENSSL:BOOL=ON
-OPENSSL_CMAKE_OFF=	-DWITH_OPENSSL:BOOL=OFF
 
 SSH1_DESC=		Build with SSH1 support
 SSH1_CMAKE_ON=		-DWITH_SSH1:BOOL=ON
@@ -42,19 +39,14 @@ SSH1_CMAKE_OFF=		-DWITH_SSH1:BOOL=OFF
 STATIC_CMAKE_ON=	-DWITH_STATIC_LIB:BOOL=ON
 STATIC_CMAKE_OFF=	-DWITH_STATIC_LIB:BOOL=OFF
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${RM} ${PATCH_WRKSRC}/cmake/Modules/UseDoxygen.cmake
-	@${REINPLACE_CMD} -e '/add_subdirectory.*s)/d' \
+	@${REINPLACE_CMD} \
 		-e 's|LIB_INSTALL_DIR}|CMAKE_INSTALL_PREFIX}/libdata|' \
 		-e 's|CMAKE_INSTALL_DIR}|CMAKE_INSTALL_DIR}/libssh|' \
-		${PATCH_WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's|CMAKE_HAVE_THREADS_LIBRARY|CMAKE_USE_PTHREADS_INIT|' \
-		${PATCH_WRKSRC}/src/threads/CMakeLists.txt \
-		${PATCH_WRKSRC}/src/CMakeLists.txt
+		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|-lssh_threads|-lssh_threads ${PTHREAD_LIBS}|' \
 		-e 's|$${INCLUDE_INSTALL_DIR}|$${INCLUDE_INSTALL_DIR} ${PTHREAD_CFLAGS}|' \
-		${PATCH_WRKSRC}/libssh_threads.pc.cmake
+		${WRKSRC}/libssh_threads.pc.cmake
 
 .include <bsd.port.mk>
diff --git a/security/libssh/distinfo b/security/libssh/distinfo
index dc388171fbd3..ae0fe77acc23 100644
--- a/security/libssh/distinfo
+++ b/security/libssh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libssh-0.6.1.tar.bz2) = dc48605f8d16f86199a74bfc1976e871c3201aec649b23167c8c3d683aa2117a
-SIZE (libssh-0.6.1.tar.bz2) = 300257
+SHA256 (libssh-0.6.3.tar.xz) = 2bb5d7c595059f990a8915c190169257328ffa828ced0c05b09bbe186092cacb
+SIZE (libssh-0.6.3.tar.xz) = 279492
diff --git a/security/libssh/files/patch-src__threads__CMakeLists.txt b/security/libssh/files/patch-src__threads__CMakeLists.txt
deleted file mode 100644
index 5250a19396c1..000000000000
--- a/security/libssh/files/patch-src__threads__CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./src/threads/CMakeLists.txt
-+++ ./src/threads/CMakeLists.txt
-@@ -24,30 +24,12 @@ if (WITH_STATIC_LIB)
- endif (WITH_STATIC_LIB)
- 
- set(LIBSSH_THREADS_LINK_LIBRARIES
--    ${LIBSSH_SHARED_LIBRARY}
--)
--
--set(libssh_threads_SRCS
--)
--
--# build and link pthread
--if (CMAKE_USE_PTHREADS_INIT)
--    set(libssh_threads_SRCS
--        ${libssh_threads_SRCS}
--        pthread.c
--    )
--
--    set(LIBSSH_THREADS_LINK_LIBRARIES
--        ${LIBSSH_THREADS_LINK_LIBRARIES}
--        ${CMAKE_THREAD_LIBS_INIT}
--    )
--endif (CMAKE_USE_PTHREADS_INIT)
--
--set(LIBSSH_THREADS_LINK_LIBRARIES
--  ${LIBSSH_THREADS_LINK_LIBRARIES}
-+  ${LIBSSH_SHARED_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}
-   CACHE INTERNAL "libssh threads link libraries"
- )
- 
-+set(libssh_threads_SRCS pthread.c)
-+
- include_directories(
-   ${LIBSSH_THREADS_PUBLIC_INCLUDE_DIRS}
-   ${LIBSSH_THREADS_PRIVATE_INCLUDE_DIRS}
-
-
-
diff --git a/security/libssh/pkg-plist b/security/libssh/pkg-plist
index feaba321997f..b549cea9d824 100644
--- a/security/libssh/pkg-plist
+++ b/security/libssh/pkg-plist
@@ -10,10 +10,10 @@ lib/cmake/libssh/libssh-config-version.cmake
 %%STATIC%%lib/libssh.a
 lib/libssh.so
 lib/libssh.so.4
-lib/libssh.so.4.4.0
+lib/libssh.so.4.4.1
 %%STATIC%%lib/libssh_threads.a
 lib/libssh_threads.so
 lib/libssh_threads.so.4
-lib/libssh_threads.so.4.4.0
+lib/libssh_threads.so.4.4.1
 libdata/pkgconfig/libssh.pc
 libdata/pkgconfig/libssh_threads.pc