7 files changed, 15 insertions, 6 deletions
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
index 5d002b8..9285b48 100644
--- a/package/configure-snippets/configure_case_lines
+++ b/package/configure-snippets/configure_case_lines
@@ -2,6 +2,7 @@
     --livedir=*) livedir=${arg#*=} ;;
     --repodir=*) repodir=${arg#*=} ;;
     --bootdir=*) bootdir=${arg#*=} ;;
+    --stmpdir=*) stmpdir=${arg#*=} ;;
     --with-def-path=*) defpath=${arg#*=} ;;
     --enable-nsss|--enable-nsss=yes) usensss=true ;;
     --disable-nsss|--enable-nsss=no) usensss=false ;;
diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs
index 045c83c..60c0477 100644
--- a/package/configure-snippets/configure_expand_dirs
+++ b/package/configure-snippets/configure_expand_dirs
@@ -1 +1 @@
-defpath
+stmpdir defpath
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
index 14b46d5..d93ea7a 100644
--- a/package/configure-snippets/configure_generate_configh
+++ b/package/configure-snippets/configure_generate_configh
@@ -33,6 +33,9 @@ echo "#define ${package_macro_name}_REPODIR \"$repodir\""
 echo "#undef ${package_macro_name}_BOOTDIR"
 echo "#define ${package_macro_name}_BOOTDIR \"$bootdir\""
 
+echo "#undef ${package_macro_name}_STMPDIR"
+echo "#define ${package_macro_name}_STMPDIR \"$stmpdir\""
+
 echo "#undef ${package_macro_name}_DEFPATH"
 echo "#define ${package_macro_name}_DEFPATH \"$defpath\""
 
diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make
index ba6a6d6..f1d25a8 100644
--- a/package/configure-snippets/configure_generate_make
+++ b/package/configure-snippets/configure_generate_make
@@ -8,6 +8,7 @@ fi
 
 echo "REPODIR := $repodir"
 echo "BOOTDIR := $bootdir"
+echo "STMPDIR := $stmpdir"
 echo "DEFPATH := $defpath"
 
 if $adaemontools ; then
diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install
index a443a69..e35e7e7 100644
--- a/package/configure-snippets/configure_help_install
+++ b/package/configure-snippets/configure_help_install
@@ -2,4 +2,5 @@
   --livedir=DIR                 run s6-rc live directory in DIR [s6-rc default|/run/s6-rc]
   --repodir=DIR                 s6-frontend working base [/var/lib/s6-frontend/repository]
   --bootdir=DIR                 location of the bootable s6-rc compiled db [/etc/s6-rc]
+  --stmpdir=DIR                 secure location for temporary s6-frontend files [/run/s6-frontend]
   --with-def-path=PATH          path to service files [LIBDIR/s6-frontend/s6-rc/source:SYSCONFDIR/s6-frontend/s6-rc/source]
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
index 36c8e65..c6dc45d 100644
--- a/package/configure-snippets/configure_init_vars
+++ b/package/configure-snippets/configure_init_vars
@@ -2,6 +2,7 @@ scandir=
 livedir=
 repodir=/var/lib/s6-frontend/s6-rc/repository
 bootdir=/etc/s6-rc
+stmpdir=/run/s6-frontend
 defpath='$libdir/s6-frontend/s6-rc/source:$sysconfdir/s6-frontend/s6-rc/source'
 usensss=false
 uses6li=true
diff --git a/package/deps.mak b/package/deps.mak
index c9d5970..4f40ecf 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -7,6 +7,10 @@ src/alias/s6-frontend-alias-chpst.o src/alias/s6-frontend-alias-chpst.lo: src/al
 src/alias/s6-frontend-alias-sv.o src/alias/s6-frontend-alias-sv.lo: src/alias/s6-frontend-alias-sv.c
 src/alias/s6-frontend-alias.o src/alias/s6-frontend-alias.lo: src/alias/s6-frontend-alias.c src/include/s6-frontend/config.h
 src/config/s6-frontend-config-preprocess.o src/config/s6-frontend-config-preprocess.lo: src/config/s6-frontend-config-preprocess.c
+src/libs6f/s6f_confdir_open.o src/libs6f/s6f_confdir_open.lo: src/libs6f/s6f_confdir_open.c src/include-local/s6f.h
+src/libs6f/s6f_lock.o src/libs6f/s6f_lock.lo: src/libs6f/s6f_lock.c src/include-local/s6f.h
+src/libs6f/s6f_mkdirp.o src/libs6f/s6f_mkdirp.lo: src/libs6f/s6f_mkdirp.c src/include-local/s6f.h
+src/libs6f/s6f_report_state_change.o src/libs6f/s6f_report_state_change.lo: src/libs6f/s6f_report_state_change.c src/include-local/s6f.h
 src/libs6f/s6f_user_get_confdirs.o src/libs6f/s6f_user_get_confdirs.lo: src/libs6f/s6f_user_get_confdirs.c src/include-local/s6f.h
 src/s6/help.o src/s6/help.lo: src/s6/help.c src/s6/s6-internal.h
 src/s6/process.o src/s6/process.lo: src/s6/process.c src/s6/s6-internal.h
@@ -31,12 +35,10 @@ s6-frontend-alias-sv: src/alias/s6-frontend-alias-sv.o -ls6 -lskarnet
 s6-frontend-config-preprocess: EXTRA_LIBS :=
 s6-frontend-config-preprocess: src/config/s6-frontend-config-preprocess.o -lskarnet
 ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
-libs6f.a.xyzzy: src/libs6f/s6f_user_get_confdirs.o ${LIBNSSS}
+libs6f.a.xyzzy: src/libs6f/s6f_confdir_open.o src/libs6f/s6f_lock.o src/libs6f/s6f_mkdirp.o src/libs6f/s6f_report_state_change.o src/libs6f/s6f_user_get_confdirs.o ${LIBNSSS}
 else
-libs6f.a.xyzzy:src/libs6f/s6f_user_get_confdirs.lo ${LIBNSSS}
+libs6f.a.xyzzy:src/libs6f/s6f_confdir_open.lo src/libs6f/s6f_lock.lo src/libs6f/s6f_mkdirp.lo src/libs6f/s6f_report_state_change.lo src/libs6f/s6f_user_get_confdirs.lo ${LIBNSSS}
 endif
-s6f: EXTRA_LIBS :=
-s6f: src/libs6f/s6f.o src/libs6f/s6f_user_get_confdirs.o
 s6: EXTRA_LIBS :=
-s6: src/s6/s6.o src/s6/help.o src/s6/util.o src/s6/process.o src/s6/process_kill.o src/s6/process_restart.o src/s6/process_start.o src/s6/process_status.o src/s6/process_stop.o src/s6/service.o src/s6/service_start.o src/s6/service_status.o src/s6/service_stop.o libs6f.a.xyzzy -ls6 -lskarnet
+s6: src/s6/s6.o src/s6/help.o src/s6/util.o src/s6/process.o src/s6/process_kill.o src/s6/process_restart.o src/s6/process_start.o src/s6/process_status.o src/s6/process_stop.o src/s6/service.o src/s6/service_start.o src/s6/service_status.o src/s6/service_stop.o libs6f.a.xyzzy -ls6rc -ls6 -lskarnet
 INTERNAL_LIBS := libs6f.a.xyzzy