diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/libssh/Makefile | 9 | ||||
| -rw-r--r-- | security/libssh/distinfo | 4 | ||||
| -rw-r--r-- | security/libssh/files/patch-include_libssh_libssh.h | 21 | ||||
| -rw-r--r-- | security/libssh/pkg-plist | 5 |
4 files changed, 10 insertions, 29 deletions
diff --git a/security/libssh/Makefile b/security/libssh/Makefile index 79f7bbeb692..bf4af7142e3 100644 --- a/security/libssh/Makefile +++ b/security/libssh/Makefile @@ -6,10 +6,9 @@ # PORTNAME= libssh -PORTVERSION= 0.4.8 -PORTREVISION= 1 +PORTVERSION= 0.5.2 CATEGORIES= security devel -MASTER_SITES= http://www.libssh.org/files/0.4/ \ +MASTER_SITES= http://www.libssh.org/files/0.5/ \ LOCAL/avl MAINTAINER= avl@FreeBSD.org @@ -48,11 +47,11 @@ PLIST_SUB+= SSH1="@comment " .endif post-patch: - @${MKDIR} ${BUILD_WRKSRC} @${RM} ${PATCH_WRKSRC}/cmake/Modules/UseDoxygen.cmake @${REINPLACE_CMD} -e '/add_subdirectory.*s)/d' \ + -e 's|LIB_INSTALL_DIR}|CMAKE_INSTALL_PREFIX}/libdata|' \ ${PATCH_WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's|ssh_static|ssh|' \ - ${PATCH_WRKSRC}/libssh/CMakeLists.txt + ${PATCH_WRKSRC}/src/CMakeLists.txt .include <bsd.port.mk> diff --git a/security/libssh/distinfo b/security/libssh/distinfo index a611503eeaf..344027a58d9 100644 --- a/security/libssh/distinfo +++ b/security/libssh/distinfo @@ -1,2 +1,2 @@ -SHA256 (libssh-0.4.8.tar.gz) = 15c239a426c7fbdddf97127ffddee6c4a5bcafac37f94987cf4f28cf218aa815 -SIZE (libssh-0.4.8.tar.gz) = 277614 +SHA256 (libssh-0.5.2.tar.gz) = 41e8b9c1af077544625e8b398582f101dacc3b8457fee1811a724ca4245ab227 +SIZE (libssh-0.5.2.tar.gz) = 317336 diff --git a/security/libssh/files/patch-include_libssh_libssh.h b/security/libssh/files/patch-include_libssh_libssh.h deleted file mode 100644 index aafe9ff41c6..00000000000 --- a/security/libssh/files/patch-include_libssh_libssh.h +++ /dev/null @@ -1,21 +0,0 @@ ---- include/libssh/libssh.h.orig 2010-10-31 18:16:26.000000000 +0900 -+++ include/libssh/libssh.h 2010-10-31 18:16:41.000000000 +0900 -@@ -22,9 +22,6 @@ - #ifndef _LIBSSH_H - #define _LIBSSH_H - --#ifdef LIBSSH_STATIC -- #define LIBSSH_API --#else - #if defined _WIN32 || defined __CYGWIN__ - #ifdef LIBSSH_EXPORTS - #ifdef __GNUC__ -@@ -46,7 +43,6 @@ - #define LIBSSH_API - #endif - #endif --#endif - - #ifdef _MSC_VER - /* Visual Studio hasn't inttypes.h so it doesn't know uint32_t */ - diff --git a/security/libssh/pkg-plist b/security/libssh/pkg-plist index 20ed0ab44c8..d958f41789e 100644 --- a/security/libssh/pkg-plist +++ b/security/libssh/pkg-plist @@ -1,4 +1,5 @@ include/libssh/callbacks.h +include/libssh/legacy.h include/libssh/libssh.h include/libssh/server.h include/libssh/sftp.h @@ -7,5 +8,7 @@ include/libssh/ssh2.h lib/libssh.a lib/libssh.so lib/libssh.so.4 -lib/libssh.so.4.1.4 +lib/libssh.so.4.2.2 +libdata/pkgconfig/libssh.pc +libdata/pkgconfig/libssh_threads.pc @dirrm include/libssh |