Thu Sep 6 10:55:43 2018 UTC ()
taskserver: set absolute path in taskdctl

No reason why PREFIX should be in PATH of taskd user.


(triaxx)
diff -r1.1 -r1.2 pkgsrc/net/taskserver/Makefile
diff -r1.1 -r1.2 pkgsrc/net/taskserver/distinfo
diff -r0 -r1.1 pkgsrc/net/taskserver/patches/patch-src_taskdctl
cvs diff -r1.1 -r1.2 pkgsrc/net/taskserver/Makefile (expand / switch to unified diff)

--- pkgsrc/net/taskserver/Makefile 2018/09/02 09:53:14 1.1
+++ pkgsrc/net/taskserver/Makefile 2018/09/06 10:55:42 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2018/09/02 09:53:14 triaxx Exp $ 1# $NetBSD: Makefile,v 1.2 2018/09/06 10:55:42 triaxx Exp $
2 2
3DISTNAME= taskd-1.1.0 3DISTNAME= taskd-1.1.0
4PKGNAME= ${DISTNAME:S/taskd/taskserver/} 4PKGNAME= ${DISTNAME:S/taskd/taskserver/}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= https://taskwarrior.org/download/ 7MASTER_SITES= https://taskwarrior.org/download/
8 8
9MAINTAINER= esg@sdf.org 9MAINTAINER= esg@sdf.org
10HOMEPAGE= https://taskwarrior.org/download/ 10HOMEPAGE= https://taskwarrior.org/download/
11COMMENT= Lightweight, secure server providing access to task data 11COMMENT= Lightweight, secure server providing access to task data
12LICENSE= mit 12LICENSE= mit
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
@@ -17,43 +17,48 @@ USE_LANGUAGES= c c++ @@ -17,43 +17,48 @@ USE_LANGUAGES= c c++
17CMAKE_ARGS+= -DTASKD_MAN1DIR=${PREFIX}/${PKGMANDIR}/man1 17CMAKE_ARGS+= -DTASKD_MAN1DIR=${PREFIX}/${PKGMANDIR}/man1
18CMAKE_ARGS+= -DTASKD_MAN5DIR=${PREFIX}/${PKGMANDIR}/man5 18CMAKE_ARGS+= -DTASKD_MAN5DIR=${PREFIX}/${PKGMANDIR}/man5
19 19
20LDFLAGS.SunOS+= -lsocket -lnsl 20LDFLAGS.SunOS+= -lsocket -lnsl
21 21
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
23SMF_NAME= taskd 23SMF_NAME= taskd
24TASKD_USER?= taskd 24TASKD_USER?= taskd
25TASKD_GROUP?= taskd 25TASKD_GROUP?= taskd
26TASKD_DATA?= ${VARBASE}/taskd 26TASKD_DATA?= ${VARBASE}/taskd
27PKG_GROUPS= ${TASKD_GROUP} 27PKG_GROUPS= ${TASKD_GROUP}
28PKG_USERS= ${TASKD_USER}:${TASKD_GROUP} 28PKG_USERS= ${TASKD_USER}:${TASKD_GROUP}
29PKG_GROUPS_VARS= TASKD_USER 29PKG_GROUPS_VARS= TASKD_USER
30PKG_USERS_VARS= TASKD_GROUP 30PKG_USERS_VARS= TASKD_GROUP
31PKG_HOME.${TASKD_USER}= ${TASKD_DATA} 31PKG_HOME.${TASKD_USER}= ${TASKD_DATA}
32 32
33FILES_SUBST+= TASKD_USER=${TASKD_USER} TASKD_GROUP=${TASKD_GROUP} \ 33FILES_SUBST+= TASKD_USER=${TASKD_USER} TASKD_GROUP=${TASKD_GROUP} \
34 TASKD_DATA=${TASKD_DATA} 34 TASKD_DATA=${TASKD_DATA}
35MESSAGE_SUBST+= TASKD_DATA=${TASKD_DATA} 35MESSAGE_SUBST+= TASKD_DATA=${TASKD_DATA}
36 36
37EGDIR= ${PREFIX}/share/examples/taskd 37EGDIR= ${PREFIX}/share/examples/taskd
38EGFILES+= pki/README pki/generate pki/generate.ca \ 38EGFILES+= pki/README pki/generate pki/generate.ca \
39 pki/generate.client pki/generate.crl \ 39 pki/generate.client pki/generate.crl \
40 pki/generate.server pki/vars 40 pki/generate.server pki/vars
41INSTALLATION_DIRS+= ${EGDIR}/pki 41INSTALLATION_DIRS+= ${EGDIR}/pki
42 42
43BUILD_DEFS+= TASKD_USER TASKD_GROUP TASKD_DATA VARBASE 43BUILD_DEFS+= TASKD_USER TASKD_GROUP TASKD_DATA VARBASE
44 44
45REPLACE_SH= src/taskdctl 45REPLACE_SH= src/taskdctl
 46SUBST_CLASSES+= abspath
 47SUBST_STAGE.abspath= post-configure
 48SUBST_MESSAGE.abspath= Set absolute paths.
 49SUBST_FILES.abspath= src/taskdctl
 50SUBST_VARS.abspath= PREFIX
46 51
47MAKE_DIRS= + ${TASKD_DATA} 52MAKE_DIRS+= ${TASKD_DATA}
48OWN_DIRS_PERMS+= ${TASKD_DATA} ${TASKD_USER} ${TASKD_GROUP} 0750 53OWN_DIRS_PERMS+= ${TASKD_DATA} ${TASKD_USER} ${TASKD_GROUP} 0750
49 54
50RCD_SCRIPTS= taskd 55RCD_SCRIPTS= taskd
51 56
52post-install: 57post-install:
53.for file in ${EGFILES} 58.for file in ${EGFILES}
54 ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${EGDIR}/${file} 59 ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${EGDIR}/${file}
55.endfor 60.endfor
56 61
57.include "../../devel/libuuid/buildlink3.mk" 62.include "../../devel/libuuid/buildlink3.mk"
58.include "../../security/gnutls/buildlink3.mk" 63.include "../../security/gnutls/buildlink3.mk"
59.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/net/taskserver/distinfo (expand / switch to unified diff)

--- pkgsrc/net/taskserver/distinfo 2018/09/02 09:53:14 1.1
+++ pkgsrc/net/taskserver/distinfo 2018/09/06 10:55:42 1.2
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.1 2018/09/02 09:53:14 triaxx Exp $ 1$NetBSD: distinfo,v 1.2 2018/09/06 10:55:42 triaxx Exp $
2 2
3SHA1 (taskd-1.1.0.tar.gz) = ded339deeee65277e4712f71a9159502f8b20b52 3SHA1 (taskd-1.1.0.tar.gz) = ded339deeee65277e4712f71a9159502f8b20b52
4RMD160 (taskd-1.1.0.tar.gz) = f5256fda0de4dc46a4f09167666e81bed3452f69 4RMD160 (taskd-1.1.0.tar.gz) = f5256fda0de4dc46a4f09167666e81bed3452f69
5SHA512 (taskd-1.1.0.tar.gz) = df2349c354258fd1b014b1a9c78f68dc10c9e5a48357e282e8a760cf4e4aaf4d36486796ad094ee2b050e7506195b778e3316c90ef543a2f8242de313daa13aa 5SHA512 (taskd-1.1.0.tar.gz) = df2349c354258fd1b014b1a9c78f68dc10c9e5a48357e282e8a760cf4e4aaf4d36486796ad094ee2b050e7506195b778e3316c90ef543a2f8242de313daa13aa
6Size (taskd-1.1.0.tar.gz) = 120115 bytes 6Size (taskd-1.1.0.tar.gz) = 120115 bytes
7SHA1 (patch-src_TLSServer.cpp) = 6e47c0ef59dc6c265539152b7abce75b5e518d45 7SHA1 (patch-src_TLSServer.cpp) = 6e47c0ef59dc6c265539152b7abce75b5e518d45
 8SHA1 (patch-src_taskdctl) = 539aee5b4e5a3c32203dcc4cec2d3980ef1c3397
File Added: pkgsrc/net/taskserver/patches/patch-src_taskdctl
$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="$@"