Bump vimap to 2002c

24 files changed, 127 insertions, 166 deletions

diff --git a/net-mail/vimap/ChangeLog b/net-mail/vimap/ChangeLog
index 52b5e32cd754..90573ff99abd 100644
--- a/net-mail/vimap/ChangeLog
+++ b/net-mail/vimap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/vimap
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/ChangeLog,v 1.2 2003/02/12 08:17:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/ChangeLog,v 1.3 2003/05/28 22:12:09 alron Exp $
+
+*vimap-2002c (28 May 2003)
+  28 May 2003; Dean Bailey <alron@gentoo.org> vimap-2003c :
+  Version bump, new vimap patch for uw-imap 2002c1.
 
 *vimap-2001a (09 Feb 2003)
 
diff --git a/net-mail/vimap/Manifest b/net-mail/vimap/Manifest
index 2d9cccefa63c..1838731eda77 100644
--- a/net-mail/vimap/Manifest
+++ b/net-mail/vimap/Manifest
@@ -1,10 +1,10 @@
-MD5 752d26b8a0653007dfc63b0e99d6045b vimap-2002c.ebuild 2704
-MD5 29fcf15c57571b23982fcedbb9046a67 ChangeLog 923
-MD5 16682cd88c80588d22d34dd08678f1da files/uw-imap.xinetd 492
-MD5 c1398d15a74439d23bda99c4960ca625 files/uw-imaps.xinetd 487
-MD5 a64376593da1d4ed7900ab825abc42dc files/uw-ipop2.xinetd 564
-MD5 8e3bbe0dafb99203c2029f531ce4ec8a files/uw-ipop3.xinetd 473
-MD5 c35bb5e9cfa6e278eccde33e1a6e1b4c files/uw-ipop3s.xinetd 470
-MD5 0ec3cd52bf3e7064a3d9e60a5ac16291 files/imap-2002c-virtual.patch.bz2 10394
-MD5 5627c6d3e66200c457bf24c47a02c6e9 files/uw-imap.pam-system-auth 344
+MD5 e5c150eb76b7716b5536b069559d0849 ChangeLog 922
+MD5 44904576632fe1a64ceace6e41fab883 vimap-2002c.ebuild 2698
 MD5 ff493c5938360a4411843914673d4a05 files/digest-vimap-2002c 63
+MD5 0ec3cd52bf3e7064a3d9e60a5ac16291 files/imap-2002c-virtual.patch.bz2 10394
+MD5 2ea01084955d1baee1120d142734f18f files/uw-imap.pam-system-auth 339
+MD5 a2431cd0bc30744ed8b22b717a3bc1d7 files/uw-imap.xinetd 487
+MD5 92589d773c1178e511a570f25278e6ee files/uw-imaps.xinetd 482
+MD5 7d8d4b8b665f8fddabb6b2427c40e574 files/uw-ipop2.xinetd 559
+MD5 a00f181e73ac9b0a9e656049a5ac42b2 files/uw-ipop3.xinetd 468
+MD5 ec90fc7f6186f57ea8bcbbcecc099e5f files/uw-ipop3s.xinetd 469
diff --git a/net-mail/vimap/files/digest-vimap-2001a b/net-mail/vimap/files/digest-vimap-2001a
deleted file mode 100644
index b752e9d05f97..000000000000
--- a/net-mail/vimap/files/digest-vimap-2001a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 42c5c8d049c209b15513a4f6ebba34d2 imap-2001a.tar.Z 1959777
diff --git a/net-mail/vimap/files/digest-vimap-2002c b/net-mail/vimap/files/digest-vimap-2002c
new file mode 100644
index 000000000000..1b9bd49be383
--- /dev/null
+++ b/net-mail/vimap/files/digest-vimap-2002c
@@ -0,0 +1 @@
+MD5 90c255dcf3ee373e3fb174ea5d820f4d imap-2002c1.tar.Z 2111395
diff --git a/net-mail/vimap/files/flock.c.bz2 b/net-mail/vimap/files/flock.c.bz2
deleted file mode 100644
index a62374ca5a8a..000000000000
--- a/net-mail/vimap/files/flock.c.bz2
+++ /dev/null
diff --git a/net-mail/vimap/files/imap-2000-krbpath.patch.bz2 b/net-mail/vimap/files/imap-2000-krbpath.patch.bz2
deleted file mode 100644
index 7c922f65f3a7..000000000000
--- a/net-mail/vimap/files/imap-2000-krbpath.patch.bz2
+++ /dev/null
diff --git a/net-mail/vimap/files/imap-2000-linux.patch.bz2 b/net-mail/vimap/files/imap-2000-linux.patch.bz2
deleted file mode 100644
index e26299b02a78..000000000000
--- a/net-mail/vimap/files/imap-2000-linux.patch.bz2
+++ /dev/null
diff --git a/net-mail/vimap/files/imap-2000-time.patch.bz2 b/net-mail/vimap/files/imap-2000-time.patch.bz2
deleted file mode 100644
index c9871f6a87a5..000000000000
--- a/net-mail/vimap/files/imap-2000-time.patch.bz2
+++ /dev/null
diff --git a/net-mail/vimap/files/imap-2000c-redhat-flock.patch.bz2 b/net-mail/vimap/files/imap-2000c-redhat-flock.patch.bz2
deleted file mode 100644
index b3f6785e5961..000000000000
--- a/net-mail/vimap/files/imap-2000c-redhat-flock.patch.bz2
+++ /dev/null
diff --git a/net-mail/vimap/files/imap-2001a-boguswarning.patch.bz2 b/net-mail/vimap/files/imap-2001a-boguswarning.patch.bz2
deleted file mode 100644
index fa0d2571a590..000000000000
--- a/net-mail/vimap/files/imap-2001a-boguswarning.patch.bz2
+++ /dev/null
diff --git a/net-mail/vimap/files/imap-2001a-gentoo-version.patch.bz2 b/net-mail/vimap/files/imap-2001a-gentoo-version.patch.bz2
deleted file mode 100644
index 9b83d1a84eb0..000000000000
--- a/net-mail/vimap/files/imap-2001a-gentoo-version.patch.bz2
+++ /dev/null
diff --git a/net-mail/vimap/files/imap-2001a-mbox-disable.patch.bz2 b/net-mail/vimap/files/imap-2001a-mbox-disable.patch.bz2
deleted file mode 100644
index b6af8b5e2f86..000000000000
--- a/net-mail/vimap/files/imap-2001a-mbox-disable.patch.bz2
+++ /dev/null
diff --git a/net-mail/vimap/files/imap-2001a-overflow.patch.bz2 b/net-mail/vimap/files/imap-2001a-overflow.patch.bz2
deleted file mode 100644
index 0d3194ca7dab..000000000000
--- a/net-mail/vimap/files/imap-2001a-overflow.patch.bz2
+++ /dev/null
diff --git a/net-mail/vimap/files/imap-2001a-timeout.patch.bz2 b/net-mail/vimap/files/imap-2001a-timeout.patch.bz2
deleted file mode 100644
index b206528369ab..000000000000
--- a/net-mail/vimap/files/imap-2001a-timeout.patch.bz2
+++ /dev/null
diff --git a/net-mail/vimap/files/imap-2001a-virtual.patch.bz2 b/net-mail/vimap/files/imap-2001a-virtual.patch.bz2
deleted file mode 100644
index 74b3996baa4a..000000000000
--- a/net-mail/vimap/files/imap-2001a-virtual.patch.bz2
+++ /dev/null
diff --git a/net-mail/vimap/files/imap-2002c-virtual.patch.bz2 b/net-mail/vimap/files/imap-2002c-virtual.patch.bz2
new file mode 100644
index 000000000000..f2116f34fce2
--- /dev/null
+++ b/net-mail/vimap/files/imap-2002c-virtual.patch.bz2
diff --git a/net-mail/vimap/files/uw-imap.pam-system-auth b/net-mail/vimap/files/uw-imap.pam-system-auth
index 49417a435f94..7d440b14a18e 100644
--- a/net-mail/vimap/files/uw-imap.pam-system-auth
+++ b/net-mail/vimap/files/uw-imap.pam-system-auth
@@ -1,5 +1,5 @@
 #%PAM-1.0
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/files/uw-imap.pam-system-auth,v 1.1 2003/02/10 02:32:00 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/files/uw-imap.pam-system-auth,v 1.2 2003/05/28 22:12:10 alron Exp $
 auth       required     pam_nologin.so
 auth       required     pam_stack.so service=system-auth
 account    required     pam_stack.so service=system-auth
diff --git a/net-mail/vimap/files/uw-imap.xinetd b/net-mail/vimap/files/uw-imap.xinetd
index 7409e5879fff..ec603f9aca7f 100644
--- a/net-mail/vimap/files/uw-imap.xinetd
+++ b/net-mail/vimap/files/uw-imap.xinetd
@@ -1,5 +1,5 @@
 # default: off
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/files/uw-imap.xinetd,v 1.1 2003/02/10 02:32:00 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/files/uw-imap.xinetd,v 1.2 2003/05/28 22:12:10 alron Exp $
 # description: The IMAP service allows remote users to access their mail using \
 #              an IMAP client such as Mutt, Pine, fetchmail, or Netscape \
 #              Communicator.
diff --git a/net-mail/vimap/files/uw-imaps.xinetd b/net-mail/vimap/files/uw-imaps.xinetd
index fbdec675b782..faa857f47dc3 100644
--- a/net-mail/vimap/files/uw-imaps.xinetd
+++ b/net-mail/vimap/files/uw-imaps.xinetd
@@ -1,5 +1,5 @@
 # default: off
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/files/uw-imaps.xinetd,v 1.1 2003/02/10 02:32:00 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/files/uw-imaps.xinetd,v 1.2 2003/05/28 22:12:10 alron Exp $
 # description: The IMAPS service allows remote users to access their mail \
 #	       using an IMAP client with SSL support such as Netscape \
 #	       Communicator or fetchmail.
diff --git a/net-mail/vimap/files/uw-ipop2.xinetd b/net-mail/vimap/files/uw-ipop2.xinetd
index b519767f57ce..0a4e550c14da 100644
--- a/net-mail/vimap/files/uw-ipop2.xinetd
+++ b/net-mail/vimap/files/uw-ipop2.xinetd
@@ -1,5 +1,5 @@
 # default: off
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/files/uw-ipop2.xinetd,v 1.1 2003/02/10 02:32:00 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/files/uw-ipop2.xinetd,v 1.2 2003/05/28 22:12:10 alron Exp $
 # description: The POP2 service allows remote users to access their mail \
 #              using an POP2 client such as fetchmail.  In most cases, clients \
 #              support POP3 instead of POP2, so enabling this service is rarely \
diff --git a/net-mail/vimap/files/uw-ipop3.xinetd b/net-mail/vimap/files/uw-ipop3.xinetd
index dd907e6e03f7..2ab5ff37f345 100644
--- a/net-mail/vimap/files/uw-ipop3.xinetd
+++ b/net-mail/vimap/files/uw-ipop3.xinetd
@@ -1,5 +1,5 @@
 # default: off
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/files/uw-ipop3.xinetd,v 1.1 2003/02/10 02:32:00 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/files/uw-ipop3.xinetd,v 1.2 2003/05/28 22:12:10 alron Exp $
 # description: The POP3 service allows remote users to access their mail \
 #              using an POP3 client such as Netscape Communicator, mutt, \
 #	       or fetchmail.
diff --git a/net-mail/vimap/files/uw-ipop3s.xinetd b/net-mail/vimap/files/uw-ipop3s.xinetd
index c0c683be54a9..cb7966efd2d4 100644
--- a/net-mail/vimap/files/uw-ipop3s.xinetd
+++ b/net-mail/vimap/files/uw-ipop3s.xinetd
@@ -1,8 +1,8 @@
 # default: off
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/files/uw-ipop3s.xinetd,v 1.1 2003/02/10 02:32:00 alron Exp $
-# description: The POP3S service allows remote users to access their mail \
-#              using an POP3 client with SSL support such as \
-#              Netscape Communicator, mutt, kmail,  or fetchmail.
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/files/uw-ipop3s.xinetd,v 1.2 2003/05/28 22:12:10 alron Exp $
+# description: The POP3 service allows remote users to access their mail \
+#              using an POP3 client such as Netscape Communicator, mutt, \
+#	       or fetchmail.
 service pop3s
 {
 	socket_type		= stream
diff --git a/net-mail/vimap/vimap-2001a.ebuild b/net-mail/vimap/vimap-2001a.ebuild
deleted file mode 100644
index 17d0bc2d045f..000000000000
--- a/net-mail/vimap/vimap-2001a.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/vimap-2001a.ebuild,v 1.2 2003/02/13 14:43:18 vapier Exp $
-
-PN0=imap
-S=${WORKDIR}/${PN0}-${PV}
-DESCRIPTION="Linuxconf style virtual domain patched 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/ http://vimap.sf.net/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~sparc "
-IUSE="ssl kerberos"
-
-PROVIDE="virtual/imapd"
-DEPEND="!net-mail/uw-imap
-	virtual/glibc
-	>=sys-libs/pam-0.72
-	>=sys-apps/xinetd-2.3.3
-	ssl? ( dev-libs/openssl )
-	kerberos? ( app-crypt/krb5 )"
-
-src_unpack() {
-	unpack ${A}
-
-	# Set CFLAGS
-	cd ${S}/src/osdep/unix/
-	cp Makefile Makefile.orig
-	sed \
-		-e "s:-g -fno-omit-frame-pointer -O6:${CFLAGS}:" \
-		-e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \
-		-e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \
-		< Makefile.orig > Makefile
-	cd ${S}
-
-	bzcat ${FILESDIR}/imap-2001a-timeout.patch.bz2 | patch -p1 \
-		|| die "patch 1 failed"
-		
-	bzcat ${FILESDIR}/imap-2000-linux.patch.bz2 | patch -p1 \
-		|| die "patch 2 failed"
-		
-	bzcat ${FILESDIR}/imap-2001a-mbox-disable.patch.bz2 | patch -p0 \
-		|| die "patch 3 failed"
-		
-	if use kerberos; then
-		bzcat ${FILESDIR}/imap-2000-krbpath.patch.bz2 | patch -p1 \
-			|| die "patch 4 failed"
-	fi
-	
-	bzcat ${FILESDIR}/imap-2000c-redhat-flock.patch.bz2 | patch -p1 \
-		|| die "patch 5 failed"
-			
-	bzcat ${FILESDIR}/imap-2001a-overflow.patch.bz2 | patch -p1 \
-		|| die "patch 6 failed"
-			
-	bzcat ${FILESDIR}/imap-2001a-gentoo-version.patch.bz2 | patch -p0 \
-		|| die "patch 7 failed"
-			
-	bzcat ${FILESDIR}/imap-2001a-boguswarning.patch.bz2 | patch -p0 \
-		|| die "patch 8 failed"
-			
-	bzcat ${FILESDIR}/imap-2000-time.patch.bz2 | patch -p1 \
-		|| die "patch 9 failed"
-			
-	bzcat ${FILESDIR}/imap-2001a-virtual.patch.bz2 | patch -p1 \
-		|| die "patch 10 failed"
-			
-	bzcat ${FILESDIR}/flock.c.bz2 > src/osdep/unix/flock.c \
-		|| die "patch 11 failed"
-}
-
-src_compile() {                           
-	cd ${S}
-	EXTRACFLAGS=" -DDISABLE_POP_PROXY=1 -DIGNORE_LOCK_EACCES_ERRORS=1 \
-		-DDISABLE_REVERSE_DNS_LOOKUP"
-	if use ssl; then
-		EXTRACFLAGS=" ${EXTRACFLAGS} -I/usr/include/openssl"
-		SSLFLAGTHINGS="SPECIALAUTHENTICATORS=ssl SSLTYPE=unix"
-	fi
-	if use kerberos; then
-		EXTRACFLAGS=" ${EXTRACFLAGS} -I/usr/include/kerberosIV"
-		KRBFLAGTHINGS="EXTRAAUTHENTICATORS=gss"
-	fi
-	make lnv EXTRACFLAGS="${EXTRACFLAGS}" ${KRBFLAGTHINGS} ${SSLFLAGTHINGS} \
-		|| die
-	if use ssl; then
-		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
-	fi
-}
-
-src_install() {                               
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d
-
-	if use ssl; then
-		dodir /etc/ssl/certs
-		mv imapd.pem ${D}/etc/ssl/certs
-		mv ipop3d.pem ${D}/etc/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-ipop3s.xinetd ipop3s
-	newins ${FILESDIR}/uw-imaps.xinetd imaps
-}
diff --git a/net-mail/vimap/vimap-2002c.ebuild b/net-mail/vimap/vimap-2002c.ebuild
new file mode 100644
index 000000000000..fe4d9a569f1a
--- /dev/null
+++ b/net-mail/vimap/vimap-2002c.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/vimap-2002c.ebuild,v 1.1 2003/05/28 22:12:10 alron Exp $
+
+S=${WORKDIR}/imap-2002c1
+
+DESCRIPTION="Linuxconf style virtual domain patched UW server daemons for IMAP and POP network mail protocols."
+SRC_URI="ftp://ftp.cac.washington.edu/imap/imap-2002c1.tar.Z"
+HOMEPAGE="http://www.washington.edu/imap/ http://vimap.sf.net/"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 ~sparc ~ppc ~hppa ~alpha"
+IUSE="ssl mbox"
+
+PROVIDE="virtual/imapd"
+DEPEND="!net-mail/uw-imap
+	virtual/glibc
+	>=sys-libs/pam-0.72
+	ssl? ( dev-libs/openssl )"
+
+src_unpack() {
+	unpack ${A}
+	# Tarball packed with bad file perms
+	chmod -R ug+w ${S} 
+	cd ${S}
+	bzcat ${FILESDIR}/imap-2002c-virtual.patch.bz2 | patch -p0 
+	cd ${S}/src/osdep/unix/
+	cp Makefile Makefile.orig
+	sed \
+		-e 's,-g -fno-omit-frame-pointer -O6,${CFLAGS},g' \
+		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
+		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
+		< Makefile.orig > Makefile
+	cd ${S}
+}
+
+src_compile() {                           
+	if use ssl; then
+		cd ${S}
+		yes | make lnv 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
+		yes | make lnp SSLTYPE=none || die
+	fi
+}
+
+src_install() {                               
+	into /usr
+	dosbin imapd/imapd ipopd/ipop?d
+
+	if use ssl; then
+		dodir /etc/ssl/certs
+		mv imapd.pem ${D}/etc/ssl/certs
+		mv ipop3d.pem ${D}/etc/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/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-ipop3s.xinetd ipop3s
+	newins ${FILESDIR}/uw-imaps.xinetd imaps
+}