pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wip/gnunet: attempt to get upnpc into $PATH.



Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%NetBSD.org@localhost>
Pushed By:	ng0
Date:		Tue Oct 29 17:32:06 2019 +0000
Changeset:	b5bdf7f71be3d802db8f52143ebb7825ab895d4b

Modified Files:
	gnunet/files/gnunet.in

Log Message:
wip/gnunet: attempt to get upnpc into $PATH.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b5bdf7f71be3d802db8f52143ebb7825ab895d4b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnunet/files/gnunet.in | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diffs:
diff --git a/gnunet/files/gnunet.in b/gnunet/files/gnunet.in
index eeec9077b2..a5e8765039 100755
--- a/gnunet/files/gnunet.in
+++ b/gnunet/files/gnunet.in
@@ -16,7 +16,7 @@ fi
 name="gnunet"
 rcvar=${name}
 command="@PREFIX@/lib/gnunet/libexec/gnunet-service-arm"
-command_args="-c @PKG_SYSCONFDIR@/gnunet.conf"
+command_args="-c @PKG_SYSCONFDIR@/gnunet.conf -d -l @VARBASE@/chroot/gnunet/cache/gnunet-%Y-%m-%d.log"
 required_files="@PKG_SYSCONFDIR@/gnunet.conf"
 pidfile="/dev/null"
 : ${gnunet_user:=gnunet}
@@ -30,7 +30,11 @@ start_precmd="gnunet_precmd"
 #restart_cmd="gnunet_stop ; gnunet_start"
 #restart_precmd="gnunet_precmd"
 
-gnunet_env="HOME=${gnunet_home} USER=${gnunet_user} TMP=/tmp GNUNET_PREFIX=@PREFIX@"
+# XXX: We need to export PATH with appended /usr/pkg/{sbin,bin} to get
+# the upnpc binary and others.
+# We can not use export here.
+export PATH=${PATH}:@PREFIX@/bin:@PREFIX@/sbin
+gnunet_env="PATH=${PATH} HOME=${gnunet_home} USER=${gnunet_user} TMP=/tmp GNUNET_PREFIX=@PREFIX@ GNUNET_CACHE_HOME=${gnunet_home}/cache"
 
 check_pidfile()
 {
@@ -51,6 +55,7 @@ gnunet_start()
 	@ECHO@ "Starting ${name}."
 	doit="@SU@ -m ${gnunet_user} -c '${gnunet_env} ${command} ${command_args}'"
 	eval $doit
+	# @SU@ -m ${gnunet_user} -c '${gnunet_env} echo "${PATH}"'
 }
 
 #gnunet_stop()


Home | Main Index | Thread Index | Old Index