Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 28 Nov 2012 22:25:53 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        pav@FreeBSD.org
Subject:   ports/173980: [PATCH] shells/rssh: update to 2.3.4, OptionsNG, changed comment, pkg-plist
Message-ID:  <20121128212557.AF46D75A@hub.freebsd.org>
Resent-Message-ID: <201211282130.qASLU0DV061065@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         173980
>Category:       ports
>Synopsis:       [PATCH] shells/rssh: update to 2.3.4, OptionsNG, changed comment, pkg-plist
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 28 21:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:
- Update to 2.3.4

critical and medium is because this
http://www.vuxml.org/freebsd/65b25acc-e63b-11e1-b81c-001b77d09812.html

Makefile changed:
+COMMENT=	Restricted Secure SHell only for sftp or/and scp
+OPTIONS_DEFINE=	RDIST
+RDIST_DESC=	rdist support
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MDIST}
+.include <bsd.port.mk>

Changed pkg-plist

Port maintainer (pav@FreeBSD.org) is cc'd.

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:

portlint -A
looks fine as usual.

port test: clean

>Fix:

--- rssh-2.3.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/shells/rssh/Makefile ./Makefile
--- /usr/ports/shells/rssh/Makefile	2012-11-16 09:01:56.000000000 +0100
+++ ./Makefile	2012-11-28 22:09:56.000000000 +0100
@@ -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 @@
 		${ECHO_CMD} ${PREFIX}/bin/${PORTNAME}) > /etc/shells
 	@${RM} /etc/shells.bak
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/shells/rssh/distinfo ./distinfo
--- /usr/ports/shells/rssh/distinfo	2012-11-16 09:01:56.000000000 +0100
+++ ./distinfo	2012-11-28 22:14:51.000000000 +0100
@@ -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 -ruN --exclude=CVS /usr/ports/shells/rssh/pkg-plist ./pkg-plist
--- /usr/ports/shells/rssh/pkg-plist	2012-11-16 09:01:56.000000000 +0100
+++ ./pkg-plist	2012-11-28 22:17:13.000000000 +0100
@@ -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
--- rssh-2.3.4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121128212557.AF46D75A>