diff options
-rw-r--r-- | security/dropbear/Makefile | 6 | ||||
-rw-r--r-- | security/dropbear/distinfo | 9 | ||||
-rw-r--r-- | security/dropbear/patches/patch-ac | 24 |
3 files changed, 8 insertions, 31 deletions
diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile index 56fad223a05..b4a98c6ceb1 100644 --- a/security/dropbear/Makefile +++ b/security/dropbear/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.24 2009/08/26 21:10:11 snj Exp $ +# $NetBSD: Makefile,v 1.25 2011/03/10 10:20:16 drochner Exp $ -DISTNAME= dropbear-0.52 +DISTNAME= dropbear-0.53.1 CATEGORIES= security MASTER_SITES= http://matt.ucc.asn.au/dropbear/releases/ @@ -65,4 +65,6 @@ post-install: ${INSTALL_PROGRAM} ${WRKSRC}/scp ${DESTDIR}/${PREFIX}/bin/dbscp .include "../../devel/zlib/buildlink3.mk" +.include "../../math/ltm/buildlink3.mk" +.include "../../security/libtomcrypt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/dropbear/distinfo b/security/dropbear/distinfo index 5fbd2e0021f..ac88cc951f0 100644 --- a/security/dropbear/distinfo +++ b/security/dropbear/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.17 2009/08/26 21:10:11 snj Exp $ +$NetBSD: distinfo,v 1.18 2011/03/10 10:20:16 drochner Exp $ -SHA1 (dropbear-0.52.tar.gz) = ae927e8b90059a7ba2b2b514d9824c12885b1949 -RMD160 (dropbear-0.52.tar.gz) = 3cc8398ffc265e28d8c8d3c80845236b143a6268 -Size (dropbear-0.52.tar.gz) = 1789901 bytes +SHA1 (dropbear-0.53.1.tar.gz) = 2faf6ca592b70783029c0ec4d4fc9a390fb12e19 +RMD160 (dropbear-0.53.1.tar.gz) = 9d69f6e112f467a43b375d50565f969549615ee5 +Size (dropbear-0.53.1.tar.gz) = 1772583 bytes SHA1 (patch-aa) = 01bf4d80c4e76f9a60341b448cd7e77b2a03c286 SHA1 (patch-ab) = 911a0525f309386901d32c23404d13ae67c2e2d1 -SHA1 (patch-ac) = 69b1349bb47ad6a6ae02096f1ebde87a1461dd9b diff --git a/security/dropbear/patches/patch-ac b/security/dropbear/patches/patch-ac deleted file mode 100644 index a243a109f24..00000000000 --- a/security/dropbear/patches/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2006/03/14 20:03:43 drochner Exp $ - ---- svr-authpam.c.orig 2006-03-12 05:52:52.000000000 +0100 -+++ svr-authpam.c -@@ -124,7 +124,8 @@ pamConvFunc(int num_msg, - case PAM_PROMPT_ECHO_ON: - - if (!((strcmp(compare_message, "login:" ) == 0) -- || (strcmp(compare_message, "please enter username:") == 0))) { -+ || (strcmp(compare_message, "please enter username:") == 0) -+ || (strcmp(compare_message, "username:" ) == 0))) { - /* We don't recognise the prompt as asking for a username, - so can't handle it. Add more above as required for - different pam modules/implementations */ -@@ -212,7 +213,9 @@ void svr_auth_pam() { - goto cleanup; - } - -+#ifndef __NetBSD__ - (void) pam_fail_delay(pamHandlep, 0 /* musec_delay */); -+#endif - - /* (void) pam_set_item(pamHandlep, PAM_FAIL_DELAY, (void*) pamDelayFunc); */ - |