close #3218

9 files changed, 110 insertions, 9 deletions

diff --git a/net-mail/uw-imap/ChangeLog b/net-mail/uw-imap/ChangeLog
index d3a775de9438..9d21799cf406 100644
--- a/net-mail/uw-imap/ChangeLog
+++ b/net-mail/uw-imap/ChangeLog
@@ -1,11 +1,16 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
+# 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.2 2002/04/15 20:13:40 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.3 2002/06/07 02:01:38 woodchip Exp $
 
-*uw-imap-2001a-r1 (15 Apr 2002)
+*uw-imap-2001a-r2 (6 Jun 2002)
+  6 Jun 2002; Donny Davies <woodchip@gentoo.org> uw-imap-2001a-r2.ebuild,
+  uw-imap.pam, uw-imap.pam-system-auth, uw-imap.xinetd, uw-imaps.xinetd,
+  uw-ipop2.xinetd, uw-ipop3.xinetd :
+  Default pam.d/ snippet should use system-auth; close #3218.  Add
+  $Header's, LICENSE, SLOT.
 
-  15 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> :
-  
+*uw-imap-2001a-r1 (15 Apr 2002)
+  15 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> :  
   Made uw-imap install more headers, so that php with imap
   support will properly compile. Bug #1759
   Removed virtual/imapUW PROVIDE because php will only DEPEND on
@@ -13,7 +18,5 @@
   now.
 
 *uw-imap-2001a (23 Feb. 2002)
-
   22 Feb 2002; Grant Goodyear <g2boojum@gentoo.org>  :
-  
-  New ebuild.  Thanks to CFuga.
+  New ebuild; submitted by Cristian Martinez <cfuga@itam.mx>.
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2001a-r2 b/net-mail/uw-imap/files/digest-uw-imap-2001a-r2
new file mode 100644
index 000000000000..b752e9d05f97
--- /dev/null
+++ b/net-mail/uw-imap/files/digest-uw-imap-2001a-r2
@@ -0,0 +1 @@
+MD5 42c5c8d049c209b15513a4f6ebba34d2 imap-2001a.tar.Z 1959777
diff --git a/net-mail/uw-imap/files/uw-imap.pam b/net-mail/uw-imap/files/uw-imap.pam
index 196657df9389..e802b4115ba4 100644
--- a/net-mail/uw-imap/files/uw-imap.pam
+++ b/net-mail/uw-imap/files/uw-imap.pam
@@ -1,4 +1,5 @@
 #%PAM-1.0
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-imap.pam,v 1.2 2002/06/07 02:01:38 woodchip Exp $
 auth       required     pam_pwdb.so shadow nullok
 account    required     pam_pwdb.so
 session    required     pam_pwdb.so
diff --git a/net-mail/uw-imap/files/uw-imap.pam-system-auth b/net-mail/uw-imap/files/uw-imap.pam-system-auth
new file mode 100644
index 000000000000..b90d2cbaee38
--- /dev/null
+++ b/net-mail/uw-imap/files/uw-imap.pam-system-auth
@@ -0,0 +1,6 @@
+#%PAM-1.0
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-imap.pam-system-auth,v 1.1 2002/06/07 02:01:38 woodchip Exp $
+auth       required     pam_nologin.so
+auth       required     pam_stack.so service=system-auth
+account    required     pam_stack.so service=system-auth
+session    required     pam_stack.so service=system-auth
diff --git a/net-mail/uw-imap/files/uw-imap.xinetd b/net-mail/uw-imap/files/uw-imap.xinetd
index 959a45573bc1..1eccafbfef73 100644
--- a/net-mail/uw-imap/files/uw-imap.xinetd
+++ b/net-mail/uw-imap/files/uw-imap.xinetd
@@ -1,4 +1,5 @@
 # default: off
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-imap.xinetd,v 1.2 2002/06/07 02:01:38 woodchip 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/uw-imap/files/uw-imaps.xinetd b/net-mail/uw-imap/files/uw-imaps.xinetd
index 8fb2f3500a78..963ac96b3740 100644
--- a/net-mail/uw-imap/files/uw-imaps.xinetd
+++ b/net-mail/uw-imap/files/uw-imaps.xinetd
@@ -1,4 +1,5 @@
 # default: off
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-imaps.xinetd,v 1.2 2002/06/07 02:01:38 woodchip 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/uw-imap/files/uw-ipop2.xinetd b/net-mail/uw-imap/files/uw-ipop2.xinetd
index 2f52c4604bd5..19985827c6ca 100644
--- a/net-mail/uw-imap/files/uw-ipop2.xinetd
+++ b/net-mail/uw-imap/files/uw-ipop2.xinetd
@@ -1,6 +1,8 @@
 # default: off
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-ipop2.xinetd,v 1.2 2002/06/07 02:01:38 woodchip 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 \
+#              using an POP2 client such as fetchmail.  In most cases, clients \
+#              support POP3 instead of POP2, so enabling this service is rarely \
 #              necessary.
 service pop-2
 {
diff --git a/net-mail/uw-imap/files/uw-ipop3.xinetd b/net-mail/uw-imap/files/uw-ipop3.xinetd
index 60acaf219cf2..cbfa761bc36c 100644
--- a/net-mail/uw-imap/files/uw-ipop3.xinetd
+++ b/net-mail/uw-imap/files/uw-ipop3.xinetd
@@ -1,4 +1,5 @@
 # default: off
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-ipop3.xinetd,v 1.2 2002/06/07 02:01:38 woodchip 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/uw-imap/uw-imap-2001a-r2.ebuild b/net-mail/uw-imap/uw-imap-2001a-r2.ebuild
new file mode 100644
index 000000000000..b04cfe68e40c
--- /dev/null
+++ b/net-mail/uw-imap/uw-imap-2001a-r2.ebuild
@@ -0,0 +1,85 @@
+# 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-r2.ebuild,v 1.1 2002/06/07 02:01:38 woodchip 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 )"
+LICENSE="as-is"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src/osdep/unix/
+	sed "s:-g -fno-omit-frame-pointer -O6:${CFLAGS}:" Makefile > Makefile.bak
+	mv Makefile.bak Makefile
+}
+
+src_compile() {                           
+	if use ssl; then
+		make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix SSLDIR=/usr/ssl \
+			 SSLINCLUDE=/usr/include/openssl || 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
+}