diff options
| author | triaxx <triaxx@pkgsrc.org> | 2018-09-06 10:55:42 +0000 |
|---|---|---|
| committer | triaxx <triaxx@pkgsrc.org> | 2018-09-06 10:55:42 +0000 |
| commit | b70faed957645353c7106d44c2f63c0aecfafba0 (patch) | |
| tree | b78c224145c06e3d234046c25c63af74ca6a9002 | |
| parent | 8e8f40ee29edd44c227f5ad41999462dd480fd80 (diff) | |
| download | pkgsrc-b70faed957645353c7106d44c2f63c0aecfafba0.tar.gz | |
taskserver: set absolute path in taskdctl
No reason why PREFIX should be in PATH of taskd user.
| -rw-r--r-- | net/taskserver/Makefile | 11 | ||||
| -rw-r--r-- | net/taskserver/distinfo | 3 | ||||
| -rw-r--r-- | net/taskserver/patches/patch-src_taskdctl | 17 |
3 files changed, 27 insertions, 4 deletions
diff --git a/net/taskserver/Makefile b/net/taskserver/Makefile index 97211a44df6..350446683ff 100644 --- a/net/taskserver/Makefile +++ b/net/taskserver/Makefile @@ -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 diff --git a/net/taskserver/distinfo b/net/taskserver/distinfo index 72f557fc4f6..58dc85077fb 100644 --- a/net/taskserver/distinfo +++ b/net/taskserver/distinfo @@ -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 diff --git a/net/taskserver/patches/patch-src_taskdctl b/net/taskserver/patches/patch-src_taskdctl new file mode 100644 index 00000000000..a0ed79784d5 --- /dev/null +++ b/net/taskserver/patches/patch-src_taskdctl @@ -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="$@" |