From a4270355a114684008149260d34d60dde159facc Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Tue, 4 Dec 2012 20:17:47 +0000
Subject: - Update to 2.3.4

PR:		ports/173980
Submitted by:	nemysis <nemysis@gmx.ch>
Feature safe:	yes
---
 shells/rssh/Makefile  | 15 +++++++--------
 shells/rssh/distinfo  |  4 ++--
 shells/rssh/pkg-plist |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'shells/rssh')

diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile
index df70434b260d..a5bc7bd4163d 100644
--- a/shells/rssh/Makefile
+++ b/shells/rssh/Makefile
@@ -6,25 +6,24 @@
 #
 
 PORTNAME=	rssh
-PORTVERSION=	2.3.2
+PORTVERSION=	2.3.4
 CATEGORIES=	shells security
 MASTER_SITES=	SF
 
 MAINTAINER=	pav@FreeBSD.org
-COMMENT=	A Restricted Secure SHell only for sftp or/and scp
-
-FORBIDDEN=	http://www.vuxml.org/freebsd/65b25acc-e63b-11e1-b81c-001b77d09812.html (vulnerability)
+COMMENT=	Restricted Secure SHell only for sftp or/and scp
 
 GNU_CONFIGURE=	yes
 
 MAN1=		rssh.1
 MAN5=		rssh.conf.5
 
-OPTIONS=	RDIST "rdist support" off
+OPTIONS_DEFINE=	RDIST
+RDIST_DESC=	rdist support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_RDIST)
+.if ${PORT_OPTIONS:MDIST}
 RUN_DEPENDS+=	${LOCALBASE}/bin/rdist6:${PORTSDIR}/net/rdist6
 CONFIGURE_ARGS+=--with-rdist=${LOCALBASE}/bin/rdist6
 .endif
@@ -40,4 +39,4 @@ post-install:
 		${ECHO_CMD} ${PREFIX}/bin/${PORTNAME}) > /etc/shells
 	@${RM} /etc/shells.bak
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/shells/rssh/distinfo b/shells/rssh/distinfo
index 89807e016c37..cbf14724514d 100644
--- a/shells/rssh/distinfo
+++ b/shells/rssh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rssh-2.3.2.tar.gz) = 8569a07dd96c8f70d0310186b37bbb2e8e591807ac1d1bd0990c02bfd467ba57
-SIZE (rssh-2.3.2.tar.gz) = 113959
+SHA256 (rssh-2.3.4.tar.gz) = f30c6a760918a0ed39cf9e49a49a76cb309d7ef1c25a66e77a41e2b1d0b40cd9
+SIZE (rssh-2.3.4.tar.gz) = 113315
diff --git a/shells/rssh/pkg-plist b/shells/rssh/pkg-plist
index 4bfa5f99c1a6..ba3e9a8131eb 100644
--- a/shells/rssh/pkg-plist
+++ b/shells/rssh/pkg-plist
@@ -2,5 +2,5 @@
 bin/rssh
 @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
 @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
-etc/rssh.conf.dist
+etc/rssh.conf.default.dist
 libexec/rssh_chroot_helper
-- 
cgit v1.2.3