Improved qmail-ldap to install proper run scripts if we use runit and/or ipsvd

mail/qmail/qmail-ldap-use-ipsvd.diff

@@ -0,0 +1,34 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# Filename: package/.../qmail/qmail-ldap-use-ipsvd.diff
+# Copyright (C) 2008 The OpenSDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+diff --git a/qmail-smtpd.sh b/qmail-smtpd.sh
+index fc24d9f..400cb7d 100644
+--- a/qmail-smtpd.sh
++++ b/qmail-smtpd.sh
+@@ -28,8 +28,9 @@ fi
+ 
+ exec \
+ 	envuidgid $QUSER \
+-	tcpserver -v -URl $ME -x$QMAIL/control/qmail-smtpd.cdb \
+-	    ${CONCURRENCY:+"-c$CONCURRENCY"} ${BACKLOG:+"-b$BACKLOG"} 0 smtp \
+-	$PBSTOOL \
+-	$QMAIL/bin/qmail-smtpd
++	tcpsvd -vvh -u $QUSER -l $ME -i ./peers \
++		${CONCURRENCY:+"-c$CONCURRENCY"} ${BACKLOG:+"-b$BACKLOG"} \
++		${IP:-0} 25 \
++		$PBSTOOL \
++		$QMAIL/bin/qmail-smtpd
+ 

mail/qmail/qmail-ldap-use-runit.diff

@@ -0,0 +1,29 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# Filename: package/.../qmail/qmail-ldap-use-runit.diff
+# Copyright (C) 2008 The OpenSDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+diff --git a/install.c b/install.c
+index 1729fd9..cfdd6a8 100644
+--- a/install.c
++++ b/install.c
+@@ -210,7 +210,7 @@ int mode;
+     strerr_die4sys(111,FATAL,"unable to write .../",subdir,"/run: ");
+   if (substdio_puts(&ssout, loguser) == -1)
+     strerr_die4sys(111,FATAL,"unable to write .../",subdir,"/run: ");
+-  if (substdio_puts(&ssout, " multilog t ") == -1)
++  if (substdio_puts(&ssout, " svlogd -tt ") == -1)
+     strerr_die4sys(111,FATAL,"unable to write .../",subdir,"/run: ");
+   if (substdio_puts(&ssout, home) == -1)
+     strerr_die4sys(111,FATAL,"unable to write .../",subdir,"/run: ");

mail/qmail/qmail-ldap.conf

@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
 # Filename: package/.../qmail/qmail-ldap.conf
-# Copyright (C) 2006 - 2007 The OpenSDE Project
+# Copyright (C) 2006 - 2008 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -16,6 +16,16 @@
 # qmail-ldap patch is complete, so we remove our patches.
 patchfiles="`match_source_file -p qmail-ldap`"
 
+# adjusting the run scripts if we use runit and not daemontools
+if pkginstalled runit -a ! pkginstalled daemontools ; then
+	var_append patchfiles ' ' "$confdir/qmail-ldap-use-runit.diff"
+fi
+
+# adjusting the run scripts if we use ipsvd (tcpsvd) and not tcpserver
+if pkginstalled ipsvd -a ! pkginstalled tcpserver ; then
+	var_append patchfiles ' ' "$confdir/qmail-ldap-use-ipsvd.diff"
+fi
+
 LDAPFLAGS="-DALTQUEUE -DDASH_EXT"
 
 # Domain aliasing support for qmail-ldap