Updated ebuild and added new gentoo rc files as logger has changed to

courierlogger.

6 files changed, 152 insertions, 4 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index da689a7d3fee..f7f27956eb65 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,9 +1,15 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.19 2002/12/13 11:00:07 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.20 2002/12/25 11:27:25 raker Exp $
 
 courier-imap-1.6.1 (12 Dec 2002)
 
+  25 Dec 2002; Nick Hadaway <raker@gentoo.org> courier-imap-1.6.1.ebuild,
+  files/gentoo-imapd-1.6.1.rc, files/gentoo-imapd-ssl-1.6.1.rc,
+  files/gentoo-pop3d-1.6.1.rc, files/gentoo-pop3d-ssl-1.6.1.rc :
+  Updated the gentoo rc files and ebuild as logger has changed
+  to courierlogger.
+
   12 Dec 2002; Nick Hadaway <raker@gentoo.org>
   courier-imap-1.6.1.ebuild, files/digest-courier-imap-1.6.1 :
   Version bump.  Added a test for vpopmail so proper configure options
diff --git a/net-mail/courier-imap/courier-imap-1.6.1.ebuild b/net-mail/courier-imap/courier-imap-1.6.1.ebuild
index c4fb565c223a..3bc8017c569e 100644
--- a/net-mail/courier-imap/courier-imap-1.6.1.ebuild
+++ b/net-mail/courier-imap/courier-imap-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.6.1.ebuild,v 1.2 2002/12/13 04:51:27 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.6.1.ebuild,v 1.3 2002/12/25 11:27:25 raker Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="http://twtelecom.dl.sourceforge.net/sourceforge/courier/${P}.tar.bz2"
@@ -45,6 +45,8 @@ src_compile() {
 		myconf="${myconf} --without-authvchkpw"
 	fi
 
+	myconf="${myconf} debug=true"
+
 	./configure \
 		--prefix=/usr \
 		--bindir=/usr/sbin \
@@ -142,8 +144,10 @@ src_install() {
 		newexe ${FILESDIR}/courier-pop3d-ssl.rc6 courier-pop3d-ssl
 
 	exeinto /usr/lib/courier-imap
-		doexe ${FILESDIR}/gentoo-imapd.rc ${FILESDIR}/gentoo-imapd-ssl.rc \
-			${FILESDIR}/gentoo-pop3d.rc ${FILESDIR}/gentoo-pop3d-ssl.rc
+		newexe ${FILESDIR}/gentoo-imapd-1.6.1.rc gentoo-imapd.rc
+		newexe ${FILESDIR}/gentoo-imapd-ssl-1.6.1.rc gentoo-imapd-ssl.rc
+		newexe ${FILESDIR}/gentoo-pop3d-1.6.1.rc gentoo-pop3d.rc
+		newexe ${FILESDIR}/gentoo-pop3d-ssl-1.6.1.rc gentoo-pop3d-ssl.rc
 
 	dodir /usr/bin
 	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
diff --git a/net-mail/courier-imap/files/gentoo-imapd-1.6.1.rc b/net-mail/courier-imap/files/gentoo-imapd-1.6.1.rc
new file mode 100644
index 000000000000..a6fe26c67755
--- /dev/null
+++ b/net-mail/courier-imap/files/gentoo-imapd-1.6.1.rc
@@ -0,0 +1,35 @@
+#!/bin/sh
+# $Id: gentoo-imapd-1.6.1.rc,v 1.1 2002/12/25 11:27:25 raker Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/imapd-ssl
+source /etc/courier-imap/imapd
+
+LIBAUTHMODULES=""
+for f in `echo $AUTHMODULES`
+do
+	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+done
+
+ulimit -d $IMAP_ULIMITD
+export IMAP_STARTTLS=$IMAPDSTARTTLS
+TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=imapd \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$PIDFILE $TCPDOPTS \
+	$PORT ${exec_prefix}/sbin/imaplogin $LIBAUTHMODULES \
+		/usr/sbin/courier-imapd ${MAILDIR}
diff --git a/net-mail/courier-imap/files/gentoo-imapd-ssl-1.6.1.rc b/net-mail/courier-imap/files/gentoo-imapd-ssl-1.6.1.rc
new file mode 100644
index 000000000000..fead207063d9
--- /dev/null
+++ b/net-mail/courier-imap/files/gentoo-imapd-ssl-1.6.1.rc
@@ -0,0 +1,35 @@
+#!/bin/sh
+# $Id: gentoo-imapd-ssl-1.6.1.rc,v 1.1 2002/12/25 11:27:25 raker Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/imapd
+source /etc/courier-imap/imapd-ssl
+
+LIBAUTHMODULES=""
+for f in `echo $AUTHMODULES`
+do
+	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+done
+
+ulimit -d $IMAP_ULIMITD
+export IMAP_TLS=1
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+/usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=imapd-ssl \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$SSLPIDFILE $TCPDOPTS \
+	$SSLPORT $COURIERTLS -server -tcpd \
+	${exec_prefix}/sbin/imaplogin $LIBAUTHMODULES \
+		/usr/sbin/courier-imapd ${MAILDIR}
diff --git a/net-mail/courier-imap/files/gentoo-pop3d-1.6.1.rc b/net-mail/courier-imap/files/gentoo-pop3d-1.6.1.rc
new file mode 100644
index 000000000000..63fff3bb0cc4
--- /dev/null
+++ b/net-mail/courier-imap/files/gentoo-pop3d-1.6.1.rc
@@ -0,0 +1,34 @@
+#!/bin/sh
+# $Id: gentoo-pop3d-1.6.1.rc,v 1.1 2002/12/25 11:27:25 raker Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/pop3d-ssl
+source /etc/courier-imap/pop3d
+
+LIBAUTHMODULES=""
+for f in `echo $AUTHMODULES`
+do
+	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+done
+
+export POP3_STARTTLS=$POP3DSTARTTLS
+TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=pop3d \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$PIDFILE $TCPDOPTS \
+	$PORT ${exec_prefix}/sbin/pop3login $LIBAUTHMODULES \
+		/usr/sbin/courier-pop3d ${MAILDIR}
diff --git a/net-mail/courier-imap/files/gentoo-pop3d-ssl-1.6.1.rc b/net-mail/courier-imap/files/gentoo-pop3d-ssl-1.6.1.rc
new file mode 100644
index 000000000000..4c86b61f551f
--- /dev/null
+++ b/net-mail/courier-imap/files/gentoo-pop3d-ssl-1.6.1.rc
@@ -0,0 +1,34 @@
+#!/bin/sh
+# $Id: gentoo-pop3d-ssl-1.6.1.rc,v 1.1 2002/12/25 11:27:25 raker Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/pop3d
+source /etc/courier-imap/pop3d-ssl
+
+LIBAUTHMODULES=""
+for f in `echo $AUTHMODULES`
+do
+	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+done
+
+export POP3_TLS=1
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+/usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=pop3d-ssl \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$SSLPIDFILE $TCPDOPTS \
+	$SSLPORT $COURIERTLS -server -tcpd \
+	${exec_prefix}/sbin/pop3login $LIBAUTHMODULES \
+		/usr/sbin/courier-pop3d ${MAILDIR}