Added choosable maildir/mbox authentication support. maildir is the

default.  Needs testing.

5 files changed, 164 insertions, 1 deletions

diff --git a/net-mail/uw-imap/ChangeLog b/net-mail/uw-imap/ChangeLog
index e7c3dc560a2f..5d3e0bd67448 100644
--- a/net-mail/uw-imap/ChangeLog
+++ b/net-mail/uw-imap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/uw-imap
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.5 2002/08/18 00:22:47 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.6 2002/09/25 15:36:16 raker Exp $
+
+*uw-imap-2001a-r3 (25 Sep 2002)
+
+  24 Sep 2002; Nick Hadaway <raker@gentoo.org> uw-imap-2001a-r3.ebuild,
+  files/digest-uw-imap-2001a-r3, files/gentoo-2001a-r3.diff,
+  files/imap-2001a.4-patch-with-delete-fix.bz2 :
+  Added initial Maildir support.  Much testing is needed.
 
 *uw-imap-2001a-r2 (6 Jun 2002)
 
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2001a-r3 b/net-mail/uw-imap/files/digest-uw-imap-2001a-r3
new file mode 100644
index 000000000000..b752e9d05f97
--- /dev/null
+++ b/net-mail/uw-imap/files/digest-uw-imap-2001a-r3
@@ -0,0 +1 @@
+MD5 42c5c8d049c209b15513a4f6ebba34d2 imap-2001a.tar.Z 1959777
diff --git a/net-mail/uw-imap/files/gentoo-2001a-r3.diff b/net-mail/uw-imap/files/gentoo-2001a-r3.diff
new file mode 100644
index 000000000000..9343a51d8ac0
--- /dev/null
+++ b/net-mail/uw-imap/files/gentoo-2001a-r3.diff
@@ -0,0 +1,38 @@
+diff -urN imap-2001a/Makefile imap-2001a-modified/Makefile
+--- imap-2001a/Makefile	Mon Oct 22 23:46:33 2001
++++ imap-2001a-modified/Makefile	Sat Aug 17 19:01:19 2002
+@@ -212,7 +212,7 @@
+ #	gradually-increasing intervals, starting at 2800-2900, and becoming
+ #	permanent at 48,300.
+ 
+-EXTRACFLAGS=
++EXTRACFLAGS=-DDISABLE_REVERSE_DNS_LOOKUP
+ 
+ 
+ # Extra linker flags (additional/alternative libraries, etc.)
+diff -urN imap-2001a/src/imapd/imapd.c imap-2001a-modified/src/imapd/imapd.c
+--- imap-2001a/src/imapd/imapd.c	Wed Nov 14 17:26:07 2001
++++ imap-2001a-modified/src/imapd/imapd.c	Sat Aug 17 18:55:51 2002
+@@ -37,7 +37,7 @@
+ 
+ #define MINUTES *60
+ 
+-#define LOGINTIMEOUT 3 MINUTES	/* not logged in autologout timer */
++#define LOGINTIMEOUT 1 MINUTES	/* not logged in autologout timer */
+ #define TIMEOUT 30 MINUTES	/* RFC 2060 minimum autologout timer */
+ #define ALERTTIMER 1 MINUTES	/* alert check timer */
+ #define SHUTDOWNTIMER 1 MINUTES	/* shutdown dally timer */
+diff -urN imap-2001a/src/osdep/unix/Makefile imap-2001a-modified/src/osdep/unix/Makefile
+--- imap-2001a/src/osdep/unix/Makefile	Tue Nov  6 18:16:43 2001
++++ imap-2001a-modified/src/osdep/unix/Makefile	Sat Aug 17 19:14:37 2002
+@@ -28,8 +28,8 @@
+ 
+ # Extended flags needed for SSL.  You may need to modify.
+ 
+-SSLDIR=/usr/local/src/openssl
+-SSLCERTS=$(SSLDIR)/certs
++SSLDIR=/usr
++SSLCERTS=$(SSLDIR)/lib/ssl/certs
+ SSLINCLUDE=$(SSLDIR)/include
+ SSLLIB=$(SSLDIR)/lib
+ 
diff --git a/net-mail/uw-imap/files/imap-2001a.4-patch-with-delete-fix.bz2 b/net-mail/uw-imap/files/imap-2001a.4-patch-with-delete-fix.bz2
new file mode 100644
index 000000000000..155041741ab7
--- /dev/null
+++ b/net-mail/uw-imap/files/imap-2001a.4-patch-with-delete-fix.bz2
diff --git a/net-mail/uw-imap/uw-imap-2001a-r3.ebuild b/net-mail/uw-imap/uw-imap-2001a-r3.ebuild
new file mode 100644
index 000000000000..7159a142b7b2
--- /dev/null
+++ b/net-mail/uw-imap/uw-imap-2001a-r3.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2001a-r3.ebuild,v 1.1 2002/09/25 15:36:16 raker Exp $
+
+PN0=imap
+S=${WORKDIR}/${PN0}-${PV}
+
+DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
+SRC_URI="ftp://ftp.cac.washington.edu/${PN0}/${PN0}-${PV}.tar.Z"
+HOMEPAGE="http://www.washington.edu/imap/"
+
+PROVIDE="virtual/imapd"
+DEPEND="virtual/glibc
+	>=sys-libs/pam-0.72
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 sparc sparc64"
+
+src_unpack() {
+
+	unpack ${A}
+
+	# Set CFLAGS
+	cd ${S}/src/osdep/unix/
+	sed "s:-g -fno-omit-frame-pointer -O6:${CFLAGS}:" Makefile > Makefile.bak
+	mv Makefile.bak Makefile
+
+	cd ${S}
+
+	# Use .maildir by default
+	if [ -z "`use mbox`" ]; then
+		bzcat ${FILESDIR}/imap-2001a.4-patch-with-delete-fix.bz2 \
+			| patch -p1 || die "patch failed"
+		# SSL cleanup
+		patch -p1 < ${FILESDIR}/gentoo-2001a-r3.diff \
+			|| die "patch failed"
+		export EXTRACFLAGS=-DMAILSUBDIR=\".maildir\"
+	else
+		patch -p1 < ${FILESDIR}/gentoo.diff \
+			|| die "patch failed"
+		export EXTRACFLAGS=-DMAILSUBDIR=\"mail\"
+	fi
+
+}
+
+src_compile() {                           
+
+	if use ssl; then
+		cd ${S}
+		make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix \
+			|| die
+
+		local i
+		for i in imapd ipop3d; do
+			umask 077
+			PEM1=`/bin/mktemp ${T}/openssl.XXXXXX`
+			PEM2=`/bin/mktemp ${T}/openssl.XXXXXX`
+			/usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 \
+				 -nodes -x509 -days 365 -out  $$PEM2 << EOF
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+localhost.localdomain
+root@localhost.localdomain
+EOF
+
+			cat $$PEM1 >  ${i}.pem
+			echo ""    >> ${i}.pem
+			cat $$PEM2 >> ${i}.pem
+			rm $$PEM1 $$PEM2
+			umask 022
+		done
+	else
+		make lnp || die
+	fi
+
+}
+
+src_install() {                               
+
+	into /usr
+	dosbin imapd/imapd ipopd/ipop?d
+
+	if use ssl; then
+		mkdir -p ${D}/usr/ssl/certs
+		mv imapd.pem ${D}/usr/ssl/certs
+		mv ipop3d.pem ${D}/usr/ssl/certs
+	fi
+
+	insinto /usr/include/imap
+	doins c-client/{c-client,mail,imap4r1,rfc822,linkage,misc,smtp,nntp}.h
+	doins c-client/{osdep,env_unix,env,fs,ftl,nl,tcp}.h
+	dolib.a c-client/c-client.a
+	dosym /usr/lib/c-client.a /usr/lib/libc-client.a
+
+	doman src/ipopd/ipopd.8c src/imapd/imapd.8c
+
+	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/FAQ docs/RELNOTES
+
+	docinto rfc
+	dodoc docs/rfc/*.txt
+
+        # gentoo config stuff
+	insinto /etc/pam.d
+	newins ${FILESDIR}/uw-imap.pam-system-auth imap
+	newins ${FILESDIR}/uw-imap.pam-system-auth pop
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/uw-imap.xinetd  imap
+	newins ${FILESDIR}/uw-ipop2.xinetd ipop2
+	newins ${FILESDIR}/uw-ipop3.xinetd ipop3
+	newins ${FILESDIR}/uw-imaps.xinetd imaps
+}