Date: Mon, 6 Apr 2009 14:38:06 -0500 (CDT) From: Brooks Davis <brooks@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gerrit.beine@gmx.de Subject: ports/133438: [PATCH] www/trac-email2trac: [SUMMARIZE CHANGES] Message-ID: <200904061938.n36Jc624022708@lor.one-eyed-alien.net> Resent-Message-ID: <200904062010.n36KA2Oe095200@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 133438 >Category: ports >Synopsis: [PATCH] www/trac-email2trac: [SUMMARIZE CHANGES] >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Apr 06 20:10:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Brooks Davis >Release: FreeBSD 7.1-RELEASE amd64 >Organization: >Environment: System: FreeBSD lor.one-eyed-alien.net 7.1-RELEASE FreeBSD 7.1-RELEASE #2 r186702: Fri Jan 2 14:31:39 >Description: Add --with-trac-user and --with-mta-user to CONFIGURE_ARGS to specify correct values to the setuid wrapper. Default to www and mailnull respectivly to support sendmail and an apache based trac install. Add an option to enable postfix support for the wrapper by switching the mta user to nobody. Actually install the setuid wrapper setuid. Install the scripts without .py extensions as expected by the setuid wrapper. Install the example email2trac.conf as email2trac.conf.sample. Only copy it to email2trac.conf if none exists and only remove email2trac.conf if it is unchanged. [An UPDATING entry is probably called since some users may be using the scripts direction if using mailers such as postfix and exim that do not require the setuid wrapper.] Port maintainer (gerrit.beine@gmx.de) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- trac-email2trac-0.40_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/www/trac-email2trac/Makefile /home/brooks/trac-email2trac/Makefile --- /usr/ports/www/trac-email2trac/Makefile 2009-01-19 17:28:13.000000000 -0600 +++ /home/brooks/trac-email2trac/Makefile 2009-04-06 14:24:38.000000000 -0500 @@ -7,6 +7,7 @@ PORTNAME= email2trac PORTVERSION= 0.40 +PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= http://www.gerritbeine.de/download/trac/ PKGNAMEPREFIX= trac- @@ -17,22 +18,41 @@ BUILD_DEPENDS+= easy_install:${PORTSDIR}/devel/py-setuptools RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac +OPTIONS= POSTFIX "Configure suid script for postfix" OFF + +TRACUSER?= ${WWWOWN} + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-trac-user=${TRACUSER} --with-mta-user=${MTAUSER} USE_PYTHON= 2.3+ PORTDOCS= AUTHORS COPYING ChangeLog INSTALL README +.include <bsd.port.pre.mk> + +.if defined(WITH_POSTFIX) +MTAUSER?= nobody +.else +MTAUSER?= mailnull +.endif + do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/delete_spam.py ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/email2trac.py ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/run_email2trac ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/email2trac.conf ${PREFIX}/etc + @${INSTALL_SCRIPT} ${WRKSRC}/delete_spam.py ${PREFIX}/bin/delete_spam + @${INSTALL_SCRIPT} ${WRKSRC}/email2trac.py ${PREFIX}/bin/email2trac + @${INSTALL} ${COPY} ${STRIP} ${_BINOWNGRP} -m 4111 \ + ${WRKSRC}/run_email2trac ${PREFIX}/bin + @${INSTALL_DATA} ${WRKSRC}/email2trac.conf \ + ${PREFIX}/etc/email2trac.conf.sample + @if [ ! -e ${PREFIX}/etc/email2trac.conf ]; then \ + ${CP} -p ${PREFIX}/etc/email2trac.conf.sample \ + ${PREFIX}/etc/email2trac.conf ; \ + fi .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + @${MKDIR} ${DOCSDIR} .for file in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/www/trac-email2trac/pkg-plist /home/brooks/trac-email2trac/pkg-plist --- /usr/ports/www/trac-email2trac/pkg-plist 2007-05-27 12:34:05.000000000 -0500 +++ /home/brooks/trac-email2trac/pkg-plist 2009-04-06 11:18:41.000000000 -0500 @@ -1,4 +1,6 @@ -bin/delete_spam.py -bin/email2trac.py +bin/delete_spam +bin/email2trac bin/run_email2trac -etc/email2trac.conf +@unexec if cmp -s %D/etc/email2trac.conf %D/etc/email2trac.conf.sample; then rm -f %D/etc/email2trac.conf; fi +etc/email2trac.conf.sample +@exec if [ ! -e %D/etc/email2trac.conf ]; then cp %D/etc/email2trac.conf.sample %D/etc/email2trac.conf; fi --- trac-email2trac-0.40_1.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?200904061938.n36Jc624022708>