svn commit: r371760 - in branches/2014Q4/security/libssh: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Thu Oct 30 16:33:25 2014
New Revision: 371760
URL: https://svnweb.freebsd.org/changeset/ports/371760
QAT: https://qat.redports.org/buildarchive/r371760/

Log:
  MFH: r371716
  
  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)
  Security:	f8c88d50-5fb3-11e4-81bd-5453ed2e2b49
  
  Approved by:	ports-secteam (ray)

Deleted:
  branches/2014Q4/security/libssh/files/
Modified:
  branches/2014Q4/security/libssh/Makefile
  branches/2014Q4/security/libssh/distinfo
  branches/2014Q4/security/libssh/pkg-plist
Directory Properties:
  branches/2014Q4/   (props changed)

Modified: branches/2014Q4/security/libssh/Makefile
==============================================================================
--- branches/2014Q4/security/libssh/Makefile	Thu Oct 30 16:30:36 2014	(r371759)
+++ branches/2014Q4/security/libssh/Makefile	Thu Oct 30 16:33:25 2014	(r371760)
@@ -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 at 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>

Modified: branches/2014Q4/security/libssh/distinfo
==============================================================================
--- branches/2014Q4/security/libssh/distinfo	Thu Oct 30 16:30:36 2014	(r371759)
+++ branches/2014Q4/security/libssh/distinfo	Thu Oct 30 16:33:25 2014	(r371760)
@@ -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

Modified: branches/2014Q4/security/libssh/pkg-plist
==============================================================================
--- branches/2014Q4/security/libssh/pkg-plist	Thu Oct 30 16:30:36 2014	(r371759)
+++ branches/2014Q4/security/libssh/pkg-plist	Thu Oct 30 16:33:25 2014	(r371760)
@@ -10,11 +10,11 @@ lib/cmake/libssh/libssh-config-version.c
 %%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
 @dirrm lib/cmake/libssh