Date: Mon, 14 Mar 2011 18:54:12 GMT From: Chris Rees <utisoft@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dougb@FreeBSD.org Subject: ports/155556: [PATCH] mail/davmail: Deobfuscate rc script and add shutdown keyword Message-ID: <201103141854.p2EIsCwm096446@zeus.bayofrum.net> Resent-Message-ID: <201103141900.p2EJ0LTQ030555@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 155556 >Category: ports >Synopsis: [PATCH] mail/davmail: Deobfuscate rc script and add shutdown keyword >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Mar 14 19:00:21 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Chris Rees >Release: FreeBSD 8.2-RELEASE i386 >Organization: >Environment: System: FreeBSD zeus.bayofrum.net 8.2-RELEASE FreeBSD 8.2-RELEASE #1: Sun Feb 27 22:19:51 UTC 2011 root@zeus.bayofrum.net:/usr/obj/usr/src/sys/ZEUS i386 >Description: There's been a little disagreement on the way I originally wrote the rc script for davmail in ports/154982 [1]. command_interpreter opens up a whole can of worms [2,3] involving shebangs with Java, so I've left it as procname. [1] Private email/closed list posting [2] http://lists.freebsd.org/pipermail/freebsd-rc/2010-January/001812.html [3] http://forums.freebsd.org/showthread.php?t=22466 >How-To-Repeat: >Fix: - Replace %%PORTNAME%% with davmail in rc script - Add shutdown KEYWORD to rc script Proposer: dougb Submitted by: Chris Rees (utisoft_at_gmail.com) --- davmail-rc.diff begins here --- Index: Makefile =================================================================== RCS file: /exports/cvsroot-freebsd/ports/mail/davmail/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- Makefile 9 Mar 2011 14:01:48 -0000 1.3 +++ Makefile 14 Mar 2011 18:36:50 -0000 @@ -27,7 +27,6 @@ SUB_FILES= davmail.sh SUB_LIST= JAVASHAREDIR=${JAVASHAREDIR} \ JAVAJARDIR=${JAVAJARDIR} \ - PORTNAME=${PORTNAME} do-install: @cd ${WRKSRC}/dist && ${FIND} . -type d \ @@ -41,8 +40,8 @@ -not -name "*.war" \ -not -name "*.rpm" \ -exec ${INSTALL_DATA} \{} ${DATADIR}/\{} \; - @@${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${PREFIX}/bin/davmail - @@${INSTALL_DATA} ${FILESDIR}/davmail.properties.sample \ + @${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${PREFIX}/bin/davmail + @${INSTALL_DATA} ${FILESDIR}/davmail.properties.sample \ ${PREFIX}/etc post-install: Index: files/davmail.in =================================================================== RCS file: /exports/cvsroot-freebsd/ports/mail/davmail/files/davmail.in,v retrieving revision 1.1 diff -u -r1.1 davmail.in --- files/davmail.in 9 Mar 2011 14:01:48 -0000 1.1 +++ files/davmail.in 14 Mar 2011 18:44:37 -0000 @@ -2,33 +2,34 @@ # $FreeBSD: ports/mail/davmail/files/davmail.in,v 1.1 2011/03/09 14:01:48 miwi Exp $ # -# PROVIDE: %%PORTNAME%% +# PROVIDE: davmail # REQUIRE: LOGIN +# KEYWORD: shutdown # # Add the following lines to /etc/rc.conf or /etc/rc.conf.local to -# enable %%PORTNAME%%: -# %%PORTNAME%%_enable (bool): Set to "NO" by default. -# %%PORTNAME%%_config (path): Set to -# "%%PREFIX%%/etc/%%PORTNAME%%.properties" +# enable davmail: +# davmail_enable (bool): Set to "NO" by default. +# davmail_config (path): Set to +# "%%PREFIX%%/etc/davmail.properties" # by default . /etc/rc.subr -name="%%PORTNAME%%" +name="davmail" rcvar=`set_rcvar` load_rc_config $name -: ${%%PORTNAME%%_enable="NO"} -: ${%%PORTNAME%%_config="%%PREFIX%%/etc/%%PORTNAME%%.properties"} +: ${davmail_enable="NO"} +: ${davmail_config="%%PREFIX%%/etc/davmail.properties"} start_cmd="${name}_start" procname="java" -pidfile="/var/run/%%PORTNAME%%.pid" -required_files=${%%PORTNAME%%_config} +pidfile="/var/run/davmail.pid" +required_files=${davmail_config} -%%PORTNAME%%_start() +davmail_start() { if [ -z "$rc_fast" -a -n "$rc_pid" ]; then echo 1>&2 "${name} already running? (pid=$rc_pid)." @@ -36,7 +37,7 @@ fi echo "Starting ${name}." for i in %%DATADIR%%/lib/*; do export CLASSPATH=$CLASSPATH:$i; done - java -cp %%DATADIR%%/%%PORTNAME%%.jar:$CLASSPATH:%%JAVAJARDIR%%/swt.jar %%PORTNAME%%.DavGateway ${davmail_config} >> /var/log/%%PORTNAME%%-error.log 2>&1 & + java -cp %%DATADIR%%/davmail.jar:$CLASSPATH:%%JAVAJARDIR%%/swt.jar davmail.DavGateway ${davmail_config} >> /var/log/davmail-error.log 2>&1 & echo -n $! > ${pidfile} } --- davmail-rc.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?201103141854.p2EIsCwm096446>