Prepare for 0.0.3.0; move to new system

Signed-off-by: Laurent Bercot <ska@appnovation.com>

13 files changed, 45 insertions, 9 deletions

diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
new file mode 100644
index 0000000..d5aff1c
--- /dev/null
+++ b/package/configure-snippets/configure_case_lines
@@ -0,0 +1,7 @@
+    --with-default-server=*) server=${arg#*=} ;;
+    --with-default-port=*) port=${arg#*=} ;;
+    --with-default-tlsport=*) tlsport=${arg#*=} ;;
+    --with-default-cadir=*) cadir=${arg#*=} ;;
+    --with-default-tls|--with-default-tls=yes) deftls=true ;;
+    --without-default-tls|--with-default-tls=no) deftls=false ;;
+    --with-tmpdir=*) tmpdir=${arg#*=} ;;
diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_expand_dirs
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_extra_checks b/package/configure-snippets/configure_extra_checks
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_extra_checks
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
new file mode 100644
index 0000000..994c3bd
--- /dev/null
+++ b/package/configure-snippets/configure_generate_configh
@@ -0,0 +1,10 @@
+echo "#define ${package_macro_name}_DEFAULT_SERVER \"$server\""
+echo "#define ${package_macro_name}_DEFAULT_PORT $port"
+echo "#define ${package_macro_name}_DEFAULT_TLSPORT $tlsport"
+echo "#define ${package_macro_name}_DEFAULT_CADIR \"$cadir\""
+if $deftls ; then
+echo "#define ${package_macro_name}_DEFAULT_TLS 1"
+else
+echo "#define ${package_macro_name}_DEFAULT_TLS 0"
+fi
+echo "#define ${package_macro_name}_TMPDIR \"$tmpdir\""
diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_generate_make
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_help_dependencies b/package/configure-snippets/configure_help_dependencies
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_help_dependencies
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_help_install
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options
new file mode 100644
index 0000000..1e42e52
--- /dev/null
+++ b/package/configure-snippets/configure_help_options
@@ -0,0 +1,7 @@
+  --with-default-server=SERVER  use SERVER as default server for apaste [adelielinux.xyz]
+  --with-default-port=PORT      use PORT as default clear port for apaste [9999]
+  --with-default-tlsport=PORT   use PORT as default TLS-enabled port for apaste [9997]
+  --with-default-cadir=CADIR    use CADIR as trust anchor certificate location [/etc/ssl/certs]
+  --with-default-tls            use secure connections by default [no]
+  --with-tmpdir=TMPDIR          make temporary files in TMPDIR [/tmp]
+
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
new file mode 100644
index 0000000..70f9977
--- /dev/null
+++ b/package/configure-snippets/configure_init_vars
@@ -0,0 +1,6 @@
+server=adelielinux.xyz
+port=9999
+tlsport=9997
+cadir=/etc/ssl/certs
+deftls=false
+tmpdir=/tmp
diff --git a/package/configure-snippets/configure_slashpackage_other b/package/configure-snippets/configure_slashpackage_other
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_slashpackage_other
@@ -0,0 +1 @@
+
diff --git a/package/deps-build b/package/deps-build
index c4bd95c..4c19ce5 100644
--- a/package/deps-build
+++ b/package/deps-build
@@ -1,2 +1,2 @@
-/package/prog/skalibs
-/package/net/s6-networking
+true		true	/package/prog/skalibs		2.14.4.0	libskarnet
+true		false	/package/net/s6-networking	2.7.1.0
diff --git a/package/deps.mak b/package/deps.mak
index 3f6192a..3dd8bb4 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -7,10 +7,10 @@ src/client/apastec.o src/client/apastec.lo: src/client/apastec.c src/include-loc
 src/client/send_file.o src/client/send_file.lo: src/client/send_file.c
 src/server/apasted.o src/server/apasted.lo: src/server/apasted.c src/include-local/apaste-common.h src/include/apaste/config.h
 
-apaste: EXTRA_LIBS := -lskarnet
-apaste: src/client/apaste.o
-apastec: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-apastec: src/client/apastec.o src/client/send_file.o
-apasted: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-apasted: src/server/apasted.o
+apaste: EXTRA_LIBS :=
+apaste: src/client/apaste.o -lskarnet
+apastec: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+apastec: src/client/apastec.o src/client/send_file.o -lskarnet
+apasted: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+apasted: src/server/apasted.o -lskarnet
 INTERNAL_LIBS :=
diff --git a/package/info b/package/info
index e005c82..3d4922b 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=apaste
-version=0.0.2.2
+version=0.0.3.0
 category=web
 package_macro_name=APASTE