diff options
| author | christos <christos@pkgsrc.org> | 2015-11-18 21:00:51 +0000 |
|---|---|---|
| committer | christos <christos@pkgsrc.org> | 2015-11-18 21:00:51 +0000 |
| commit | fef80e2ed8ede5a08faac922be6fbd603f29d054 (patch) | |
| tree | 59434bf94e83115d8ed4457ea1b3b1ae2cf97bd9 /security/libssh | |
| parent | 797fc46a62b51adf279e66fb0261af33bd922465 (diff) | |
| download | pkgsrc-fef80e2ed8ede5a08faac922be6fbd603f29d054.tar.gz | |
Pass pkglint.
Diffstat (limited to 'security/libssh')
| -rw-r--r-- | security/libssh/PLIST | 24 | ||||
| -rw-r--r-- | security/libssh/distinfo | 5 | ||||
| -rw-r--r-- | security/libssh/options.mk | 8 | ||||
| -rw-r--r-- | security/libssh/patches/patch-aa | 4 |
4 files changed, 23 insertions, 18 deletions
diff --git a/security/libssh/PLIST b/security/libssh/PLIST index f53cd0d00b4..5831989d047 100644 --- a/security/libssh/PLIST +++ b/security/libssh/PLIST @@ -1,16 +1,18 @@ -@comment $NetBSD: PLIST,v 1.5 2015/11/17 15:48:23 christos Exp $ -lib/pkgconfig/libssh.pc -lib/pkgconfig/libssh_threads.pc +@comment $NetBSD: PLIST,v 1.6 2015/11/18 21:00:51 christos Exp $ include/libssh/callbacks.h -include/libssh/libssh.h -include/libssh/ssh2.h include/libssh/legacy.h -include/libssh/sftp.h +include/libssh/libssh.h +include/libssh/libsshpp.hpp include/libssh/server.h -@comment, XXX PLIST lib handling seems to be broke -lib/libssh.so.4.4.0 -lib/libssh.so.4 +include/libssh/sftp.h +include/libssh/ssh2.h +lib/cmake/libssh/libssh-config-version.cmake +lib/cmake/libssh/libssh-config.cmake lib/libssh.so -lib/libssh_threads.so.4.4.0 -lib/libssh_threads.so.4 +lib/libssh.so.4 +lib/libssh.so.4.4.0 lib/libssh_threads.so +lib/libssh_threads.so.4 +lib/libssh_threads.so.4.4.0 +lib/pkgconfig/libssh.pc +lib/pkgconfig/libssh_threads.pc diff --git a/security/libssh/distinfo b/security/libssh/distinfo index 3540887bedb..2d961a4c004 100644 --- a/security/libssh/distinfo +++ b/security/libssh/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/11/17 15:48:23 christos Exp $ +$NetBSD: distinfo,v 1.9 2015/11/18 21:00:51 christos Exp $ SHA1 (security/libssh-0.7.2.tar.xz) = 8a90e5ca14e4bc83e7073fb56992fa780ccd2a5a RMD160 (security/libssh-0.7.2.tar.xz) = df9ee04799f72e33037dc1b5dfeb3a444f75ed93 -SHA512 (security/libssh-0.7.2.tar.xz) = 9cb15254478e2522e736688052e0862c856e2c1321d090c9b9d9562504fcb59cee344c07576eeee9c6d0ac5ead137d9ff05216d973c457c6a17ffa9fba475f5a Size (security/libssh-0.7.2.tar.xz) = 350540 bytes -SHA1 (patch-aa) = 3b890219e4b031598c3eaabf8c45caea0e2f677a +SHA1 (patch-aa) = 2f9a7c8a629188f40f3c94d4304b1e44720e45ae diff --git a/security/libssh/options.mk b/security/libssh/options.mk index b4fbd3bf740..be139bd5a00 100644 --- a/security/libssh/options.mk +++ b/security/libssh/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2013/02/01 16:47:51 is Exp $ +# $NetBSD: options.mk,v 1.2 2015/11/18 21:00:51 christos Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME} PKG_OPTIONS_REQUIRED_GROUPS= crypto -PKG_OPTIONS_GROUP.crypto= openssl gcrypt +PKG_OPTIONS_GROUP.crypto= openssl libgcrypt #PKG_SUPPORTED_OPTIONS= compression PKG_SUGGESTED_OPTIONS= openssl # XXX zlib @@ -21,8 +21,8 @@ CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} .include "../../security/openssl/buildlink3.mk" .endif -.if !empty(PKG_OPTIONS:Mgcrypt) -BUILDLINK_API_DEPENDS.gcrypt+= gcrypt>=1.4 +.if !empty(PKG_OPTIONS:Mlibgcrypt) +BUILDLINK_API_DEPENDS.libgcrypt+= libgcrypt>=1.4 CONFIGURE_ARGS+= --with-libgcrypt=${BUILDLINK_PREFIX.libgcrypt:Q} CONFIGURE_ARGS+= --with-openssl=no .include "../../security/libgcrypt/buildlink3.mk" diff --git a/security/libssh/patches/patch-aa b/security/libssh/patches/patch-aa index 5328c3bb99f..c98470c0ad4 100644 --- a/security/libssh/patches/patch-aa +++ b/security/libssh/patches/patch-aa @@ -1,3 +1,7 @@ +$NetBSD: patch-aa,v 1.6 2015/11/18 21:00:51 christos Exp $ + +Disable out of source build test + --- CMakeLists.txt.orig 2015-09-16 02:44:35.000000000 -0400 +++ CMakeLists.txt 2015-11-17 10:44:55.000000000 -0500 @@ -36,8 +36,8 @@ |