summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/libssh/Makefile6
-rw-r--r--security/libssh/buildlink3.mk4
-rw-r--r--security/libssh/distinfo9
-rw-r--r--security/libssh/patches/patch-aa17
4 files changed, 27 insertions, 9 deletions
diff --git a/security/libssh/Makefile b/security/libssh/Makefile
index cf5102e0815..28ba4f3bffc 100644
--- a/security/libssh/Makefile
+++ b/security/libssh/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2005/12/28 17:57:14 reed Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/05 00:20:17 adrianp Exp $
#
# This package currently exists as a dependency for the hydra package but
# the later versions of it are not supported by hydra.
# This package should not be updated to the latest version available.
#
-DISTNAME= libssh-0.1
+DISTNAME= libssh-0.11
CATEGORIES= security
MASTER_SITES= http://www.0xbadc0de.be/libssh/
EXTRACT_SUFX= .tgz
@@ -18,7 +18,7 @@ GNU_CONFIGURE= YES
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libssh
- ${INSTALL_DATA} ${WRKSRC}/API.txt ${PREFIX}/share/doc/libssh
+ ${INSTALL_DATA} ${WRKSRC}/doc/API.html ${PREFIX}/share/doc/libssh
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libssh
.include "../../security/openssl/buildlink3.mk"
diff --git a/security/libssh/buildlink3.mk b/security/libssh/buildlink3.mk
index b70cc1c98e1..648f030b957 100644
--- a/security/libssh/buildlink3.mk
+++ b/security/libssh/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/06/01 22:34:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 00:20:17 adrianp Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSSH_BUILDLINK3_MK:= ${NETWIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibssh}
BUILDLINK_PACKAGES+= libssh
.if !empty(LIBSSH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libssh+= libssh>=0.1
+BUILDLINK_DEPENDS.libssh+= libssh>=0.11
BUILDLINK_PKGSRCDIR.libssh?= ../../security/libssh
.endif # LIBSSH_BUILDLINK3_MK
diff --git a/security/libssh/distinfo b/security/libssh/distinfo
index 29ee66570b8..3dc93e618a9 100644
--- a/security/libssh/distinfo
+++ b/security/libssh/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/04/17 11:34:16 adrianp Exp $
+$NetBSD: distinfo,v 1.2 2006/02/05 00:20:17 adrianp Exp $
-SHA1 (libssh-0.1.tgz) = 900d4af824bd01a21c4db7c3cc36789e3f8ab525
-RMD160 (libssh-0.1.tgz) = dc195249bbf0e04390f0ecc88012e9b2f9be24fa
-Size (libssh-0.1.tgz) = 122663 bytes
+SHA1 (libssh-0.11.tgz) = 307430249ded90332c4ec77a264913b3bc93a648
+RMD160 (libssh-0.11.tgz) = 69c2cc00becb84a62555fe884345398f155815a4
+Size (libssh-0.11.tgz) = 303761 bytes
+SHA1 (patch-aa) = 193a57b02988e5170ea4b40d4e5a5e36ab6f16ac
diff --git a/security/libssh/patches/patch-aa b/security/libssh/patches/patch-aa
new file mode 100644
index 00000000000..8bf25f42f01
--- /dev/null
+++ b/security/libssh/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2006/02/05 00:20:17 adrianp Exp $
+
+--- sample.c.orig 2005-03-04 19:54:59.000000000 +0000
++++ sample.c
+@@ -20,7 +20,12 @@ clients must be made or how a client sho
+
+ #include <sys/select.h>
+ #include <sys/time.h>
++#if defined(__NetBSD__)
++#include <sys/types.h>
++#include <util.h> /* openpty() on NetBSD */
++#else
+ #include <pty.h>
++#endif
+ #include <signal.h>
+ #include <errno.h>
+ #include <libssh/libssh.h>