Make vimap conform bug #79240. Update headers

(Portage version: 2.0.51-r15)

5 files changed, 165 insertions, 6 deletions

diff --git a/net-mail/vimap/ChangeLog b/net-mail/vimap/ChangeLog
index 2fe6686ee6d1..0a9ad06f790a 100644
--- a/net-mail/vimap/ChangeLog
+++ b/net-mail/vimap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/vimap
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/ChangeLog,v 1.9 2005/02/11 16:47:46 voxus Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/ChangeLog,v 1.10 2005/02/18 22:23:50 ferdy Exp $
+
+*vimap-2002c-r2 (18 Feb 2005)
+
+  18 Feb 2005; Fernando J. Pereda <ferdy@gentoo.org> +vimap-2002c-r2.ebuild:
+  Make it conform bug #79240
 
 *vimap-2002c-r1 (11 Feb 2005)
 
diff --git a/net-mail/vimap/Manifest b/net-mail/vimap/Manifest
index e4918d3a2b11..cf5edcb2cc03 100644
--- a/net-mail/vimap/Manifest
+++ b/net-mail/vimap/Manifest
@@ -1,6 +1,7 @@
 MD5 be36d41a985ba8f1839742d888e4cd57 vimap-2002c-r1.ebuild 3631
-MD5 ead3d13cf5c642ca8b5d3962ee47ff42 vimap-2002c.ebuild 2689
-MD5 25ae8134dae74b8ee78c6e3f2914ebca ChangeLog 1590
+MD5 f4cf96d3276b3178197117c9ac8d22e1 vimap-2002c-r2.ebuild 4110
+MD5 54f66631991aa77dfd9a44ec591cc3ea vimap-2002c.ebuild 2689
+MD5 f7b43df4e6116721c03414283c67ed79 ChangeLog 1728
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 2cc8deb01d6efd5a650d6fc5519289bd files/uw-ipop2.xinetd 564
 MD5 c6e5f24322fad9b16d63b1e08ca3bee8 files/uw-ipop3s.xinetd 474
@@ -8,6 +9,7 @@ MD5 b9265aebc1d378faf06199471ceabc4f files/uw-imap.xinetd 492
 MD5 ff493c5938360a4411843914673d4a05 files/digest-vimap-2002c 63
 MD5 28c291d52426cc5d25be57406f14e096 files/uw-imap.pam-system-auth 344
 MD5 ff493c5938360a4411843914673d4a05 files/digest-vimap-2002c-r1 63
+MD5 ff493c5938360a4411843914673d4a05 files/digest-vimap-2002c-r2 63
 MD5 fbd30c975d120429f29509866d292745 files/uw-ipop3.xinetd 473
 MD5 cde23dc2375a8c33998202c8f0c9ae0e files/vimap-2002c-amd64-so-fix.patch 675
 MD5 a801fe6d35ae75b0abeb6e410b3b6ea2 files/uw-imaps.xinetd 487
diff --git a/net-mail/vimap/files/digest-vimap-2002c-r2 b/net-mail/vimap/files/digest-vimap-2002c-r2
new file mode 100644
index 000000000000..1b9bd49be383
--- /dev/null
+++ b/net-mail/vimap/files/digest-vimap-2002c-r2
@@ -0,0 +1 @@
+MD5 90c255dcf3ee373e3fb174ea5d820f4d imap-2002c1.tar.Z 2111395
diff --git a/net-mail/vimap/vimap-2002c-r2.ebuild b/net-mail/vimap/vimap-2002c-r2.ebuild
new file mode 100644
index 000000000000..7fcfc22fab00
--- /dev/null
+++ b/net-mail/vimap/vimap-2002c-r2.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/vimap-2002c-r2.ebuild,v 1.1 2005/02/18 22:23:50 ferdy Exp $
+
+inherit eutils flag-o-matic
+
+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="~amd64 ~x86 ~sparc ~ppc ~hppa ~alpha"
+IUSE="ssl"
+
+PROVIDE="virtual/imapd"
+PROVIDE="${PROVIDE} virtual/imap-c-client"
+
+RDEPEND=">=net-mail/mailbase-0.00-r8"
+
+DEPEND="
+	!virtual/imap-c-client
+	virtual/libc
+	>=sys-libs/pam-0.72
+	ssl? ( dev-libs/openssl )"
+
+pkg_setup() {
+	# Warn people with pam flag deactivated.
+	if ! built_with_use net-mail/mailbase pam;
+	then
+		echo
+		ewarn "It is recommended to have the net-mail/mailbase package"
+		ewarn "  built with the pam use flag activated. Please rebuild"
+		ewarn "  net-mail/mailbase with pam activated."
+		echo
+		epause 3
+	fi
+}
+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
+	if use amd64; then
+		# Now we must make all the individual Makefiles use different CFLAGS,
+		# otherwise they would all use -fPIC
+		sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \
+			src/imapd/Makefile src/ipopd/Makefile src/mailutil/Makefile \
+			src/mlock/Makefile src/mtest/Makefile src/tmail/Makefile \
+			|| die "sed failed patching Makefile CFLAGS."
+		# Now there is only c-client left, which should be built with -fPIC
+		append-flags -fPIC
+		# Apply our patch to actually build the shared library for PHP5
+		epatch ${FILESDIR}/${P}-amd64-so-fix.patch
+	fi
+	cd ${S}/src/osdep/unix/
+	cp Makefile Makefile.orig
+	sed \
+		-e "s:BASECFLAGS=\".*\":BASECFLAGS=: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 lnp ${mymake} ${ipver} \
+			SSLTYPE=unix EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="-lcrypt" || 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 ${mymake} ${ipver} \
+			SSLTYPE=none EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="-lcrypt" || 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
+
+	if use amd64; then
+		dolib.so c-client/libc-client.so*
+		cd ${D}/usr/$(get_libdir)
+		ln -s libc-client.so.1.0.0 libc-client.so.1
+		ln -s libc-client.so.1 libc-client.so
+	fi
+
+	cd ${S}
+
+	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/$(get_libdir)/c-client.a /usr/$(get_libdir)/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
+
+	## pam.d files are provided by mailbase
+	#   unless mailbase wasn't built with pam.
+	if ! built_with_use net-mail/mailbase pam;
+	then
+		insinto /etc/pam.d
+		newins ${FILESDIR}/uw-imap.pam-system-auth imap
+		newins ${FILESDIR}/uw-imap.pam-system-auth pop
+	fi
+
+	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
index 73b57fe70365..457bbfb57124 100644
--- a/net-mail/vimap/vimap-2002c.ebuild
+++ b/net-mail/vimap/vimap-2002c.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/vimap-2002c.ebuild,v 1.9 2004/07/15 02:31:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vimap/vimap-2002c.ebuild,v 1.10 2005/02/18 22:23:50 ferdy Exp $
 
 S=${WORKDIR}/imap-2002c1