10 files changed, 41 insertions, 6 deletions
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
index 8b13789..d0af7a0 100644
--- a/package/configure-snippets/configure_case_lines
+++ b/package/configure-snippets/configure_case_lines
@@ -1 +1,2 @@
-
+    --with-qmail-home=*) qmailhome=${arg#*=} ;;
+    --with-qmailr-ids=*) qmailrids=${arg#*=} ;;
diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs
index 8b13789..f9a8b46 100644
--- a/package/configure-snippets/configure_expand_dirs
+++ b/package/configure-snippets/configure_expand_dirs
@@ -1 +1 @@
-
+qmailhome
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
index 8b13789..d9bcacf 100644
--- a/package/configure-snippets/configure_generate_configh
+++ b/package/configure-snippets/configure_generate_configh
@@ -1 +1,3 @@
+echo "#undef ${package_macro_name}_QMAIL_HOME"
+echo "#define ${package_macro_name}_QMAIL_HOME \"$qmailhome\""
 
diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make
index 8b13789..54fa00c 100644
--- a/package/configure-snippets/configure_generate_make
+++ b/package/configure-snippets/configure_generate_make
@@ -1 +1,3 @@
+echo "QMAIL_HOME := $qmailhome"
+echo "QMAILR_IDS := $qmailrids"
 
diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options
index 8b13789..b439bc5 100644
--- a/package/configure-snippets/configure_help_options
+++ b/package/configure-snippets/configure_help_options
@@ -1 +1,3 @@
+  --with-qmail-home=DIR       qmail installation directory [/var/qmail]
+  --with-qmailr-ids=uid:gid   qmail-remote user:group [qmailr:qmail]
 
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
index 8b13789..a30b387 100644
--- a/package/configure-snippets/configure_init_vars
+++ b/package/configure-snippets/configure_init_vars
@@ -1 +1,2 @@
-
+qmailhome=/var/qmail
+qmailrids=qmailr:qmail
diff --git a/package/deps.mak b/package/deps.mak
index 343c0fc..f17b9c0 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -2,8 +2,19 @@
 # This file has been generated by tools/gen-deps.sh
 #
 
+src/qmail-smtpc/qmail-smtpc.o src/qmail-smtpc/qmail-smtpc.lo: src/qmail-smtpc/qmail-smtpc.c src/qmail-smtpc/qmailr.h src/include/smtpd-starttls-proxy/config.h
+src/qmail-smtpc/qmailr_error.o src/qmail-smtpc/qmailr_error.lo: src/qmail-smtpc/qmailr_error.c src/include/smtpd-starttls-proxy/config.h
+src/qmail-smtpc/qmailr_tcpto.o src/qmail-smtpc/qmailr_tcpto.lo: src/qmail-smtpc/qmailr_tcpto.c src/qmail-smtpc/qmailr.h src/include/smtpd-starttls-proxy/config.h
+src/qmail-smtpc/smtproutes.o src/qmail-smtpc/smtproutes.lo: src/qmail-smtpc/smtproutes.c src/qmail-smtpc/qmailr.h src/include/smtpd-starttls-proxy/config.h
 src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.o src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.lo: src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.c
 
+ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
+libqmailr.a.xyzzy: src/qmail-smtpc/qmailr_error.o src/qmail-smtpc/qmailr_tcpto.o
+else
+libqmailr.a.xyzzy:src/qmail-smtpc/qmailr_error.lo src/qmail-smtpc/qmailr_tcpto.lo
+endif
+qmail-smtpc: EXTRA_LIBS :=
+qmail-smtpc: src/qmail-smtpc/qmail-smtpc.o src/qmail-smtpc/smtproutes.o libqmailr.a.xyzzy -lskarnet
 smtpd-starttls-proxy-io: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
 smtpd-starttls-proxy-io: src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.o -lskarnet
-INTERNAL_LIBS :=
+INTERNAL_LIBS := libqmailr.a.xyzzy
diff --git a/package/info b/package/info
index c93dc0c..8c539c9 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=smtpd-starttls-proxy
-version=0.0.2.1
+version=0.1.0.0
 category=mail
 package_macro_name=SMTPD_STARTTLS_PROXY
diff --git a/package/modes b/package/modes
index 07461a5..e22534f 100644
--- a/package/modes
+++ b/package/modes
@@ -1 +1,2 @@
 smtpd-starttls-proxy-io	0755
+qmail-smtpc		0755
diff --git a/package/targets.mak b/package/targets.mak
index 9faea17..c4707f9 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -1,5 +1,20 @@
 BIN_TARGETS := \
-smtpd-starttls-proxy-io
+smtpd-starttls-proxy-io \
+qmail-smtpc
 
 LIBEXEC_TARGETS :=
 
+EXTRA_INSTALL += install-qmailr
+
+QMAILR_UID := $(firstword $(subst :, ,$(QMAILR_IDS)))
+QMAILR_GID := $(lastword $(subst :, ,$(QMAILR_IDS)))
+
+install-qmailr:
+	mkdir -p -- $(QMAIL_HOME)/run/qmail-remote
+	chgrp -- $(QMAILR_GID) $(QMAIL_HOME)/run
+	chmod 02750 $(QMAIL_HOME)/run
+	chown -- $(QMAILR_IDS) $(QMAIL_HOME)/run/qmail-remote
+	chmod 02700 $(QMAIL_HOME)/run/qmail-remote
+	touch -- $(QMAIL_HOME)/run/qmail-remote/tcpto6
+	chown -- $(QMAILR_IDS) $(QMAIL_HOME)/run/qmail-remote
+	chmod 0640 $(QMAIL_HOME)/run/qmail-remote