cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

databases/opentsdb: Fix STAGE, missing UID and GID

Browse Source 
Staging was broken due to touching /root/.java during build
UID and GID was lost in old copy of the review
While here, also fix hardcoded path to ETCDIR

Pointyhat:	me

Differential Revision:	https://reviews.freebsd.org/D4083
This commit is contained in:
Mark Felder 2015-11-08 14:05:21 +00:00
parent abf126b820
commit 91fe234038
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=401060
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
GIDs
View File

@ -243,6 +243,7 @@ sogod:*:846:
fossy:*:901:www
scanlogd:*:902:
_ocserv:*:903:
opentsdb:*:906:
influxd:*:907:
riemann:*:908:
proxy65:*:909:

1
UIDs
View File

@ -251,6 +251,7 @@ sogod:*:846:846::0:0:SOGo groupware:/nonexistent:/usr/sbin/nologin
fossy:*:901:901::0:0:FOSSology user:/usr/local/share/fossology:/usr/local/bin/bash
scanlogd:*:902:902::0:0:scanlogd user:/nonexistent:/usr/sbin/nologin
_ocserv:*:903:903::0:0:ocserv user:/nonexistent:/usr/sbin/nologin
opentsdb:*:906:906::0:0:OpenTSDB Daemon:/var/empty:/usr/sbin/nologin
influxd:*:907:907::0:0:InfluxDB Daemon:/var/empty:/usr/sbin/nologin
riemann:*:908:908::0:0:Riemann User:/var/empty:/usr/sbin/nologin
proxy65:*:909:909::0:0:Proxy65 Daemon:/nonexistent:/usr/sbin/nologin

11
databases/opentsdb/files/patch-Makefile.in
View File

@ -5,10 +5,19 @@
# in the script before it gets installed...
install-exec-hook:
- script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(pkgdatadir)/etc/opentsdb'; \
+ script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='/usr/local/etc/opentsdb'; \
+ script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfdir)/etc/opentsdb'; \
abs_srcdir=''; abs_builddir=''; $(edit_tsdb_script)
cat tsdb.tmp >"$(DESTDIR)$(bindir)/tsdb"
rm -f tsdb.tmp
@@ -1442,7 +1442,7 @@ gwtc: .gwtc-stamp
@$(mkdir_p) gwt
{ cd $(srcdir) && cat $(httpui_SRC); } | $(MD5) >"$@-t"
cmp -s "$@" "$@-t" && exit 0; \
- $(JAVA) $(GWTC_JVM_ARGS) -cp $(GWT_CLASSPATH) com.google.gwt.dev.Compiler \
+ $(JAVA) -Djava.util.prefs.userRoot=$(HOME) $(GWTC_JVM_ARGS) -cp $(GWT_CLASSPATH) com.google.gwt.dev.Compiler \
$(GWTC_ARGS) -war gwt tsd.QueryUi
@mv "$@-t" "$@"
gwtdev: .gwtc-stamp
@@ -1468,7 +1468,7 @@ gwttsd: staticroot
# how to tell it to install a bunch of files recursively for which I don't
# know ahead of time what the file names are.