Attachment 198260 Details for Bug 232344 – patch

[patch] patch

libssh.diff (text/plain), 2.10 KB, created by Kurt Jaeger on 2018-10-17 07:55:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2018-10-17 07:55:04 UTC

Size: 2.10 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 482269)
>+++ Makefile	(working copy)
>@@ -2,9 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	libssh
>-DISTVERSION=	0.7.5
>+DISTVERSION=	0.8.4
> CATEGORIES=	security devel
>-MASTER_SITES=	https://git.libssh.org/projects/libssh.git/snapshot/
>+MASTER_SITES=	https://www.libssh.org/files/0.8/
> 
> MAINTAINER=	johans@FreeBSD.org
> COMMENT=	Library implementing the SSH1 and SSH2 protocol
>@@ -43,14 +43,14 @@
> STATIC_CMAKE_OFF=	-DWITH_STATIC_LIB:BOOL=OFF
> 
> post-patch:
>-	@${RM} ${PATCH_WRKSRC}/cmake/Modules/UseDoxygen.cmake
>-	@${REINPLACE_CMD} \
>+	${RM} ${PATCH_WRKSRC}/cmake/Modules/UseDoxygen.cmake
>+	${REINPLACE_CMD} \
> 		-e 's|LIB_INSTALL_DIR}|CMAKE_INSTALL_PREFIX}/libdata|' \
> 		-e 's|CMAKE_INSTALL_DIR}|CMAKE_INSTALL_DIR}/libssh|' \
> 		${WRKSRC}/CMakeLists.txt
>-	@${REINPLACE_CMD} -e 's|-lssh_threads|-lssh_threads -lpthread|' \
>-		${WRKSRC}/libssh_threads.pc.cmake
>-	@${REINPLACE_CMD} -e 's| -pedantic-errors||' \
>+#	${REINPLACE_CMD} -e 's|-lssh_threads|-lssh_threads -lpthread|' \
>+#		${WRKSRC}/libssh_threads.pc.cmake
>+	${REINPLACE_CMD} -e 's| -pedantic-errors||' \
> 		${WRKSRC}/cmake/Modules/DefineCompilerFlags.cmake
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 482269)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1493578451
>-SHA256 (libssh-0.7.5.tar.xz) = 6f7d5b9f3089164eec7408d35b99194b17352cce436a4a95485b511bce2aab4b
>-SIZE (libssh-0.7.5.tar.xz) = 351364
>+TIMESTAMP = 1539760504
>+SHA256 (libssh-0.8.4.tar.xz) = 6bb07713021a8586ba2120b2c36c468dc9ac8096d043f9b1726639aa4275b81b
>+SIZE (libssh-0.8.4.tar.xz) = 425848
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 482269)
>+++ pkg-plist	(working copy)
>@@ -11,10 +11,5 @@
> %%STATIC%%lib/libssh.a
> lib/libssh.so
> lib/libssh.so.4
>-lib/libssh.so.4.4.2
>-%%STATIC%%lib/libssh_threads.a
>-lib/libssh_threads.so
>-lib/libssh_threads.so.4
>-lib/libssh_threads.so.4.4.2
>+lib/libssh.so.4.7.1
> libdata/pkgconfig/libssh.pc
>-libdata/pkgconfig/libssh_threads.pc

Actions: View | Diff

Attachments on bug 232344: 198260