Date: Tue, 19 Feb 2008 19:38:06 GMT From: Xin LI <delphij@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: laszlof@FreeBSD.org Subject: ports/120845: [PATCH] Remove bash dependencies from security/mussh Message-ID: <200802191938.m1JJc6CL020483@freefall.freebsd.org> Resent-Message-ID: <200802191940.m1JJe1Ul020578@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 120845
>Category: ports
>Synopsis: [PATCH] Remove bash dependencies from security/mussh
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 19 19:40:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Xin LI
>Release: FreeBSD 7.0-PRERELEASE i386
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD freefall.freebsd.org 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #32: Tue Jan 15 15:07:33 UTC 2008 simon@freefall.freebsd.org:/usr/src/sys/i386/compile/FREEFALL i386
>Description:
The attached patch makes the following changes:
- Use SF macro for MASTER_SITES;
- Install mussh manpage;
- Replace bash with sh. It is quite annoying if mussh
is used with FreeBSD hosts which are not typically
have bash installed, and is guaranteed to work on
most Linux distributions if we use sh(1).
>How-To-Repeat:
>Fix:
--- mussh.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/mussh/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 8 Aug 2007 00:48:31 -0000 1.13
+++ Makefile 19 Feb 2008 19:32:41 -0000
@@ -7,16 +7,15 @@
PORTNAME= mussh
PORTVERSION= 0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= laszlof@FreeBSD.org
COMMENT= A tool for easily running the same commands on multiple hosts
-RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
+MAN1= ${PORTNAME}.1
NO_BUILD= yes
PORTDOCS= BUGS CHANGES EXAMPLES README
@@ -24,13 +23,21 @@ PLIST_FILES= bin/mussh
WRKSRC= ${WRKDIR}/${PORTNAME}
post-patch:
- @${REINPLACE_CMD} -e "s,^#!/bin/bash,#!/usr/bin/env bash,g" \
+ @${REINPLACE_CMD} -e "s,^#!/bin/bash,#!/bin/sh,g" \
-e "s,seq 1 ,jot 1 ,g" \
+ -e "s,^REMOTE_SHELL='bash',REMOTE_SHELL='sh',g" \
${WRKSRC}/${PORTNAME}
+ @${REINPLACE_CMD} -e "s,Default: bash,Default: sh,g" \
+ ${WRKSRC}/${PORTNAME}.1
+.if !defined(NOPORTDOCS)
+ @${REINPLACE_CMD} -e "s,bash,sh,g" \
+ ${WRKSRC}/README
+.endif
do-install:
@${MKDIR} ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+ ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/man/man1
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for f in ${PORTDOCS}
--- mussh.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802191938.m1JJc6CL020483>