summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2005-12-17 23:44:25 +0000
committersalo <salo@pkgsrc.org>2005-12-17 23:44:25 +0000
commit62652c89c70480cadeeab8b09679dae5e755a070 (patch)
tree498d5b3de0d77ee894f712c59d96ef8acb4ff78f
parent82d7a850e0ed06d5c1ed74034579c31fbea4fe9d (diff)
downloadpkgsrc-62652c89c70480cadeeab8b09679dae5e755a070.tar.gz
Pullup ticket 962 - requested by Jeremy C. Reed
security fix for dropbear Revisions pulled up: - pkgsrc/security/dropbear/Makefile 1.15 - pkgsrc/security/dropbear/distinfo 1.10 - pkgsrc/security/dropbear/patches/patch-ad 1.1 Module Name: pkgsrc Committed By: reed Date: Wed Dec 14 18:00:12 UTC 2005 Modified Files: pkgsrc/security/dropbear: Makefile distinfo Added Files: pkgsrc/security/dropbear/patches: patch-ad Log Message: 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.)
-rw-r--r--security/dropbear/Makefile3
-rw-r--r--security/dropbear/distinfo3
-rw-r--r--security/dropbear/patches/patch-ad15
3 files changed, 19 insertions, 2 deletions
diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index b7148c15378..25aaf442b28 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2005/08/09 17:31:06 drochner Exp $
+# $NetBSD: Makefile,v 1.13.2.1 2005/12/17 23:44:25 salo 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..9e01c456d90 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.9.2.1 2005/12/17 23:44:25 salo 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..7d6858eadd5
--- /dev/null
+++ b/security/dropbear/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1.2.2 2005/12/17 23:44:25 salo 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++;
+ }
+