Received: by mail.netbsd.org (Postfix, from userid 605) id E22D284D7F; Thu, 6 Sep 2018 10:55:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E8E5984D53 for ; Thu, 6 Sep 2018 10:55:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id NnN-sC8yFm87 for ; Thu, 6 Sep 2018 10:55:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 259E984C8D for ; Thu, 6 Sep 2018 10:55:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 15C75FBF8; Thu, 6 Sep 2018 10:55:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1536231343212240" MIME-Version: 1.0 Date: Thu, 6 Sep 2018 10:55:43 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/net/taskserver To: pkgsrc-changes@NetBSD.org Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20180906105543.15C75FBF8@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1536231343212240 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: triaxx Date: Thu Sep 6 10:55:43 UTC 2018 Modified Files: pkgsrc/net/taskserver: Makefile distinfo Added Files: pkgsrc/net/taskserver/patches: patch-src_taskdctl Log Message: taskserver: set absolute path in taskdctl No reason why PREFIX should be in PATH of taskd user. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/taskserver/Makefile \ pkgsrc/net/taskserver/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/net/taskserver/patches/patch-src_taskdctl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1536231343212240 Content-Disposition: inline Content-Length: 2960 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/taskserver/Makefile diff -u pkgsrc/net/taskserver/Makefile:1.1 pkgsrc/net/taskserver/Makefile:1.2 --- pkgsrc/net/taskserver/Makefile:1.1 Sun Sep 2 09:53:14 2018 +++ pkgsrc/net/taskserver/Makefile Thu Sep 6 10:55:42 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2018/09/02 09:53:14 triaxx Exp $ +# $NetBSD: Makefile,v 1.2 2018/09/06 10:55:42 triaxx Exp $ DISTNAME= taskd-1.1.0 PKGNAME= ${DISTNAME:S/taskd/taskserver/} @@ -27,7 +27,7 @@ TASKD_DATA?= ${VARBASE}/taskd PKG_GROUPS= ${TASKD_GROUP} PKG_USERS= ${TASKD_USER}:${TASKD_GROUP} PKG_GROUPS_VARS= TASKD_USER -PKG_USERS_VARS= TASKD_GROUP +PKG_USERS_VARS= TASKD_GROUP PKG_HOME.${TASKD_USER}= ${TASKD_DATA} FILES_SUBST+= TASKD_USER=${TASKD_USER} TASKD_GROUP=${TASKD_GROUP} \ @@ -43,8 +43,13 @@ INSTALLATION_DIRS+= ${EGDIR}/pki BUILD_DEFS+= TASKD_USER TASKD_GROUP TASKD_DATA VARBASE REPLACE_SH= src/taskdctl +SUBST_CLASSES+= abspath +SUBST_STAGE.abspath= post-configure +SUBST_MESSAGE.abspath= Set absolute paths. +SUBST_FILES.abspath= src/taskdctl +SUBST_VARS.abspath= PREFIX -MAKE_DIRS= + ${TASKD_DATA} +MAKE_DIRS+= ${TASKD_DATA} OWN_DIRS_PERMS+= ${TASKD_DATA} ${TASKD_USER} ${TASKD_GROUP} 0750 RCD_SCRIPTS= taskd Index: pkgsrc/net/taskserver/distinfo diff -u pkgsrc/net/taskserver/distinfo:1.1 pkgsrc/net/taskserver/distinfo:1.2 --- pkgsrc/net/taskserver/distinfo:1.1 Sun Sep 2 09:53:14 2018 +++ pkgsrc/net/taskserver/distinfo Thu Sep 6 10:55:42 2018 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.1 2018/09/02 09:53:14 triaxx Exp $ +$NetBSD: distinfo,v 1.2 2018/09/06 10:55:42 triaxx Exp $ SHA1 (taskd-1.1.0.tar.gz) = ded339deeee65277e4712f71a9159502f8b20b52 RMD160 (taskd-1.1.0.tar.gz) = f5256fda0de4dc46a4f09167666e81bed3452f69 SHA512 (taskd-1.1.0.tar.gz) = df2349c354258fd1b014b1a9c78f68dc10c9e5a48357e282e8a760cf4e4aaf4d36486796ad094ee2b050e7506195b778e3316c90ef543a2f8242de313daa13aa Size (taskd-1.1.0.tar.gz) = 120115 bytes SHA1 (patch-src_TLSServer.cpp) = 6e47c0ef59dc6c265539152b7abce75b5e518d45 +SHA1 (patch-src_taskdctl) = 539aee5b4e5a3c32203dcc4cec2d3980ef1c3397 Added files: Index: pkgsrc/net/taskserver/patches/patch-src_taskdctl diff -u /dev/null pkgsrc/net/taskserver/patches/patch-src_taskdctl:1.1 --- /dev/null Thu Sep 6 10:55:43 2018 +++ pkgsrc/net/taskserver/patches/patch-src_taskdctl Thu Sep 6 10:55:42 2018 @@ -0,0 +1,17 @@ +$NetBSD: patch-src_taskdctl,v 1.1 2018/09/06 10:55:42 triaxx Exp $ + +No assumption should be made that PREFIX is in PATH of taskd user. + +--- src/taskdctl.orig 2015-05-10 21:35:22.000000000 +0000 ++++ src/taskdctl +@@ -31,8 +31,8 @@ if [ -z $TASKDDATA ] ; then + exit + fi + +-PIDFILE=$(taskd config --data $TASKDDATA | grep pid.file | awk '{print $2}') +-DAEMON="taskd server --data $TASKDDATA --daemon" ++PIDFILE=$(@PREFIX@/bin/taskd config --data $TASKDDATA | grep pid.file | awk '{print $2}') ++DAEMON="@PREFIX@/bin/taskd server --data $TASKDDATA --daemon" + + ERROR=0 + ARGV="$@" --_----------=_1536231343212240--