version bump (bug 153281), thanks to Target <target@targ.dyndns.org> for ebuild submission and testing; also fixing license; thanks to dertobi123 for approval for this commit

(Portage version: 2.2_rc3/cvs/Linux 2.6.26-gentoo x86_64)

2 files changed, 196 insertions, 1 deletions

diff --git a/net-mail/uw-imap/ChangeLog b/net-mail/uw-imap/ChangeLog
index a66ea0adb694..c6e6c42453c0 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.98 2008/03/15 23:17:20 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.99 2008/07/24 20:37:00 hoffie Exp $
+
+*uw-imap-2007b (24 Jul 2008)
+
+  24 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> +uw-imap-2007b.ebuild:
+  version bump (bug 153281), thanks to Target <target@targ.dyndns.org> for
+  ebuild submission and testing; also fixing license; thanks to dertobi123
+  for approval for this commit
 
   15 Mar 2008; Mark Loeser <halcy0n@gentoo.org> uw-imap-2004g-r2.ebuild:
   Add a blocker in RDEPEND on virtual/imapd so we avoid manpage collisions;
diff --git a/net-mail/uw-imap/uw-imap-2007b.ebuild b/net-mail/uw-imap/uw-imap-2007b.ebuild
new file mode 100644
index 000000000000..6bde18127244
--- /dev/null
+++ b/net-mail/uw-imap/uw-imap-2007b.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2007b.ebuild,v 1.1 2008/07/24 20:37:00 hoffie Exp $
+
+inherit eutils flag-o-matic
+
+MY_P="imap-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
+HOMEPAGE="http://www.washington.edu/imap/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 ssl kerberos clearpasswd"
+
+PROVIDE="virtual/imapd"
+PROVIDE="${PROVIDE} virtual/imap-c-client"
+DEPEND="!net-mail/vimap
+	!virtual/imap-c-client
+	>=net-mail/uw-mailutils-${PV}
+	virtual/libc
+	>=sys-libs/pam-0.72
+	>=net-mail/mailbase-0.00-r8
+	ssl? ( dev-libs/openssl )
+	kerberos? ( virtual/krb5 )"
+
+RDEPEND="${DEPEND}
+	sys-apps/xinetd
+	!virtual/imapd"
+
+pkg_setup() {
+	echo
+	if use clearpasswd; then
+		ewarn "Building uw-imap with cleartext LOGIN allowed. Disable \"clearpasswd\" USE"
+		ewarn "flag to restrict cleartext LOGIN to SSL/TLS sessions only."
+	else
+		if use ssl; then
+			ewarn "Building uw-imap with cleartext LOGIN restricted to SSL/TLS sessions only."
+			ewarn "Enable \"clearpasswd\" flag to allow unrestricted cleartext LOGIN."
+		else
+			ewarn "You have disabled SSL for uw-imap, but want cleartext passwords restricted to"
+			ewarn "SSL/TLS sessions only. Either enable \"ssl\" USE flag, or \"clearpasswd\""
+			ewarn "USE flag."
+			die "Impossible USE flag combination, see above message"
+		fi
+	fi
+	echo
+	# ewarn people not using pam with this file
+	if ! built_with_use net-mail/mailbase pam ; then
+		echo
+		ewarn "It is needed 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
+		die "mailbase has to be built with pam use flag"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	# Tarball packed with bad file perms
+	chmod -R ug+w "${S}"
+
+	cd "${S}"
+
+	if use amd64; then
+		# Apply our patch to actually build the shared library for PHP5
+		epatch "${FILESDIR}"/${PN}-2004c-amd64-so-fix.patch
+	fi
+
+	# 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
+
+	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
+
+	# Uncomment this for MBX support
+	#cp Makefile Makefile.orig2
+	#sed \
+	#	-e "s:CREATEPROTO=unixproto:CREATEPROTO=mbxproto:" \
+	#	-e "s:EMPTYPROTO=unixproto:EMPTYPROTO=mbxproto:" \
+	#	< Makefile.orig2 > Makefile
+}
+
+src_compile() {
+	local mymake
+	local ipver
+	ipver="IP=4"
+
+	use ipv6 && echo ipv6
+	use kerberos && echo kerberos
+	use ssl && echo ssl
+	use ipv6 && ipver="IP=6"
+	use kerberos \
+	  && mymake="EXTRAAUTHENTICATORS=gss"
+	if use ssl; then
+		cd "${S}"
+		echo ${mymake}
+		if use clearpasswd; then
+			yes | make lnp ${mymake} ${ipver} SSLTYPE=unix EXTRACFLAGS="${CFLAGS}" || die
+		else
+			yes | make lnp ${mymake} ${ipver} SSLTYPE=unix.nopwd EXTRACFLAGS="${CFLAGS}" || die
+		fi
+
+		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}" || die
+	fi
+}
+
+src_install() {
+	into /usr
+	dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
+	dobin mlock/mlock
+
+	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.1.0.0
+		cd "${D}"/usr/$(get_libdir)
+		ln -s libc-client.so.1.0.0 libc-client.so.1
+		ln -s libc-client.so.1.0.0 libc-client.so
+	fi
+
+	cd "${S}"
+
+	insinto /usr/include/imap
+	doins c-client/{c-client,flstring,mail,imap4r1,rfc822,misc,smtp,nntp,utf8,utf8aux}.h
+	doins c-client/linkage.{c,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.8 src/imapd/imapd.8
+	doman src/dmail/dmail.1 src/tmail/tmail.1
+
+	dodoc README docs/*.txt docs/CONFIG docs/RELNOTES
+
+	docinto rfc
+	dodoc docs/rfc/*.txt
+
+	# gentoo config stuff
+	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
+}