From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 3 20:30:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5A55B78D for ; Sun, 3 Mar 2013 20:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 43C54802 for ; Sun, 3 Mar 2013 20:30:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r23KU2iQ025247 for ; Sun, 3 Mar 2013 20:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r23KU2px025246; Sun, 3 Mar 2013 20:30:02 GMT (envelope-from gnats) Resent-Date: Sun, 3 Mar 2013 20:30:02 GMT Resent-Message-Id: <201303032030.r23KU2px025246@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mark Felder Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 415E374E for ; Sun, 3 Mar 2013 20:29:12 +0000 (UTC) (envelope-from feld@feld.me) Received: from feld.me (unknown [IPv6:2607:f4e0:100:300::2]) by mx1.freebsd.org (Postfix) with ESMTP id 1C3797E5 for ; Sun, 3 Mar 2013 20:29:11 +0000 (UTC) Received: from feld by feld.me with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1UCFWx-0000IY-6X for FreeBSD-gnats-submit@freebsd.org; Sun, 03 Mar 2013 14:29:11 -0600 Message-Id: Date: Sun, 03 Mar 2013 14:29:11 -0600 From: Mark Felder To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/176624: [PATCH] net-mgmt/devmon: rc script tweaking X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Mar 2013 20:30:02 -0000 >Number: 176624 >Category: ports >Synopsis: [PATCH] net-mgmt/devmon: rc script tweaking >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Mar 03 20:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: feld >Release: FreeBSD 9.1-RELEASE amd64 >Organization: >Environment: System: FreeBSD mwi1.coffeenet.org 9.1-RELEASE FreeBSD 9.1-RELEASE #6 r243808: Mon Dec 3 07:51:34 >Description: rc script changed to run as user "devmon" pidfile stored in /var/run/devmon make sure at start logfile exists and is writable Below are lines to go in UIDs and GIDs files UIDs: devmon:*:283:283::0:0:Devmon daemon:/nonexistent:/usr/sbin/nologin GIDs: devmon:*:283: Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix) >How-To-Repeat: >Fix: --- devmon-0.3.1.b1_1.patch begins here --- diff -ruN --exclude=CVS ../devmon.orig/Makefile ./Makefile --- ../devmon.orig/Makefile 2013-03-02 14:20:12.000000000 -0600 +++ ./Makefile 2013-03-03 13:11:56.000000000 -0600 @@ -3,6 +3,7 @@ PORTNAME= devmon DISTVERSION= 0.3.1-beta1 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} @@ -17,6 +18,9 @@ NO_BUILD= yes USE_RC_SUBR= devmon +USERS= devmon +GROUPS= devmon + OPTIONS_DEFINE= MYSQL .include @@ -36,8 +40,11 @@ (cd ${WRKSRC}/modules && ${COPYTREE_SHARE} \* ${PREFIX}/devmon/modules/) post-install: + ${INSTALL} -d /var/run/devmon + ${CHOWN} devmon:devmon /var/run/devmon + ${CHOWN} devmon:devmon ${PREFIX}/devmon .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} + ${INSTALL} -d ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DOCSDIR}/ ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}/ ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ diff -ruN --exclude=CVS ../devmon.orig/files/devmon.in ./files/devmon.in --- ../devmon.orig/files/devmon.in 2013-03-02 14:20:12.000000000 -0600 +++ ./files/devmon.in 2013-03-03 14:23:54.000000000 -0600 @@ -8,7 +8,8 @@ : ${devmon_enable="NO"} : ${devmon_config="%%PREFIX%%/devmon/devmon.cfg"} : ${devmon_db="%%PREFIX%%/devmon/hosts.db"} -: ${devmon_pid="/var/run/devmon.pid"} +: ${devmon_pid="/var/run/devmon/devmon.pid"} # match your entry in devmon.cfg +: ${devmon_log="/var/log/devmon.log"} # match your entry in devmon.cfg . /etc/rc.subr @@ -22,10 +23,11 @@ stop_cmd="devmon_stopcmd" status_cmd="devmon_statuscmd" +start_cmd="devmon_startcmd" devmon_statuscmd() { -if [ ! -e $pidfile ]; +if [ ! -e $pidfile ]; then echo "pidfile does not exist. $name is not running?"; exit 1; @@ -33,7 +35,8 @@ if pgrep -F $pidfile >/dev/null; then - echo "$name is running."; + mypid=`cat $pidfile`; + echo "$name is running as $mypid."; else echo "$name is not running."; exit 1; @@ -53,4 +56,11 @@ fi } +devmon_startcmd() +{ + touch ${devmon_log} + chown devmon:devmon ${devmon_log} + su -m devmon -c "${command_interpreter} ${command} ${command_args}" +} + run_rc_command "$1" diff -ruN --exclude=CVS ../devmon.orig/pkg-plist ./pkg-plist --- ../devmon.orig/pkg-plist 2013-03-02 14:20:12.000000000 -0600 +++ ./pkg-plist 2013-03-03 14:25:04.235340823 -0600 @@ -28,3 +28,4 @@ %%PORTDOCS%%@dirrm %%DOCSDIR%%/extras %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs %%PORTDOCS%%@dirrm %%DOCSDIR%% +@unexec rmdir /var/run/devmon --- devmon-0.3.1.b1_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: