Attachment 254297 Details for Bug 282147 – Patch for libssh2 v2

[patch] Patch for libssh2 v2

libssh2-1111v2.patch (text/plain), 4.12 KB, created by Daniel Engberg on 2024-10-16 22:18:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2024-10-16 22:18:44 UTC

Size: 4.12 KB

patch

obsolete

>diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile
>index 2da108318e84..2ef24fa200cb 100644
>--- a/security/libssh2/Makefile
>+++ b/security/libssh2/Makefile
>@@ -1,10 +1,9 @@
> PORTNAME=	libssh2
>-PORTVERSION=	1.11.0
>-PORTREVISION=	1
>+DISTVERSION=	1.11.1
> PORTEPOCH=	3
> CATEGORIES=	security devel
>-MASTER_SITES=	https://www.libssh2.org/download/ \
>-		LOCAL/sbz
>+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/ \
>+		https://www.libssh2.org/download/
> 
> MAINTAINER=	sbz@FreeBSD.org
> COMMENT=	Library implementing the SSH2 protocol
>@@ -13,37 +12,32 @@ WWW=		https://www.libssh2.org/
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		compiler:c11 cpe libtool pathfix
>+USES=		cmake:testing cpe pathfix pkgconfig tar:xz
> USE_LDCONFIG=	yes
>-GNU_CONFIGURE=	yes
>-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
>-INSTALL_TARGET=	install-strip
>-TEST_TARGET=	check
> 
>-OPTIONS_DEFINE=	GCRYPT TRACE ZLIB
>-OPTIONS_DEFAULT=	ZLIB
>+CMAKE_OFF=	BUILD_EXAMPLES \
>+		BUILD_TESTING \
>+		RUN_DOCKER_TESTS \
>+		RUN_SSHD_TESTS
> 
>-TRACE_DESC=	Enable debug packet traces
>+CMAKE_ON=	ZLIB_CMAKE_BOOL
>+
>+OPTIONS_DEFINE=		STATIC TRACE
>+OPTIONS_SINGLE=		SSL
>+OPTIONS_SINGLE_SSL=	GCRYPT OPENSSL
>+OPTIONS_DEFAULT=	OPENSSL ZLIB
>+OPTIONS_SUB=		yes
>+
>+TRACE_DESC=		Enable debug packet traces
> 
> GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
>-GCRYPT_USES_OFF=	ssl
>-GCRYPT_CONFIGURE_ON=	--with-crypto=libgcrypt
>-GCRYPT_CONFIGURE_OFF=	--with-crypto=openssl
>-GCRYPT_CPPFLAGS=	-I${LOCALBASE}/include
>-GCRYPT_LIBS=		-L${LOCALBASE}/lib
>-TRACE_CONFIGURE_ENABLE=	debug
>-ZLIB_CONFIGURE_WITH=	libz
>-
>-.include <bsd.port.pre.mk>
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e '/Libs:/s/@LIBS@//' \
>-		${WRKSRC}/libssh2.pc.in
>-.if ! ${PORT_OPTIONS:MGCRYPT}
>-.  if ${SSL_DEFAULT} == base
>-	@${REINPLACE_CMD} -e 's/LIBSREQUIRED="$$LIBSREQUIRED$${LIBSREQUIRED:+ }libssl libcrypto"/LIBS="$$LIBS -lssl -lcrypto"/' \
>-		${WRKSRC}/configure
>-.  endif
>-.endif
>-
>-.include <bsd.port.post.mk>
>+GCRYPT_CMAKE_ON=	-DCRYPTO_BACKEND=Libgcrypt
>+
>+OPENSSL_USES=		ssl
>+OPENSSL_CMAKE_ON=	-DCRYPTO_BACKEND=OpenSSL
>+
>+STATIC_CMAKE_BOOL=	BUILD_STATIC_LIBS
>+
>+TRACE_CMAKE_BOOL=	ENABLE_DEBUG_LOGGING
>+
>+.include <bsd.port.mk>
>diff --git a/security/libssh2/distinfo b/security/libssh2/distinfo
>index 90ed42c342f2..b41509a91849 100644
>--- a/security/libssh2/distinfo
>+++ b/security/libssh2/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1685548702
>-SHA256 (libssh2-1.11.0.tar.gz) = 3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461
>-SIZE (libssh2-1.11.0.tar.gz) = 1053562
>+TIMESTAMP = 1729096176
>+SHA256 (libssh2-1.11.1.tar.xz) = 9954cb54c4f548198a7cbebad248bdc87dd64bd26185708a294b2b50771e3769
>+SIZE (libssh2-1.11.1.tar.xz) = 721700
>diff --git a/security/libssh2/pkg-plist b/security/libssh2/pkg-plist
>index 151d702b731d..b998144cf0b9 100644
>--- a/security/libssh2/pkg-plist
>+++ b/security/libssh2/pkg-plist
>@@ -1,7 +1,14 @@
> include/libssh2.h
> include/libssh2_publickey.h
> include/libssh2_sftp.h
>-lib/libssh2.a
>+lib/cmake/libssh2/FindLibgcrypt.cmake
>+lib/cmake/libssh2/FindMbedTLS.cmake
>+lib/cmake/libssh2/FindWolfSSL.cmake
>+lib/cmake/libssh2/libssh2-config-version.cmake
>+lib/cmake/libssh2/libssh2-config.cmake
>+lib/cmake/libssh2/libssh2-targets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/libssh2/libssh2-targets.cmake
>+%%STATIC%%lib/libssh2.a
> lib/libssh2.so
> lib/libssh2.so.1
> lib/libssh2.so.1.0.1
>@@ -106,6 +113,7 @@ share/man/man3/libssh2_session_banner_get.3.gz
> share/man/man3/libssh2_session_banner_set.3.gz
> share/man/man3/libssh2_session_block_directions.3.gz
> share/man/man3/libssh2_session_callback_set.3.gz
>+share/man/man3/libssh2_session_callback_set2.3.gz
> share/man/man3/libssh2_session_disconnect.3.gz
> share/man/man3/libssh2_session_disconnect_ex.3.gz
> share/man/man3/libssh2_session_flag.3.gz
>@@ -146,6 +154,8 @@ share/man/man3/libssh2_sftp_open_ex.3.gz
> share/man/man3/libssh2_sftp_open_ex_r.3.gz
> share/man/man3/libssh2_sftp_open_r.3.gz
> share/man/man3/libssh2_sftp_opendir.3.gz
>+share/man/man3/libssh2_sftp_posix_rename.3.gz
>+share/man/man3/libssh2_sftp_posix_rename_ex.3.gz
> share/man/man3/libssh2_sftp_read.3.gz
> share/man/man3/libssh2_sftp_readdir.3.gz
> share/man/man3/libssh2_sftp_readdir_ex.3.gz

Actions: View | Diff

Attachments on bug 282147: 254295 | 254297 | 254298