dot

packages and services management
Log | Files | Refs | README

commit d47a394bab5a8c01d9c9b20d1a0cf133b5be1f8a
parent 2ce8688197df76e1d9ad3d4c4e6aa0f9100a52ed
Author: Josuah Demangeon <mail@josuah.net>
Date:   Fri, 23 Nov 2018 00:47:46 +0100

s6/vtund: make it at least boot

Diffstat:
Dpack/vtun/build | 32--------------------------------
Dpack/vtun/dependencies/liblzo | 2--
Dpack/vtun/dependencies/libressl | 2--
Dpack/vtun/dependencies/libz | 2--
Dpack/vtun/dependencies/oyacc | 2--
Apack/vtund/build | 32++++++++++++++++++++++++++++++++
Apack/vtund/dependencies/bison | 2++
Apack/vtund/dependencies/liblzo | 2++
Apack/vtund/dependencies/libressl | 2++
Apack/vtund/dependencies/libz | 2++
Rpack/vtun/tar -> pack/vtund/tar | 0
Rpack/vtun/version -> pack/vtund/version | 0
Rs6/vtund/x/conf/options/persist -> s6/vtund/client/conf/options/persist | 0
As6/vtund/josuah.net/conf/glaphyrae/up/program | 1+
As6/vtund/josuah.net/env/SESSION | 1+
Ms6/vtund/x/print | 4++--
Ms6/vtund/x/setup | 6++++++
17 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/pack/vtun/build b/pack/vtun/build @@ -1,32 +0,0 @@ -#!/bin/sh -e - -export CFLAGS="$(echo \ - -I$libz/include \ - -I$liblzo/include \ - -I$libressl/include \ -)" - -export LDFLAGS="$(echo \ - -L$libz/lib \ - -L$liblzo/lib \ - -L$libressl/lib \ -)" - -./configure \ - --prefix="$PREFIX" \ - --with-ssl-lib="$libressl/lib" \ - --with-lzo-headers="$liblzo/include/lzo" \ - --with-lzo-lib="$liblzo/lib" \ - --with-ssl-headers="$libressl/include/openssl" \ - --with-blowfish-headers="$libressl/include/openssl" - -for f in *.[cyh]; do - sed 's/inline //' $f >$$ - mv $$ $f -done - -grep -vF '$(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund' Makefile >$$ -mv $$ Makefile -make install - -mv "$PREFIX/sbin" "$PREFIX/bin" diff --git a/pack/vtun/dependencies/liblzo b/pack/vtun/dependencies/liblzo @@ -1 +0,0 @@ -../../liblzo/version- \ No newline at end of file diff --git a/pack/vtun/dependencies/libressl b/pack/vtun/dependencies/libressl @@ -1 +0,0 @@ -../../libressl/version- \ No newline at end of file diff --git a/pack/vtun/dependencies/libz b/pack/vtun/dependencies/libz @@ -1 +0,0 @@ -../../libz/version- \ No newline at end of file diff --git a/pack/vtun/dependencies/oyacc b/pack/vtun/dependencies/oyacc @@ -1 +0,0 @@ -../../oyacc/version- \ No newline at end of file diff --git a/pack/vtund/build b/pack/vtund/build @@ -0,0 +1,32 @@ +#!/bin/sh -e + +export CFLAGS="$(echo \ + -I$libz/include \ + -I$liblzo/include \ + -I$libressl/include \ +)" + +export LDFLAGS="$(echo \ + -L$libz/lib \ + -L$liblzo/lib \ + -L$libressl/lib \ +) -static" + +./configure \ + --prefix="$PREFIX" \ + --with-ssl-lib="$libressl/lib" \ + --with-lzo-headers="$liblzo/include/lzo" \ + --with-lzo-lib="$liblzo/lib" \ + --with-ssl-headers="$libressl/include/openssl" \ + --with-blowfish-headers="$libressl/include/openssl" + +for f in *.[cyh]; do + sed 's/inline //' $f >$$ + mv $$ $f +done + +grep -vF '$(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund' Makefile >$$ +mv $$ Makefile +make install + +mv "$PREFIX/sbin" "$PREFIX/bin" diff --git a/pack/vtund/dependencies/bison b/pack/vtund/dependencies/bison @@ -0,0 +1 @@ +../../bison/version+ \ No newline at end of file diff --git a/pack/vtund/dependencies/liblzo b/pack/vtund/dependencies/liblzo @@ -0,0 +1 @@ +../../liblzo/version+ \ No newline at end of file diff --git a/pack/vtund/dependencies/libressl b/pack/vtund/dependencies/libressl @@ -0,0 +1 @@ +../../libressl/version+ \ No newline at end of file diff --git a/pack/vtund/dependencies/libz b/pack/vtund/dependencies/libz @@ -0,0 +1 @@ +../../libz/version+ \ No newline at end of file diff --git a/pack/vtun/tar b/pack/vtund/tar diff --git a/pack/vtun/version b/pack/vtund/version diff --git a/s6/vtund/x/conf/options/persist b/s6/vtund/client/conf/options/persist diff --git a/s6/vtund/josuah.net/conf/glaphyrae/up/program b/s6/vtund/josuah.net/conf/glaphyrae/up/program @@ -0,0 +1 @@ +/bin/true diff --git a/s6/vtund/josuah.net/env/SESSION b/s6/vtund/josuah.net/env/SESSION @@ -0,0 +1 @@ +glaphyrae diff --git a/s6/vtund/x/print b/s6/vtund/x/print @@ -8,10 +8,10 @@ forbacktickx x { ls $1 } importas path x ifelse { test -d ${1}/${path} } { if { printf "%s%s {\n" $tab $path } if { $0 ${1}/${path} } - if { printf "%s}\n" $tab } + ifelse { test . = $1 } { printf "%s}\n" $tab } printf "%s};\n" $tab } ifelse { test -f ${1}/${path} } { redirfd -r 0 ${1}/${path} withstdinas -n x importas content x - printf "%s%s = %s;\n" $tab $path $content + printf "%s%s %s;\n" $tab $path $content } diff --git a/s6/vtund/x/setup b/s6/vtund/x/setup @@ -1,5 +1,11 @@ #!/usr/bin/env execlineb +if { mkdir -p env } +if { redirfd -w 1 env/SESSION uname -n } + +if { mkdir -p conf/session } +if { redirfd -w 1 conf/session/passwd pass vtun } + if { mkdir -p data } redirfd -w 1 data/conf cd conf