Release candidate.

17 files changed, 163 insertions, 57 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index e110d6869579..d33f08db6c39 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.101 2004/11/29 22:57:40 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.102 2004/12/11 07:10:46 langthang Exp $
+
+*courier-imap-4.0.0_rc1 (11 Dec 2004)
+
+  11 Dec 2004; Tuan Van <langthang@gentoo.org>
+  -files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6,
+  -files/courier-imap-3.0.8.20041116-courier-imapd.rc6,
+  -files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6,
+  -files/courier-imap-3.0.8.20041116-courier-pop3d.rc6,
+  -files/courier-imap-3.0.8.20041116-db4-bdbobj_configure.in.patch,
+  -files/courier-imap-3.0.8.20041116-db4-configure.in.patch,
+  -files/courier-imap-3.0.8.20041116-disable-fam-configure.in.patch,
+  -files/courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc,
+  -files/courier-imap-3.0.8.20041116-gentoo-imapd.rc,
+  -files/courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc,
+  -files/courier-imap-3.0.8.20041116-gentoo-pop3d.rc,
+  +files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6,
+  +files/courier-imap-4.0.0_rc1-courier-imapd.rc6,
+  +files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6,
+  +files/courier-imap-4.0.0_rc1-courier-pop3d.rc6,
+  +files/courier-imap-4.0.0_rc1-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-4.0.0_rc1-db4-configure.in.patch,
+  +files/courier-imap-4.0.0_rc1-disable-fam-configure.in.patch,
+  +files/courier-imap-4.0.0_rc1-gentoo-imapd-ssl.rc,
+  +files/courier-imap-4.0.0_rc1-gentoo-imapd.rc,
+  +files/courier-imap-4.0.0_rc1-gentoo-pop3d-ssl.rc,
+  +files/courier-imap-4.0.0_rc1-gentoo-pop3d.rc,
+  +files/courier-imap-gentoo.readme, -courier-imap-3.0.8.20041116.ebuild,
+  +courier-imap-4.0.0_rc1.ebuild:
+  Release candidate.
 
   29 Nov 2004; Andrej Kacian <ticho@gentoo.org> courier-imap-3.0.7.ebuild,
   courier-imap-3.0.8.ebuild:
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index b268c36bf5e7..7239446fedc8 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,47 +1,48 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 82d9b1e80cec70d02af069b813f1f1dd ChangeLog 17538
-MD5 af11564a1490667c8c8cd4a6c8b4136a courier-imap-3.0.8.20041116.ebuild 9941
-MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
-MD5 124153c3cb5354f9f9b29bb7b576d003 courier-imap-3.0.8.ebuild 9386
 MD5 9a72d49ced92457074aeaf8119551eda courier-imap-3.0.7.ebuild 9228
-MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
-MD5 17099166e97d401e84270e6604b08e6e files/digest-courier-imap-3.0.8.20041116 81
-MD5 39e2ec0f1212612a99f443d6e6275139 files/courier-imap-3.0.8-db4-configure.in.patch 1337
-MD5 39e2ec0f1212612a99f443d6e6275139 files/courier-imap-3.0.7-db4-configure.in.patch 1337
-MD5 7d5ddf4fa33c73befa0bd434a17022f9 files/authdaemond.conf-3.0.4-r1 544
-MD5 5d57e73c7593d5bb37135d3964d6d4c2 files/digest-courier-imap-3.0.7 72
-MD5 a5029d4de95a9deca6254a889ed7fd0b files/gentoo-pop3d-ssl-1.7.3-r1.rc 1012
-MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.7-disable-fam-configure.in.patch 654
-MD5 acd9c484e6ee4d45dc81cb22ede09837 files/courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc 1101
-MD5 5879bfc8c6b847d7ef364b4ca6b40880 files/courier-imapd-ssl.rc6-3.0.5 1196
-MD5 2a97f1311b8ca152f6eba801bb5c0137 files/courier-imap-3.0.8.20041116-gentoo-imapd.rc 1138
-MD5 2399f4a660fd7149e3fe19f0bfc230e1 files/gentoo-imapd-1.7.3-r1.rc 1074
-MD5 140a2653b4e3e2b7c9967d691da7a9ea files/digest-courier-imap-3.0.8 72
-MD5 32146f7906e4113b67c6a0721e949ce8 files/courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc 1076
+MD5 c6f982914e99d023996c1e743283d68d courier-imap-4.0.0_rc1.ebuild 10008
+MD5 124153c3cb5354f9f9b29bb7b576d003 courier-imap-3.0.8.ebuild 9386
+MD5 9f173eb344ab29d7f4cee1c375a30d17 ChangeLog 19011
+MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
 MD5 d9d0cf2a19ee5b20039583b7cb4cffcc files/courier-pop3d-ssl.rc6-3.0.5 1204
-MD5 2de8e85e16590fb39a7b7a440de73f0a files/courier-imap-3.0.8.20041116-gentoo-pop3d.rc 1084
-MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.8-disable-fam-configure.in.patch 654
-MD5 9f46519bb9780f36b21727a008545b89 files/courier-pop3d.rc6 953
-MD5 41b0b05702438e6f56fa885f2d6ef00e files/courier-imap-3.0.8.20041116-courier-pop3d.rc6 983
-MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
-MD5 9e69a26cf7b3bf68338f701fece09a35 files/gentoo-imapd-ssl-1.7.3-r1.rc 1036
-MD5 5755dc40bcbd013096627980e8c2ce23 files/courier-imap-3.0.8.20041116-courier-imapd.rc6 975
-MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-3.0.8.20041116-db4-bdbobj_configure.in.patch 1263
-MD5 809353b25074ad1ff5bf77ac1766f208 files/courier-imap-3.0.8.20041116-db4-configure.in.patch 1303
-MD5 7b63692757164cd5533b4091e49a72a7 files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6 1228
+MD5 95862c9861907ffce077af52c09c7a91 files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6 1215
 MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch 1263
-MD5 a62b9cfcf4c0c67b515eb90e6422233c files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6 1220
+MD5 5879bfc8c6b847d7ef364b4ca6b40880 files/courier-imapd-ssl.rc6-3.0.5 1196
+MD5 aebf119b54b485aa50571173566f4a09 files/courier-imap-gentoo.readme 2827
+MD5 cea7ddd8c64d73689bb081517c4269c2 files/courier-imap-4.0.0_rc1-gentoo-pop3d.rc 1079
 MD5 71a551a4f772f4299f9752f3d043b8c5 files/authdaemond-3.0.4-r1 1062
-MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.8.20041116-disable-fam-configure.in.patch 654
-MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-3.0.8-db4-bdbobj_configure.in.patch 1263
+MD5 7d5ddf4fa33c73befa0bd434a17022f9 files/authdaemond.conf-3.0.4-r1 544
 MD5 1709ef97052398ee74b0d7d7786d398a files/gentoo-pop3d-1.7.3-r1.rc 1020
+MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.7-disable-fam-configure.in.patch 654
+MD5 3d8b2a9b9250d63c95a4765f371efe9f files/courier-imap-4.0.0_rc1-gentoo-imapd-ssl.rc 1096
+MD5 7a51b463b3f20d8cca819e652093584e files/digest-courier-imap-4.0.0_rc1 72
+MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-4.0.0_rc1-disable-fam-configure.in.patch 654
 MD5 90bb778616a7c67658b9e78890d4b8fe files/courier-imapd.rc6 945
+MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
+MD5 3c04ad52c0ddaf21f27e2c503c5e206e files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6 1223
+MD5 a5029d4de95a9deca6254a889ed7fd0b files/gentoo-pop3d-ssl-1.7.3-r1.rc 1012
+MD5 d345c2ef83bec94f193f027acc5b763f files/courier-imap-4.0.0_rc1-courier-pop3d.rc6 978
+MD5 92011c7dddd994ff7b7815fd04a9ba6a files/courier-imap-4.0.0_rc1-gentoo-imapd.rc 1133
+MD5 9e69a26cf7b3bf68338f701fece09a35 files/gentoo-imapd-ssl-1.7.3-r1.rc 1036
+MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-4.0.0_rc1-db4-bdbobj_configure.in.patch 1263
+MD5 809353b25074ad1ff5bf77ac1766f208 files/courier-imap-4.0.0_rc1-db4-configure.in.patch 1303
+MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-3.0.8-db4-bdbobj_configure.in.patch 1263
+MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.8-disable-fam-configure.in.patch 654
+MD5 39e2ec0f1212612a99f443d6e6275139 files/courier-imap-3.0.8-db4-configure.in.patch 1337
+MD5 bbe9d77a90e775e016a7b5eb20fcc82e files/courier-imap-4.0.0_rc1-courier-imapd.rc6 970
+MD5 c4f606d3c35ebf8b8d5b884b52727303 files/courier-imap-4.0.0_rc1-gentoo-pop3d-ssl.rc 1071
+MD5 5d57e73c7593d5bb37135d3964d6d4c2 files/digest-courier-imap-3.0.7 72
+MD5 140a2653b4e3e2b7c9967d691da7a9ea files/digest-courier-imap-3.0.8 72
+MD5 39e2ec0f1212612a99f443d6e6275139 files/courier-imap-3.0.7-db4-configure.in.patch 1337
+MD5 2399f4a660fd7149e3fe19f0bfc230e1 files/gentoo-imapd-1.7.3-r1.rc 1074
+MD5 9f46519bb9780f36b21727a008545b89 files/courier-pop3d.rc6 953
+MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBq6lr10xuJSrg3/sRAubyAJ40KKLLNwAfleEt9nizv6dxXy5zmwCfco/H
-LFD2c1ZvT/E/P/3vxbnHXhU=
-=pB2k
+iD8DBQFBuqtG5FrxP71izLARAjrjAJ95r9YQh2T4rxVx5baU4/H4ooDb2ACfS/4E
+UmgpNJOkIbcB/KrYpiGxmb8=
+=pCqT
 -----END PGP SIGNATURE-----
diff --git a/net-mail/courier-imap/courier-imap-3.0.8.20041116.ebuild b/net-mail/courier-imap/courier-imap-4.0.0_rc1.ebuild
index f49d932534f8..1b0f90b08fab 100644
--- a/net-mail/courier-imap/courier-imap-3.0.8.20041116.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.0.0_rc1.ebuild
@@ -1,27 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.8.20041116.ebuild,v 1.3 2004/11/27 06:22:43 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.0_rc1.ebuild,v 1.1 2004/12/11 07:10:46 langthang Exp $
 
 inherit eutils gnuconfig
+IUSE="fam berkdb gdbm debug ipv6 nls selinux"
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 HOMEPAGE="http://www.courier-mta.org/"
 #SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-SRC_URI=""http://www.courier-mta.org/beta/imap/${P}.tar.bz2""
+MY_PV=${PV/_rc*/}
+SRC_URI=""http://www.courier-mta.org/beta/imap/${PN}-${MY_PV}.tar.bz2""
 
 LICENSE="GPL-2"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-KEYWORDS="-*"
-IUSE="fam berkdb gdbm debug ipv6 nls selinux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 #userpriv breaks linking against vpopmail
-RESTRICT="nouserpriv"
+#do not mirror beta release.
+RESTRICT="nouserpriv nomirror"
 
 RDEPEND="virtual/libc
 	>=dev-libs/openssl-0.9.6
 	berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	>=dev-tcltk/expect-5.33.0
 	fam? ( virtual/fam )
 	selinux? ( sec-policy/selinux-courier-imap )"
 DEPEND="${RDEPEND}
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
 	!virtual/imapd"
 PROVIDE="virtual/imapd"
 
+S=${WORKDIR}/${PN}-${MY_PV}
 pkg_setup() {
 	if ! use berkdb && ! use gdbm; then
 		echo
@@ -299,7 +300,8 @@ src_install() {
 	# bug #45953, more docs
 	cd ${S}
 	dohtml -r ${S}/*
-	dodoc ${S}/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog}
+	dodoc ${S}/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} \
+		${FILESDIR}/courier-imap-gentoo.readme
 	docinto imap
 	dodoc ${S}/imap/{ChangeLog,BUGS,BUGS.html,README}
 	docinto maildir
@@ -309,11 +311,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	# rebuild init deps to include deps on authdaemond
-	/etc/init.d/depscan.sh
-	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
-	einfo "you would like to use something other than the"
-	einfo "authdaemond.plain authenticator"
+	einfo "Authdaemond is no longer provided this package."
+	einfo "athentication libraries are from courier-authlib"
+	einfo "for a quick start please refer to"
+	einfo "/usr/share/doc/${P}/courier-imap-gentoo.readme.gz"
 }
 
 src_test() {
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6
index 753796ca40bd..78deedf38eba 100644
--- a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6,v 1.1 2004/11/19 06:26:17 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-imapd-ssl.rc6,v 1.1 2004/12/11 07:10:46 langthang Exp $
 
 depend() {
 	need net authdaemond
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-imapd.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-imapd.rc6
index 32e00c3b24ed..7dc746b80438 100644
--- a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-imapd.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-imapd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-imapd.rc6,v 1.1 2004/11/19 06:26:17 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-imapd.rc6,v 1.1 2004/12/11 07:10:46 langthang Exp $
 
 depend() {
 	need net authdaemond
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6
index a69ae2b9c85d..93158e1c228f 100644
--- a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6,v 1.1 2004/11/19 06:26:17 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-pop3d-ssl.rc6,v 1.1 2004/12/11 07:10:46 langthang Exp $
 
 depend() {
 	need net authdaemond
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-pop3d.rc6 b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-pop3d.rc6
index 55f1e8e7087c..5643bda4b26d 100644
--- a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-pop3d.rc6
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-pop3d.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-pop3d.rc6,v 1.1 2004/11/19 06:26:17 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-courier-pop3d.rc6,v 1.1 2004/12/11 07:10:46 langthang Exp $
 
 depend() {
 	need net authdaemond
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-db4-bdbobj_configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-db4-bdbobj_configure.in.patch
index 776fdc144483..776fdc144483 100644
--- a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-db4-bdbobj_configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-db4-bdbobj_configure.in.patch
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-db4-configure.in.patch
index 400b746a233a..400b746a233a 100644
--- a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-db4-configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-db4-configure.in.patch
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-disable-fam-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-disable-fam-configure.in.patch
index 7019d02a6af5..7019d02a6af5 100644
--- a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-disable-fam-configure.in.patch
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-disable-fam-configure.in.patch
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-imapd-ssl.rc
index 0c153bde60e3..df0ebdb3c858 100644
--- a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-imapd-ssl.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc,v 1.1 2004/11/19 06:26:17 langthang Exp $
+# $Id: courier-imap-4.0.0_rc1-gentoo-imapd-ssl.rc,v 1.1 2004/12/11 07:10:46 langthang Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-imapd.rc b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-imapd.rc
index 1d2ea9bb18cf..14daa0f8bf08 100644
--- a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-imapd.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-imapd.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-3.0.8.20041116-gentoo-imapd.rc,v 1.1 2004/11/19 06:26:17 langthang Exp $
+# $Id: courier-imap-4.0.0_rc1-gentoo-imapd.rc,v 1.1 2004/12/11 07:10:46 langthang Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-pop3d-ssl.rc
index 761fc49deb8a..40220df710dc 100644
--- a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-pop3d-ssl.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc,v 1.1 2004/11/19 06:26:17 langthang Exp $
+# $Id: courier-imap-4.0.0_rc1-gentoo-pop3d-ssl.rc,v 1.1 2004/12/11 07:10:46 langthang Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-pop3d.rc b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-pop3d.rc
index b858f20c4cd8..ddacbebbef17 100644
--- a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-pop3d.rc
+++ b/net-mail/courier-imap/files/courier-imap-4.0.0_rc1-gentoo-pop3d.rc
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: courier-imap-3.0.8.20041116-gentoo-pop3d.rc,v 1.1 2004/11/19 06:26:17 langthang Exp $
+# $Id: courier-imap-4.0.0_rc1-gentoo-pop3d.rc,v 1.1 2004/12/11 07:10:46 langthang Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
diff --git a/net-mail/courier-imap/files/courier-imap-gentoo.readme b/net-mail/courier-imap/files/courier-imap-gentoo.readme
new file mode 100644
index 000000000000..b11a804fc3ea
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-gentoo.readme
@@ -0,0 +1,75 @@
+// This quick guide is for mysql authentication support base on the Gentoo Virtual Mailhosting Guide
+// turn ON mysql USE flag for courier-authlib. Need to authenticate against mysql database backend.
+localhost ~ # nano -w /etc/portage/package.use
+net-libs/courier-authlib mysql
+net-mail/courier-imap mysql
+localhost ~ # emerge courier-imap
+// limit to mysql module only, instead load all of them.
+localhost ~ # nano -w /etc/courier/authlib/authdaemonrc
+authmodulelist="authmysql"
+
+// set variables to match your setup.
+localhost ~ # nano -w /etc/courier/authlib/authmysqlrc
+MYSQL_SERVER            localhost
+MYSQL_USERNAME          mailsql_admin_username
+MYSQL_PASSWORD          password
+MYSQL_DATABASE          mailsql_database
+MYSQL_USER_TABLE        users
+# MYSQL_CRYPT_PWFIELD   crypt (commented this out if you want CRAM-MD5)
+MYSQL_CLEAR_PWFIELD     clear
+MYSQL_LOGIN_FIELD       email
+MYSQL_HOME_FIELD        homedir
+MYSQL_MAILDIR_FIELD     maildir
+
+// Start authdaemond
+localhost ~ # etc/init.d/courier-authlib start
+* Starting courier-authlib: authdaemond ...                                               [ ok ]
+
+### Courier-IMAP' ssl certificate setup
+localhost ~ # nano -w /etc/courier-imap/imapd.cnf
+localhost ~ # nano -w /etc/courier-imap/pop3.cnf
+// change to match your site.
+[ req_dn ]
+C=US
+ST=NY
+L=New York
+O=Courier Mail Server
+OU=Automatically-generated IMAP SSL key
+CN=mailhost.example.com
+emailAddress=postmaster@example.com
+
+// Generate Certificate
+localhost ~ # mkimapdcert
+...
+writing new private key to '/etc/courier-imap/imapd.pem'
+...
+localhost ~ # mkpop3dcert
+...
+writing new private key to '/etc/courier-imap/pop3d.pem'
+...
+
+### Secure Authentication Setup (CRAM-MD5)
+localhost ~ # nano -w /etc/courier-imap/imapd
+IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE AUTH=CRAM-MD5"
+
+### Start Courier-imap daemons.
+localhost ~ # /etc/init.d/courier-pop3d start
+localhost ~ # /etc/init.d/courier-pop3d-ssl start
+localhost ~ # /etc/init.d/courier-imapd start
+localhost ~ # /etc/init.d/courier-imapd-ssl start
+
+### Checking authentication.
+// From your favorite client send an email to user@your_domain.com
+// so your mail user's maildir created by your MTA.
+// you can not login unless user maildir has been created.
+localhost ~ $ telnet mailexample.com 143
+Trying xxx.xxx.xxx.xxx...
+Connected to mail.example.com (xxx.xxx.xxx.xxx).
+Escape character is '^]'.
+* OK [CAPABILITY IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE AUTH=CRAM-MD5 ACL ACL2=UNION STARTTLS] Courier-IMAP ready. Copyright 1998-2004 Double Precision, Inc.  See COPYING for distribution information.
+a login user@example.com password
+a OK LOGIN Ok.
+ OK LOGOUT completed
+Connection closed by foreign host.
+
+### That's all folks.
diff --git a/net-mail/courier-imap/files/digest-courier-imap-3.0.8.20041116 b/net-mail/courier-imap/files/digest-courier-imap-3.0.8.20041116
deleted file mode 100644
index 07f59de3eb92..000000000000
--- a/net-mail/courier-imap/files/digest-courier-imap-3.0.8.20041116
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0f5c41ffb2e755c2ff9a61c6c97dcbda courier-imap-3.0.8.20041116.tar.bz2 3029309
diff --git a/net-mail/courier-imap/files/digest-courier-imap-4.0.0_rc1 b/net-mail/courier-imap/files/digest-courier-imap-4.0.0_rc1
new file mode 100644
index 000000000000..db6b4d37b430
--- /dev/null
+++ b/net-mail/courier-imap/files/digest-courier-imap-4.0.0_rc1
@@ -0,0 +1 @@
+MD5 4c5654259d4dd03750d7c6f2aa4be7ec courier-imap-4.0.0.tar.bz2 3031646