From c0666f46c745ab241ea7fee54be9fce72b65e266 Mon Sep 17 00:00:00 2001 From: seb Date: Sat, 14 Jan 2006 00:52:33 +0000 Subject: Update to version 2.3.2. Changes since last packaged version (2.3.0): 2.3.2 - fixed segfault due to checking the length of variables that I forgot to remove from build_arg_vector() since the chroot root exploit fix in 2.3.0 2.3.1 - fixed stupid bug that caused rssh not to allow rsync and rdist --- shells/rssh/Makefile | 4 ++-- shells/rssh/distinfo | 9 +++++---- shells/rssh/patches/patch-ab | 26 ++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 shells/rssh/patches/patch-ab (limited to 'shells') diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile index a0a7198c916..d380bd2d13e 100644 --- a/shells/rssh/Makefile +++ b/shells/rssh/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2005/12/29 06:22:13 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2006/01/14 00:52:33 seb Exp $ # -DISTNAME= rssh-2.3.0 +DISTNAME= rssh-2.3.2 CATEGORIES= shells security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rssh/} diff --git a/shells/rssh/distinfo b/shells/rssh/distinfo index 09e828aa113..8e73500c1ca 100644 --- a/shells/rssh/distinfo +++ b/shells/rssh/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2005/12/28 17:55:39 seb Exp $ +$NetBSD: distinfo,v 1.3 2006/01/14 00:52:33 seb Exp $ -SHA1 (rssh-2.3.0.tar.gz) = 1791d2634fe8d6d1a2c4fef8008c3d4a8f538fdd -RMD160 (rssh-2.3.0.tar.gz) = 4a90dce9825389e5c660b8ce84b1969cbb13f06a -Size (rssh-2.3.0.tar.gz) = 113701 bytes +SHA1 (rssh-2.3.2.tar.gz) = bc7154f50dec1e46cb76b3e1c00e2b1179e50d3d +RMD160 (rssh-2.3.2.tar.gz) = bcdf7d111042bbf296d624943e3350d5273676ed +Size (rssh-2.3.2.tar.gz) = 113959 bytes SHA1 (patch-aa) = 0424bd8d705c8981cdd9076ba9a1d5eb59a192f3 +SHA1 (patch-ab) = 4ea3ca63d199e6fbfbc2e1db97f95700c203b593 diff --git a/shells/rssh/patches/patch-ab b/shells/rssh/patches/patch-ab new file mode 100644 index 00000000000..db8527bb574 --- /dev/null +++ b/shells/rssh/patches/patch-ab @@ -0,0 +1,26 @@ +$NetBSD: patch-ab,v 1.1 2006/01/14 00:52:33 seb Exp $ + +--- main.c.in.orig 2006-01-03 17:25:05.000000000 +0000 ++++ main.c.in +@@ -195,7 +195,7 @@ char **build_shell_args( struct passwd u + * build_arg_vector() in the chroot helper instead... + */ + +- if ( !(argvec = (char **)malloc(6 * sizeof (char *))) ){ ++ if ( !(argvec = (char **)malloc(4 * sizeof (char *))) ){ + log_set_priority(LOG_ERR); + log_msg("OOM error in build_shell_args() (fatal)"); + exit(1); +@@ -226,9 +226,9 @@ char **build_shell_args( struct passwd u + /* change the command to run to the chroot helper */ + *cmd = PATH_CHROOT_HELPER; + +- /* set up buffer to log command line ('"' + ' ' + '\0' = 9) */ +- len = strlen(cmdline) + strlen(argvec[2]) + +- strlen(PATH_CHROOT_HELPER) + 9; ++ /* set up buffer to log command line (argvec[1] + '"' + ' ' + '\0' = 6) */ ++ len = strlen(cmdline) + ++ strlen(PATH_CHROOT_HELPER) + 6; + if ( !(temp = (char *)malloc(len)) ){ + log_set_priority(LOG_ERR); + log_msg("OOM error in build_shell_args() (fatal)"); -- cgit v1.2.3