Changes 2.3.3:

This release solves two small bugs, with minor security implications.

4 files changed, 24 insertions, 26 deletions

diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile
index f48b4556eb5..299f05feec7 100644
--- a/shells/rssh/Makefile
+++ b/shells/rssh/Makefile
@@ -1,22 +1,20 @@
-# $NetBSD: Makefile,v 1.11 2010/02/12 00:27:18 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.12 2010/10/16 09:57:38 adam Exp $
 
-DISTNAME=		rssh-2.3.2
-CATEGORIES=		shells security
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rssh/}
+DISTNAME=	rssh-2.3.3
+CATEGORIES=	shells security
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rssh/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://rssh.sourceforge.net/
-COMMENT=		Restricted shell allowing only scp and/or sftp
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://rssh.sourceforge.net/
+COMMENT=	Restricted shell allowing only scp and/or sftp
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 .if !exists(/usr/include/wordexp.h)
-PKG_SKIP_REASON+=	"${PKGNAME} requires wordexp(3)"
+PKG_FAIL_REASON+=	"${PKGNAME} requires wordexp(3)"
 .endif
 
 EGDIR=			${PREFIX}/share/examples/rssh
diff --git a/shells/rssh/distinfo b/shells/rssh/distinfo
index 0827a65b6d3..bd34e7bb83e 100644
--- a/shells/rssh/distinfo
+++ b/shells/rssh/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2010/02/12 00:27:18 joerg Exp $
+$NetBSD: distinfo,v 1.5 2010/10/16 09:57:38 adam Exp $
 
-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) = c1be257e75bf4658606c0ff7cf7b42a02f1033f0
-SHA1 (patch-ab) = 4ea3ca63d199e6fbfbc2e1db97f95700c203b593
+SHA1 (rssh-2.3.3.tar.gz) = 0a6dd80b5e6059e0db12c9f1276121dd966b610a
+RMD160 (rssh-2.3.3.tar.gz) = e9f5c3a8f8cecd6b29c6b85a2672cd22481ef8b5
+Size (rssh-2.3.3.tar.gz) = 119510 bytes
+SHA1 (patch-aa) = 778908260daf0f73367037bd5a37a6e7c888ac78
+SHA1 (patch-ab) = 19a5f7ffe3fef0c6aa17c1611c564c45a802ea96
diff --git a/shells/rssh/patches/patch-aa b/shells/rssh/patches/patch-aa
index 2837b9db648..e7c7031820f 100644
--- a/shells/rssh/patches/patch-aa
+++ b/shells/rssh/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.2 2010/02/12 00:27:18 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2010/10/16 09:57:39 adam Exp $
 
---- Makefile.in.orig	2006-01-07 02:24:57.000000000 +0000
+--- Makefile.in.orig	2010-08-01 13:59:54.000000000 +0000
 +++ Makefile.in
-@@ -670,7 +670,7 @@ info-am:
+@@ -755,7 +755,7 @@ install-dvi: install-dvi-am
  
- install-data-am: install-man
+ install-dvi-am:
  
 -install-exec-am: install-binPROGRAMS install-dist_sysconfDATA \
 +install-exec-am: install-binPROGRAMS \
  	install-libexecPROGRAMS
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-@@ -728,7 +728,6 @@ uninstall-man: uninstall-man1 uninstall-
+@@ -830,7 +830,6 @@ uninstall-man: uninstall-man1 uninstall-
  	$(CC) -c $(DEFS) $(ourdefs) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $<
  
  install-exec-hook:
diff --git a/shells/rssh/patches/patch-ab b/shells/rssh/patches/patch-ab
index db8527bb574..f50dc91434d 100644
--- a/shells/rssh/patches/patch-ab
+++ b/shells/rssh/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2006/01/14 00:52:33 seb Exp $
+$NetBSD: patch-ab,v 1.2 2010/10/16 09:57:39 adam Exp $
 
---- main.c.in.orig	2006-01-03 17:25:05.000000000 +0000
+--- main.c.in.orig	2010-08-01 19:43:30.000000000 +0000
 +++ main.c.in
-@@ -195,7 +195,7 @@ char **build_shell_args( struct passwd u
+@@ -198,7 +198,7 @@ char **build_shell_args( struct passwd u
  		 * build_arg_vector() in the chroot helper instead...
                   */
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1 2006/01/14 00:52:33 seb Exp $
  			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
+@@ -229,9 +229,9 @@ char **build_shell_args( struct passwd u
  		/* change the command to run to the chroot helper */
  		*cmd = PATH_CHROOT_HELPER;