From 08f031e16d32f47606592df7258df5dda9c40351 Mon Sep 17 00:00:00 2001
From: reed <reed@pkgsrc.org>
Date: Wed, 14 Dec 2005 18:00:12 +0000
Subject: Add security patch from 
 http://lists.ucc.gu.uwa.edu.au/pipermail/dropbear/2005q4/000312.html

Noted by waldeck of hk2.uwaterloo.ca via pkgsrc-bugs.

Bump PKGREVISION.

Tested build on NetBSD and Linux. Tested dropbear server on NetBSD.

(This is during a freeze. Other stuff to be done later:
update to latest version. Install man pages. Mention "client" in
COMMENT and DESCR. Use CONF_FILES and sysconfdir. And maybe install the
"scp" tool also.)
---
 security/dropbear/Makefile         |  3 ++-
 security/dropbear/distinfo         |  3 ++-
 security/dropbear/patches/patch-ad | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 security/dropbear/patches/patch-ad

(limited to 'security')

diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index 0435f6a77c5..52993fd920a 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:55 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/14 18:00:12 reed Exp $
 
 DISTNAME=	dropbear-0.46
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://matt.ucc.asn.au/dropbear/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/security/dropbear/distinfo b/security/dropbear/distinfo
index 8edb6665956..d1c83e52539 100644
--- a/security/dropbear/distinfo
+++ b/security/dropbear/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/08/09 17:31:06 drochner Exp $
+$NetBSD: distinfo,v 1.10 2005/12/14 18:00:12 reed Exp $
 
 SHA1 (dropbear-0.46.tar.bz2) = 2b6d2083ec0294fde55c75e4080c06637cbcf833
 RMD160 (dropbear-0.46.tar.bz2) = f7c61b021705362f55209bc0f383d0bf3336841e
@@ -6,3 +6,4 @@ Size (dropbear-0.46.tar.bz2) = 1413918 bytes
 SHA1 (patch-aa) = 3246fce39551e97f0b9ecd3397479ea2f3e22abd
 SHA1 (patch-ab) = 7096feb1f8cc7372410f2e94d7961190a6974fad
 SHA1 (patch-ac) = 5a8bc0ccaba26fcf497de554a5c3a9478203adb1
+SHA1 (patch-ad) = 4dd93da76596411dadb731e85208c07baf707d03
diff --git a/security/dropbear/patches/patch-ad b/security/dropbear/patches/patch-ad
new file mode 100644
index 00000000000..ea9360ec685
--- /dev/null
+++ b/security/dropbear/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2005/12/14 18:00:12 reed Exp $
+
+security patch from http://lists.ucc.gu.uwa.edu.au/pipermail/dropbear/2005q4/000312.html
+
+--- svr-chansession.c.orig	2005-12-14 09:32:29.056688256 -0800
++++ svr-chansession.c	2005-12-14 09:33:13.361952832 -0800
+@@ -810,7 +810,7 @@
+ 	/* need to increase size */
+ 	if (i == svr_ses.childpidsize) {
+ 		svr_ses.childpids = (struct ChildPid*)m_realloc(svr_ses.childpids,
+-				sizeof(struct ChildPid) * svr_ses.childpidsize+1);
++				sizeof(struct ChildPid) * (svr_ses.childpidsize+1));
+ 		svr_ses.childpidsize++;
+ 	}
+ 	
-- 
cgit v1.2.3