fix0rs by psi-jack

5 files changed, 12 insertions, 9 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index cf2828a4e27e..ce684a082a80 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.28 2003/02/12 08:08:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.29 2003/02/18 10:20:24 raker Exp $
+
+  18 Feb 2003; Nick Hadaway <raker@gentoo.org> files/gentoo-*.rc :
+  Updated gentoo-*.rc with fix0rs found by Psi-Jack!
 
 *courier-imap-1.7.0 (01 Feb 2003)
 
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
index a6fe26c67755..d6045bc0fa8e 100644
--- a/net-mail/courier-imap/files/gentoo-imapd-1.6.1.rc
+++ b/net-mail/courier-imap/files/gentoo-imapd-1.6.1.rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: gentoo-imapd-1.6.1.rc,v 1.1 2002/12/25 11:27:25 raker Exp $
+# $Id: gentoo-imapd-1.6.1.rc,v 1.2 2003/02/18 10:20:24 raker Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -19,7 +19,7 @@ do
 done
 
 ulimit -d $IMAP_ULIMITD
-export IMAP_STARTTLS=$IMAPDSTARTTLS
+export IMAPDSTARTTLS
 TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`
diff --git a/net-mail/courier-imap/files/gentoo-imapd.rc b/net-mail/courier-imap/files/gentoo-imapd.rc
index 76bac0b044cc..690bd48e041d 100644
--- a/net-mail/courier-imap/files/gentoo-imapd.rc
+++ b/net-mail/courier-imap/files/gentoo-imapd.rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: gentoo-imapd.rc,v 1.2 2002/06/15 00:30:23 nitro Exp $
+# $Id: gentoo-imapd.rc,v 1.3 2003/02/18 10:20:24 raker Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -19,7 +19,7 @@ do
 done
 
 ulimit -d $IMAP_ULIMITD
-export IMAP_STARTTLS=$IMAPDSTARTTLS
+export IMAPDSTARTTLS
 TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`
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
index 63fff3bb0cc4..95d61253dbc5 100644
--- a/net-mail/courier-imap/files/gentoo-pop3d-1.6.1.rc
+++ b/net-mail/courier-imap/files/gentoo-pop3d-1.6.1.rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: gentoo-pop3d-1.6.1.rc,v 1.1 2002/12/25 11:27:25 raker Exp $
+# $Id: gentoo-pop3d-1.6.1.rc,v 1.2 2003/02/18 10:20:24 raker Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -18,7 +18,7 @@ do
 	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
 done
 
-export POP3_STARTTLS=$POP3DSTARTTLS
+export POP3DSTARTTLS=$POP3_STARTTLS
 TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`
diff --git a/net-mail/courier-imap/files/gentoo-pop3d.rc b/net-mail/courier-imap/files/gentoo-pop3d.rc
index b27f8486bb50..6cb3e9fbcca3 100644
--- a/net-mail/courier-imap/files/gentoo-pop3d.rc
+++ b/net-mail/courier-imap/files/gentoo-pop3d.rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: gentoo-pop3d.rc,v 1.3 2002/06/15 01:39:57 nitro Exp $
+# $Id: gentoo-pop3d.rc,v 1.4 2003/02/18 10:20:24 raker Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -18,7 +18,7 @@ do
 	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
 done
 
-export POP3_STARTTLS=$POP3DSTARTTLS
+export POP3DSTARTTLS=$POP3_STARTTLS
 TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`