From takefu@airport.fm  Tue Jun  7 09:06:36 2011
Return-Path: <takefu@airport.fm>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C1B361065686;
	Tue,  7 Jun 2011 09:06:36 +0000 (UTC)
	(envelope-from takefu@airport.fm)
Received: from ae-osaka.co.jp (unknown [IPv6:2001:3e0:4ec:a000::1])
	by mx1.freebsd.org (Postfix) with ESMTP id 846038FC0A;
	Tue,  7 Jun 2011 09:06:36 +0000 (UTC)
Received: from ae-osaka.co.jp (localhost.ae-osaka.co.jp [127.0.0.1])
	by ae-osaka.co.jp (Postfix) with ESMTP id 80D3611453;
	Tue,  7 Jun 2011 18:06:35 +0900 (JST)
Received: from ae-osaka.co.jp ([127.0.0.1])
	by ae-osaka.co.jp (ae-osaka.co.jp [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id oC0ritsA1jkX; Tue,  7 Jun 2011 18:06:35 +0900 (JST)
Received: from [IPv6:2001:3e0:4ec:a011:ac01:eccb:b8ce:4d39] (unknown [IPv6:2001:3e0:4ec:a011:ac01:eccb:b8ce:4d39])
	by ae-osaka.co.jp (Postfix) with ESMTPSA id 44D8711451;
	Tue,  7 Jun 2011 18:06:35 +0900 (JST)
Message-Id: <4DEDEA28.1090101@airport.fm>
Date: Tue, 07 Jun 2011 18:06:48 +0900
From: Takefu <takefu@airport.fm>
To: db@FreeBSD.org, freebsd-gnats-submit@freebsd.org
Subject: [PATCH] comms/thebridge usermgmt.cgi not run corrections

>Number:         157679
>Category:       ports
>Synopsis:       [PATCH] comms/thebridge usermgmt.cgi not run corrections
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    db
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 07 09:10:09 UTC 2011
>Closed-Date:    Tue Jun 14 11:18:08 UTC 2011
>Last-Modified:  Tue Jun 14 11:20:11 UTC 2011
>Originator:     Takefu
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
FOX Amateur Radio Club
>Environment:
>Description:
usermgmt.cgi not run corrections
Port maintainer (db@FreeBSD.org) is cc'd.
>How-To-Repeat:
>Fix:
--- thebridge.patch begins here ---
diff -ruN /usr/ports/comms/thebridge/Makefile comms/thebridge/Makefile
--- /usr/ports/comms/thebridge/Makefile	2010-07-21 16:53:12.000000000 +0900
+++ comms/thebridge/Makefile	2011-03-14 16:29:28.000000000 +0900
@@ -14,10 +14,20 @@
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Amateur Radio Echolink conference bridge

+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 GNU_CONFIGURE=	yes

 PORTDOCS=	README
 USE_RC_SUBR=	tbd
+MAKE_JOBS_SAFE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},; \
+		s,%%PREFIX%%,${PREFIX},' \
+		${WRKSRC}/addons/usermgmt.cgi

 post-install:
 .if !defined(NOPORTDOCS)
diff -ruN /usr/ports/comms/thebridge/files/patch-addons_usermgmt.cgi comms/thebridge/files/patch-addons_usermgmt.cgi
--- /usr/ports/comms/thebridge/files/patch-addons_usermgmt.cgi	1970-01-01 09:00:00.000000000 +0900
+++ comms/thebridge/files/patch-addons_usermgmt.cgi	2011-02-21 10:55:42.000000000 +0900
@@ -0,0 +1,17 @@
+--- addons/usermgmt.cgi.orig	2011-02-21 10:51:53.000000000 +0900
++++ addons/usermgmt.cgi	2011-02-21 10:55:12.000000000 +0900
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!%%LOCALBASE%%/bin/bash
+ #-------------------------------------------------------------------
+ #  TheBridge Echolink Conference Server User Management Utility
+ #
+@@ -15,7 +15,7 @@
+ admin=                        # admin's callsign or quoted name
+ qrz=yes                       # leave blank to disable QRZ lookups
+ chginfo=no                    # enable/disable Info/Location changes
+-tbdcmd=/usr/local/bin/tbdcmd  # path to "tbdcmd" executable
++tbdcmd=%%PREFIX%%/bin/tbdcmd  # path to "tbdcmd" executable
+ #-------------------------------------------------------------------
+ echo 'Content-type: text/html'
+ echo ''
--- thebridge.patch ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->db 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jun 7 09:10:18 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157679 

From: Diane Bruce <db@db.net>
To: Takefu <takefu@airport.fm>
Cc: db@FreeBSD.org, freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/157679: [PATCH] comms/thebridge usermgmt.cgi not run corrections
Date: Sat, 11 Jun 2011 19:41:55 -0400

 On Tue, Jun 07, 2011 at 06:06:48PM +0900, Takefu wrote:
 > 
 > >Number:         157679
 > >Category:       ports
 
 How about this:
 
 ? thebridge/files/patch-addons_usermgmt.cgi
 Index: thebridge/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/comms/thebridge/Makefile,v
 retrieving revision 1.11
 diff -u -r1.11 Makefile
 --- thebridge/Makefile	22 Aug 2009 00:15:13 -0000	1.11
 +++ thebridge/Makefile	11 Jun 2011 23:02:15 -0000
 @@ -7,6 +7,7 @@
  
  PORTNAME=	thebridge
  PORTVERSION=	1.06
 +PORTREVISION=	1
  CATEGORIES=	comms hamradio
  MASTER_SITES=	SF/cqinet/${PORTNAME}/${PORTNAME}-${PORTVERSION}
  EXTRACT_SUFX=	.tgz
 @@ -14,10 +15,17 @@
  MAINTAINER=	db@FreeBSD.org
  COMMENT=	Amateur Radio Echolink conference bridge
  
 +LICENSE=	GPLv2
 +LICENSE_FILE=	${WRKSRC}/COPYING
  GNU_CONFIGURE=	yes
  
  PORTDOCS=	README
  USE_RC_SUBR=	tbd
 +MAKE_JOBS_SAFE=	yes
 +
 +post-patch:
 +	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
 +		${WRKSRC}/addons/usermgmt.cgi
  
  post-install:
  .if !defined(NOPORTDOCS)
 
 The cgi works here as far as I can tell with /bin/sh.
 
 - 73 Diane VA3DB
 -- 
 - db@FreeBSD.org db@db.net http://www.db.net/~db
   Why leave money to our children if we don't leave them the Earth?

From: Takefu <takefu@airport.fm>
To: Diane Bruce <db@db.net>
Cc: db@FreeBSD.org, freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/157679: [PATCH] comms/thebridge usermgmt.cgi not run corrections
Date: Mon, 13 Jun 2011 16:51:45 +0900

 Hi.
 
 Really?
 /bin/sh I'll work with it.
 
 e.g.
 /bin/sh		Broken display. And uncontrollable.
 /bin/bash	500 error.
 /usr/loca/bin/bash OK
 
 -- 
State-Changed-From-To: open->closed 
State-Changed-By: db 
State-Changed-When: Tue Jun 14 11:18:06 UTC 2011 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157679 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/157679: commit references a PR
Date: Tue, 14 Jun 2011 11:17:52 +0000 (UTC)

 db          2011-06-14 11:17:43 UTC
 
   FreeBSD ports repository
 
   Modified files:
     comms/thebridge      Makefile 
   Added files:
     comms/thebridge/files patch-addons_usermgmt.cgi 
   Log:
   - correct paths in cgi script usermgmt.cgi so it will run correctly.
   
   PR:             ports/157679
   Submitted by:   takefu@airport.fm
   
   Revision  Changes    Path
   1.12      +11 -0     ports/comms/thebridge/Makefile
   1.1       +17 -0     ports/comms/thebridge/files/patch-addons_usermgmt.cgi (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
