install missing headers - bug #375393

Package-Manager: portage-2.1.10.6/cvs/Linux x86_64

3 files changed, 176 insertions, 15 deletions

diff --git a/net-mail/uw-imap/ChangeLog b/net-mail/uw-imap/ChangeLog
index 6ba984d54bf8..1d71286b7f3c 100644
--- a/net-mail/uw-imap/ChangeLog
+++ b/net-mail/uw-imap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/uw-imap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.125 2011/06/13 09:53:39 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.126 2011/07/17 07:43:28 eras Exp $
+
+*uw-imap-2007e-r2 (17 Jul 2011)
+
+  17 Jul 2011; Eray Aslan <eras@gentoo.org> +uw-imap-2007e-r2.ebuild:
+  install missing headers - bug #375393
 
   13 Jun 2011; Eray Aslan <eras@gentoo.org> -uw-imap-2007e.ebuild:
   Remove vulnerable version
diff --git a/net-mail/uw-imap/Manifest b/net-mail/uw-imap/Manifest
index 2950a6ef3719..6c0d784f0e8c 100644
--- a/net-mail/uw-imap/Manifest
+++ b/net-mail/uw-imap/Manifest
@@ -10,22 +10,23 @@ AUX uw-ipop3.xinetd 472 RMD160 e4ad32c91284ffca80876e48d7d2fa649e4ae6f8 SHA1 a8d
 AUX uw-ipop3s.xinetd 469 RMD160 28b09d47e577643c08f959ed09b7b63371c4e029 SHA1 95531d852a58d41c465a358fe5a4c390344b2eab SHA256 fa2c408770b27f29ea25297540f2bc0789f2e5bd98f72f48a9f1659df3d39264
 DIST imap-2007e.tar.Z 2789469 RMD160 7d6af203419975f763d7ec17b6a4544c94490b50 SHA1 24c63cad8d0e74aa76e4341fcfa54d24f23a8c70 SHA256 be648d0e1aa62d564d9dbe04b77ea948116ee96ed687cb5d169c99ae28286e59
 EBUILD uw-imap-2007e-r1.ebuild 4209 RMD160 d42a6ac9703904db74923c92848b3e440a65355b SHA1 af80403057a09e5cddcf4364383a3adfbe82e87a SHA256 4808023e7ae6f6ffb0cf4f01f15136317f85a41a3a367b26eb41d92e6e763a69
-MISC ChangeLog 17211 RMD160 ba1be151c2860946ec35f0054f2a3d92d1a1bbb6 SHA1 f0b3a7b5eceeeccc8bea465f180dca683effc9ec SHA256 1c03abea2632a440172238f5fe800ea0ae6a25118f454292a42004ba1c613fec
+EBUILD uw-imap-2007e-r2.ebuild 4454 RMD160 e36665d6daea39e3971dcbdd6859451f0b292d62 SHA1 40651eeeba0fde256a019a60fd5e780427d629d3 SHA256 97d5497f32a974242248c56757837ebf16bd566819700c090a1bf2d551abedec
+MISC ChangeLog 17355 RMD160 f22c6908794a288b28b0e605218afd39c0a95258 SHA1 277937fe7e69cccb7f8928adf9544cda3e0e8d26 SHA256 74683cf26ea7ff50ff0bdeed5321d6185b1621dc8237b261644f7c9e45629018
 MISC metadata.xml 265 RMD160 c4e39d87b3e0c333fd24c3aecb66388a923a5c78 SHA1 13fb694a164531d4eac78502764e02a6693c02de SHA256 9c6aaa9b6ac6a0a8e15afb528a944668f2f7ef133021ebdda62dcce87b270e79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN9d4wAAoJEHfx8XVYajsfhCMQAJLJCd5/+FLeEH7ZDMsC8z6Y
-1qX0HaT3+R2QeNMVFYV/Q8jSxQiAOsAuju0E0CMAYS3ojvj2rLr4y1dA6knToXr4
-y6kXeQSiVma+mQ93uS2ZX0ZQuGyMGd5QsHQGoaVWuGdbcOI6JBdQTS+XYEhQdf+V
-yUPBh3DKbcaDjiuLgK5AvpoMYw3trevR9cYVLgHgy19rL52Oh5QqPt229tCHA248
-79IMtKvY6CXiyFFCULT19NGYXSZzm2iOrth+b2ASUr/C9CnXQ3gGprWCR7RCUYPT
-wS+i9bGdB9kGuHsI44V9hNfWPgSna5bauDiGy0lGjeRxyvRc5KgeE3RMSUfERmD+
-w7efLotWuzOSkSl+8M2b5A7D7DiqMGn3z/LrJdHO+LnFFfH7aTvsagKD7vOENC4b
-JS76GW/oiFQ7RBn82R18NA5lkaxVFmLwQVuKfNihGMTJOOv2Ev3i4w0UhCjhdvdP
-3NLYvbIRHXKvCs91rSm+EaC2xaAH4VefY/usywbrIupHlAx2dsKsk38bmGfpXdTI
-roeZK9LBIu58/mnpwaidhhlMKLBnqgxLiOBsc2v7ps+8bTxlUzSdC+nkZiYMtKC9
-v5in4xkLw5HPf8UI3pjirDpYgMaU+WDKUk0IcEPXHNusfl5D2GXatrXYvY52qlOK
-bS+f2lIP+cLDJM9q6HnK
-=ExxG
+iQIcBAEBCAAGBQJOIpKuAAoJEHfx8XVYajsfsc8P/3Trd7rsIRbEfNsTO+aeOnvu
+YL1YYPH9UYUYw9j3iHAwFQQqhKkUr/Iu0n0uFuLH1VCmz1Jnqz9VlElzrWgUEjLY
+Qa6lxdkD0aXOWDi6qq+hijFiWfQCoHUGaCyaGUrP8OHuUuVtTQNxcsLTk4jcYroN
++v1MDjRMEFdnjyYAHaqh2lM0ZMzf/kBCdSBNaLVLAVnsh11KGM2ajUWezD50o78k
+Sceh802HxBUHbkPOwTu7TLpzRiZ2OY/FxBcGh0kw8+Dsti6qGw6XxnMhfhlgu39u
+o5MzkpaE1UQMuEdvA2FpyCbpjmnQhQvdKDUIMGDH8PniFYBfQpeDeBqg3MygFuwq
+QJq53mSSKwZVMxNo9H7Esbqx4lPq47Jg8EudZlVpmoufQFLnz0DDNnV9DqHqS7ja
+R2pnHwuKziMBbxfRu4FjFn1TNaCFtVcs2iqikJwPdk0oGBAFH7A9vnuMTYtOEJ4z
+bmxh9xej0NIZSAegVbHidEW7TNNal5534na5cJ5Rs3DSfFZRFrcmIalWvuweKX8l
+RQ3WzTN43AWVLej4WzMVbhZiCZzwDjJdxWbqSfKWh+upxdHV6xael6+bI79AwCkg
+Iefsi9qW0QBlIaoCRUAvkWR+KoM5HbIS5dfn6nP610eyXiDDrl6YLNwxg57kA0cX
+pvV/Q4uhbxM9vjZsXuZZ
+=3ONB
 -----END PGP SIGNATURE-----
diff --git a/net-mail/uw-imap/uw-imap-2007e-r2.ebuild b/net-mail/uw-imap/uw-imap-2007e-r2.ebuild
new file mode 100644
index 000000000000..ad0c05dc2a26
--- /dev/null
+++ b/net-mail/uw-imap/uw-imap-2007e-r2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2007e-r2.ebuild,v 1.1 2011/07/17 07:43:28 eras Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic ssl-cert
+
+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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 +ssl kerberos clearpasswd"
+
+DEPEND="!net-libs/c-client
+	>=sys-libs/pam-0.72
+	>=net-mail/mailbase-0.00-r8[pam]
+	ssl? ( dev-libs/openssl )
+	kerberos? ( app-crypt/mit-krb5 )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/uw-mailutils-${PV}
+	sys-apps/xinetd"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/dovecot
+	!mail-mta/courier
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd"
+
+REQUIRED_USE="!clearpasswd? ( ssl )"
+
+src_unpack() {
+	unpack ${A}
+	# Tarball packed with bad file perms
+	chmod -R ug+w "${S}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2004c-amd64-so-fix.patch
+	epatch "${FILESDIR}/${PN}-ldflags.patch"
+
+	# 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 FLAGS."
+
+	# Now there is only c-client left, which should be built with -fPIC
+	append-flags -fPIC
+
+	sed -i \
+		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
+		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
+		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
+		src/osdep/unix/Makefile
+
+	sed -i \
+		-e "s/CC=cc/CC=$(tc-getCC)/" \
+		-e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
+		-e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
+		src/osdep/unix/Makefile
+
+	sed -i -e "s,GSSDIR=/usr/local,GSSDIR=/usr,g" \
+		src/osdep/unix/Makefile.gss
+
+	# no interactive build
+	sed -i -e "/make noip6/s/.*/\t@echo/" Makefile
+}
+
+src_compile() {
+	local mymake ipver ssltype target
+	ipver="IP=4"
+	target=lnp
+	use ipv6 && ipver="IP=6"
+	use kerberos && mymake="EXTRAAUTHENTICATORS=gss"
+	use kernel_FreeBSD && target=bsf
+	if use ssl ; then
+		if use clearpasswd ; then
+			ssltype=unix
+		else
+			ssltype=unix.nopwd
+		fi
+	else
+		ssltype=none
+	fi
+
+	emake -j1 SSLTYPE=${ssltype} ${target} ${mymake} ${ipver} EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
+	dobin mlock/mlock
+
+	dolib.so c-client/libc-client.so.1.0.0
+	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so
+	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so.1
+
+	insinto /usr/include/imap
+	doins src/c-client/{c-client,flstring,mail,imap4r1,rfc822,misc,smtp,nntp,utf8,utf8aux}.h
+	doins src/c-client/{env,fs,ftl,nl,tcp}.h
+	doins src/osdep/unix/env_unix.h
+	doins c-client/linkage.{c,h}
+
+	dolib.a c-client/c-client.a
+	dosym 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
+
+	# install headers - bug #375393
+	cp c-client/*.h "${D}"/usr/include/imap/ || die
+	cp c-client/linkage.c "${D}"/usr/include/imap/ || die
+	#exclude these dupes (can't do it before now due to symlink hell)
+	rm "${D}"/usr/include/imap/os_*.h
+
+	# 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
+}
+
+pkg_postinst() {
+	if use ssl; then
+	# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/certs/imapd.pem && \
+			-e "${ROOT}"/etc/ssl/certs/imapd.key ]]; then
+			einfo "Creating SSL certificate for IMAP"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-UW-IMAP Server}"
+			install_cert /etc/ssl/certs/imapd
+		fi
+		if ! [[ -e "${ROOT}"/etc/ssl/certs/ipop3d.pem && \
+			-e "${ROOT}"/etc/ssl/certs/ipop3d.key ]]; then
+			einfo "Creating SSL certificate for POP3"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-UW-POP3 Server}"
+			install_cert /etc/ssl/certs/ipop3d
+		fi
+	fi
+}