Add topal and chappa USE flags for use with mail-client/alpine - bug #391387. Fix ssl linkage.

Package-Manager: portage-2.2.0_alpha138/cvs/Linux x86_64
Manifest-Sign-Key: 0x586A3B1F

5 files changed, 195 insertions, 3 deletions

diff --git a/net-libs/c-client/ChangeLog b/net-libs/c-client/ChangeLog
index 5610ae897512..65a19a9de3d2 100644
--- a/net-libs/c-client/ChangeLog
+++ b/net-libs/c-client/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/c-client
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.93 2012/10/08 23:39:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.94 2012/10/15 12:35:16 eras Exp $
+
+*c-client-2007f-r4 (15 Oct 2012)
+
+  15 Oct 2012; Eray Aslan <eras@gentoo.org> +c-client-2007f-r4.ebuild,
+  +files/c-client-2007f-topal.patch, metadata.xml:
+  Add topal and chappa USE flags for use with mail-client/alpine - bug #391387.
+  Fix ssl linkage.
 
   08 Oct 2012; Robin H. Johnson <robbat2@gentoo.org>
   +files/c-client-2007f-ldflags.patch, c-client-2007f-r3.ebuild:
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 80629ccc33de..f699e9226c90 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -1,14 +1,37 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2002d-Makefile.patch 2174 SHA256 ff9102e5e3e1498269084ef803d73c0c21bff136b038f13ba648a4248981ca35 SHA512 38014cac79ad475b02ea10ca11d084ff32fb07dbb8d2c02f9dfcc5bda03c1a7c11b1479a12e7c7907ade5e7b31f3fe20cfaa84e87bd174c62087b8841a5820fd WHIRLPOOL 443c41d8306066919b1eb0d1533b693bed36585660fa0a6ce83c4b4fdf8ccf45aa3bb188317aed174618404116c56b402c5526d876316f2c4eb9638bc4b085a1
 AUX c-client-2006k_GENTOO_Makefile.patch 2441 SHA256 6f7bf2d23f346f0f8eed4c4ae61e5b5c95d1a12e15e7fb4192a5a723754255f8 SHA512 35b9dd0737986e466dfbfc5388827b09934b32a9a7922bba3d7b4a4bd40dcaf2985a7f2d5bd3e884ad8d33c61eaabdc7f797d6af450b3f85cd0dacec764233e0 WHIRLPOOL 56c5ca98b651de9711f261f5cb1346a517c14bedca4c44d9bc0da4201b75264a8dd1568952f693c93a0fb80d905b52f4d121fefaac1d51b08d9096514fbaaaa4
 AUX c-client-2006k_GENTOO_amd64-so-fix.patch 665 SHA256 77de7621946c69638295ac11275124d0c405a4c6ba284a068f9a96c4994f3184 SHA512 213f06e133704ed2bb9fc6900edb7a4505bf6965409ecf76502bf9cafdf7c981bca552479f8ffaa1a355d2f1c1c08dbe0453fa5bce06590f6627d0e622c70879 WHIRLPOOL e111b86dbc52ec97851d229366cec17b7999c3924bd33da52f2290d0ab0afabdfe75db8eb4e0e359c96ad1d7265c28eee92d1a1337ba25ddaa3cb003ef106d1e
 AUX c-client-2006k_KOLAB_Annotations.patch 14551 SHA256 cd8833d4eabd8fbad6a1588e3ee5375fced007964f1c6bcd016b34bee5d8eaf2 SHA512 871093236b3ae300968e1e200a2389566af72ed1f62ad57c1dc617dd59e8378f29175fe07e5cfc575e022f3c27769b06850cbf21567f7cc359ca204c4d87a3af WHIRLPOOL ec2e5e84bb2bc4bb17bd63d93a1d4f25be165e00e783d01e88ce695d0987dcc023dacbddedc030d02a0de3d2e7677760f80a60a85a223b687b78150870df942d
 AUX c-client-2007e-ldflags.patch 1635 SHA256 6eddb2951525fc002652f9e7d38cb39b813526ded71f5a58be596d93d6e375c2 SHA512 e49ee72662a014d8df618357258a9bdb6860e3a54842fea9b56d4cb4f8eb66f0d77c4940e6ed5c970d3ec1b684b561791609cfaaffc44c7f2587729ef3811073 WHIRLPOOL 3d4d185265f73d3c7a22c353d71da3aaddc428b5d1204061b409254952f5d113c4b069c63a39fd44edc8f91f208002f1b5b24e63a7a5c66f1f69bb2aad72c46a
 AUX c-client-2007f-ldflags.patch 1648 SHA256 41f42d69bcd550d8aa62a756bc90d579612a6230be1794dcf9580e49287a485b SHA512 b635479ade20a0225b5847664579b97961de6981bc747357f9282f89dacd1860030904a43625f5e939f5afb3df38738fd6744fc659261a97e7f8eed9e6cde00c WHIRLPOOL 91367d9fe5c661d6c98e75376d7101ee31ec13155cba62da10b0b787e969fab87d650c661809a40da67f21757d4988f99a129dc159aec7e00036b01b48d376b1
+AUX c-client-2007f-topal.patch 1070 SHA256 2927b586a5faef4b6b77451c7a72c351d3304b15493e337b4a47d625d0d45884 SHA512 a32b4e381c0b66fe5621d625b4fa3ba51dba8d8d4504cf137762e917cc637badc094ffa3d5238530c020cb24a228010d9714768c915691564c037638c5cc345f WHIRLPOOL 411780a2b4560f68421b92ee147332be1a2ead13580169c0235ad48e308cc816c9adf9b82e5e074cba1452be6f4d85d59cafdcd06754889bfb8edbea96352240
+DIST c-client-2007f-chappa-115-all.patch.gz 30571 SHA256 ce7512e1b0d904d6429bb999bc0b159becc253088bbd89ef2185e6c948723cff SHA512 f44489ec38aa6a3dc682872a6857154254c23352db81ee380dfdfad39743234d97a8bcc07a74459f7532efe2fc073cf7d9c078433e11a95de19beeb387ff8b65 WHIRLPOOL 9fef9066c43df4c15f4f75bbad3634481e4cfce69c054682fe40193c30db6f9ceaed40138d00133c1bf1623dd45d251031562b2f16f1699ebcf0fbc8ce6c4653
 DIST imap-2007e.tar.Z 2789469 SHA256 be648d0e1aa62d564d9dbe04b77ea948116ee96ed687cb5d169c99ae28286e59 SHA512 5fee39fb3408afef7721d28384259ef6f0fb26b7e0b1cadd5cb7539bb5c486e28dc8467dc7db8450eb14f258108fd793dbb0bd3bb0e26e525778bf9da3051b14 WHIRLPOOL 5bdec146c8f023ccbc878804e37dce6d525eb95ed8a5d896d7706abc31c325a227c8e42d8ae1a92d6ac31638008540fc0a37ee15253fb7452866b73b98228fcf
 DIST imap-2007f.tar.Z 2793529 SHA256 870e95f6bd19265832a88fd89b77c54c841c59022fd21e69254050c8b1005e3c SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae WHIRLPOOL 655536d61a178940363241ad8c94a28be75e90abf3b8c585eb61364a6394ff49bb5fd5dc6de4bec5f992f03b592e583df04f0103e8f3c167aa68a476c574c4ec
 EBUILD c-client-2007e-r2.ebuild 3368 SHA256 61c6fd80427560b66e2cf35d193a1942b279f6a2d0c4cd0f5455e5c534ff4166 SHA512 2fd33d8253250d78ca73be5661036e2c0772ee47e721826db0b48470ab873b915ab0f2a5ead80c1cb027ada1532775e8e6042b6363132604c0cf83f1d0155fb5 WHIRLPOOL 83c18e1db4d9029e208f6335fd5d0f2642c7fb2453bbedaea2e539ad88fd6873d0d23593f0c6c8a32ceb8e2ded4e7e629deada59f6da359f1a58101786cc48d8
 EBUILD c-client-2007f-r1.ebuild 3153 SHA256 c3743b981ca2b6e64e7161258a7584fbb6ff66db164987ad3fb071641160f8b2 SHA512 0cf9d49c0bb96988150bc390dfe8d16c9d6fe73c7c0835ebc6e567a2d4c9a8442de2a4b69adda3f21c2c816d2cadad81904b4eba1c58fed0165114390ba3fef4 WHIRLPOOL e79c4ec7079b691d3a7691885411b8bf50548c545c58f7fa45a371e18f94d0a4d2fcbb6c6281b709cef9bf544de33d8978aab34f7a1c173da72548bfb3cc9250
 EBUILD c-client-2007f-r2.ebuild 3422 SHA256 baff4785c2b24c77035d714ec80ad8d2e77501150c72eccffe92befdcc8724a2 SHA512 756b90edb88447a47681f430da3cdf019af9d4e7af7b9c834fe7ddb0d948ecdd4d58f5d0cf007b32532d2d2fce4acabedd10e606831e0683292ff4bd5ac187fe WHIRLPOOL a9dc2f5736b84e5d8b2e6ef6e0cfebfe06acbda895badc9646f92edcc288d99af34c9d644701ff038e354f46e03ca2079d4b2443e057d1b07904d2c3288f6e2e
 EBUILD c-client-2007f-r3.ebuild 3816 SHA256 0f997fd26df76ac36b67f7628cc9390e89e1f1cea999b1383366469fec5a4d8c SHA512 eb10ad9b413220e2015a6e63c61e8089705168fe4bd4e2173567b4a8ee1c6616824076d0a842fb53855e543e7945366792d9980aac8b8202ff3dc5babc7483b6 WHIRLPOOL 81e3672686f5d24e47a618e36262a6531824e82bd373273e2f618ed4f1d1a8abb75231fcb12b13db51bd74ac71e36ff816ed22cd427109423e69cf1b7fdf9497
-MISC ChangeLog 12336 SHA256 52c27ae5f8b22f1224ccafbdf1571fb6767acfa559d0e7988f51474d6ab0d648 SHA512 20a6a8ddd671386ce2fbb8f485fbea0bfa1aa681d6b95e981eb835240ea26115bf23c63a0d655d13d1998693707b0b2a405a84fbc62bc5744d21e5d9d34df22e WHIRLPOOL 3d07a3a72d4a361e637d2bdd50175af6efda502cd058f34b7342263ac646155b7ec9eb9f2bfae0becbeab479e2198df02d60b38ce2fea85081b453ff72ae73a7
-MISC metadata.xml 235 SHA256 52bdb2e9321c82e6ecec49b9cbd88c0fe21bbd7135c5bf28af450620a4860f06 SHA512 13ffeaf5906838c43d300de14441027c0314e4097981b8fbe8950fe2e7fc5900d221100a246443a40a8e96501e140e1cf4eb734c15d7c4e2e0977f3f1f00dee7 WHIRLPOOL c905c6efa9c08a70f67387b02f6fc9a5002347b3deef61ef97eae754d053364574195c647c9f3c28b49879fc89cd558f10756f59c3bb9a1dd677c6d48b42c9ca
+EBUILD c-client-2007f-r4.ebuild 4128 SHA256 3b00b33f412885052f05fac145d1587bbe90c07d7bb131861ff958743d9166cb SHA512 9b892d7a0c030696477c886cc69dde95aecb64aeb12085b6544ac50f6154e12ab7eefab023c0d98abd17982281ac187aa666403ea7ec5b38b4df0f852ff5ca0c WHIRLPOOL 345a4fd1ae6d752c1bd2c41f6f289b6aee5bc2caf60f8f916d8fbd4c6e7644ece071cbdf2a1e3688c36dff21707d5dcbabf98bdd4660090ba442a5a75c1653ab
+MISC ChangeLog 12589 SHA256 49d5b09f0d280509e1adbd19307e58507f9d4f2482a0b4a95a0f7926091c002f SHA512 956c348041fad7d9346a5d3625fad4cff1aee238d8185aae6c61c8f0a5137c44c2aed1417477c2539f96992c889e85522ce45ec503cdc03ceb42e4c66fd798c3 WHIRLPOOL 16f1fe83b6f03bd7ab447910ddf955e81932b227d31b561e6736f0112bef53523596895d6caef6f140eacef4fba21c2486aa919b88513b82d547f30935cdaba5
+MISC metadata.xml 493 SHA256 2edbcc472b96ecaf42e59644792ab029f8285e1be6aaf8d5136cd7a021210e61 SHA512 9a0b21eaa73777d2c6576c4ee274d9792886d9564a2043dd519cf6f5b0ae1436beea319cce4589dc3fbb7ee7753c7dec11feb5cee4145836f99a18ca075daa00 WHIRLPOOL 279f5059ed842c5e4c0f12f1d3e6390eb63f717fb5200bae6076b886da5f7642178394a34b137123ec13f2a998aa5a5b50094e1e7bb437dbeb377a117fb4ddab
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQfAMPAAoJEHfx8XVYajsf6hkP/RUupLc377ch0saS0NR2ZzOU
+e6ASY3MJL9pDh7eq0L06Qs6d6dYLCSMBVBfOkk5o9dZqQNpUhR/9fh1Xor7XmP7f
+tH4pfzC/1H2/J1Tud6/4Cq9l/3hilsLjssdBNzE/Bt8R2m7lgLNQ21YiW0YOEnUB
+A29NqjnRcKX7kpN6GHFbOaQNKWDAErucdkroIFvuELR8Hh/25anBfV6l3TIGofva
+voqTsAopbWX00gsOIvApsiuHIX8alcoas1r93XBLfGHmkzRy0FUSZxKUzT/2/iBq
+J82pih3hE/Qbd4fV98ftl5bIgrcRmZ6w8fLtwB86Uuxy0hTISc7aQF1ePsQVlhOv
+h5jeqtPpF2vdJoNq8znSp7BB5lsflPzvsBII3dFA8sIZo0nNOiaN7SaF8Xg3ww9X
+4NfDVUJsWvso+zSlBwib4sJF+IfstRpV6IJr1YLn85eIe1DSGHNLPgRp/0D6J8QH
+zlPxIvSUl+uHq0hAgknjam1hdF8YcXMLWcHnbHTwvQeSXVipvGjQzbU0KepasbnT
+7aF5rZT9iyByEFp1L2aAIUHzhw9S7LRTeGbto3+DWDgo4QIS0ROiDBGnHDyju3nc
+OJYCCKCJlEHl/K7wrvzzOhOZiG6wJ3icYTa484Z9/+x4ww3uOjJll62jDgxD9cto
+iWr2YjrPp2x6wi5UcGxl
+=Btbw
+-----END PGP SIGNATURE-----
diff --git a/net-libs/c-client/c-client-2007f-r4.ebuild b/net-libs/c-client/c-client-2007f-r4.ebuild
new file mode 100644
index 000000000000..314ccf0f8ac2
--- /dev/null
+++ b/net-libs/c-client/c-client-2007f-r4.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2007f-r4.ebuild,v 1.1 2012/10/15 12:35:16 eras Exp $
+
+EAPI=4
+
+inherit flag-o-matic eutils libtool toolchain-funcs multilib
+
+MY_PN=imap
+MY_P="${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_P}
+
+CHAPPA_PL=115
+DESCRIPTION="UW IMAP c-client library"
+HOMEPAGE="http://www.washington.edu/imap/"
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z
+	chappa? ( mirror://gentoo/${P}-chappa-${CHAPPA_PL}-all.patch.gz )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD pam ssl static-libs topal chappa"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	!net-mail/uw-imap
+	kerberos? ( app-crypt/mit-krb5 )"
+DEPEND="${RDEPEND}
+	kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) )"
+
+src_prepare() {
+	# Tarball packed with bad file perms
+	chmod -R u+rwX,go-w .
+
+	# lots of things need -fPIC, including various platforms, and this library
+	# generally should be built with it anyway.
+	append-flags -fPIC
+
+	# Modifications so we can build it optimally and correctly
+	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' \
+		-i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
+
+	# Make the build system more multilib aware
+	sed \
+		-e "s:^SSLLIB=\$(SSLDIR)/lib:SSLLIB=\$(SSLDIR)/$(get_libdir):" \
+		-e "s:^AFSLIB=\$(AFSDIR)/lib:AFSLIB=\$(AFSDIR)/$(get_libdir):" \
+		-i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
+
+	# Targets should use the Gentoo (ie linux) fs
+	sed -e '/^bsf:/,/^$/ s:ACTIVEFILE=.*:ACTIVEFILE=/var/lib/news/active:g' \
+		-i src/osdep/unix/Makefile || die "Makefile sex fixing failed for FreeBSD"
+
+	# Apply a patch to only build the stuff we need for c-client
+	epatch "${FILESDIR}"/${PN}-2006k_GENTOO_Makefile.patch
+
+	# Apply patch to add the compilation of a .so for PHP
+	# This was previously conditional, but is more widely useful.
+	epatch "${FILESDIR}"/${PN}-2006k_GENTOO_amd64-so-fix.patch
+
+	# Remove the pesky checks about SSL stuff
+	sed -e '/read.*exit/d' -i Makefile || die
+
+	# Respect LDFLAGS
+	epatch "${FILESDIR}"/${PN}-2007f-ldflags.patch
+	sed -e "s/CC=cc/CC=$(tc-getCC)/" \
+		-e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
+		-e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
+		-i src/osdep/unix/Makefile || die "Respecting build flags"
+
+	use topal && epatch "${FILESDIR}/${P}-topal.patch"
+	use chappa && epatch "${DISTDIR}/${P}-chappa-${CHAPPA_PL}-all.patch.gz"
+
+	elibtoolize
+}
+
+src_compile() {
+	local mymake ipver ssltype target passwdtype
+	ipver='IP=4'
+	use ipv6 && ipver="IP=6" && touch ip6
+	use ssl && ssltype="unix" || ssltype="none"
+	if use kernel_linux ; then
+		use pam && target=lnp passwdtype=pam || target=lnx passwdtype=std
+	elif use kernel_FreeBSD ; then
+		target=bsf passwdtype=pam
+	fi
+	use kerberos \
+		&& mymake="EXTRAAUTHENTICATORS=gss" \
+		&& EXTRALIBS="-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \
+	# no parallel builds supported!
+	emake -j1 SSLTYPE=${ssltype} $target \
+		PASSWDTYPE=${passwdtype} ${ipver} ${mymake} \
+		EXTRACFLAGS="${CFLAGS}" \
+		EXTRALDFLAGS="${LDFLAGS}" \
+		EXTRALIBS="${EXTRALIBS}" \
+		GSSDIR=/usr
+}
+
+src_install() {
+	if use static-libs; then
+		# Library binary
+		dolib.a c-client/c-client.a
+		dosym c-client.a /usr/$(get_libdir)/libc-client.a
+	fi
+
+	# Now the shared library
+	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
+
+	# Headers
+	insinto /usr/include/imap
+	doins src/osdep/unix/*.h
+	doins src/c-client/*.h
+	doins c-client/linkage.h
+	doins c-client/linkage.c
+	doins c-client/osdep.h
+	if use ssl; then
+		echo "  ssl_onceonlyinit ();" >> "${D}"/usr/include/imap/linkage.c || die
+	fi
+	# Docs
+	dodoc README docs/*.txt docs/BUILD docs/CONFIG docs/RELNOTES docs/SSLBUILD
+	if use doc; then
+		docinto rfc
+		dodoc docs/rfc/*.txt
+		docinto draft
+		dodoc docs/draft/*
+	fi
+}
diff --git a/net-libs/c-client/files/c-client-2007f-topal.patch b/net-libs/c-client/files/c-client-2007f-topal.patch
new file mode 100644
index 000000000000..2b5db04cace5
--- /dev/null
+++ b/net-libs/c-client/files/c-client-2007f-topal.patch
@@ -0,0 +1,27 @@
+diff -cr alpine-2.00.orig/imap/src/c-client/mail.h alpine-2.00.new/imap/src/c-client/mail.h
+*** src/c-client/mail.h	2008-08-08 18:34:22.000000000 +0100
+--- src/c-client/mail.h	2009-05-01 13:40:37.000000000 +0100
+***************
+*** 775,780 ****
+--- 775,781 ----
+      unsigned long bytes;	/* size of text in octets */
+    } size;
+    char *md5;			/* MD5 checksum */
++   unsigned short topal_hack;    /* set to 1 if topal has wrecked the sending */
+    void *sparep;			/* spare pointer reserved for main program */
+  };
+  
+diff -cr alpine-2.00.orig/imap/src/c-client/mail.c alpine-2.00.new/imap/src/c-client/mail.c
+*** src/c-client/mail.c	2008-06-04 19:39:54.000000000 +0100
+--- src/c-client/mail.c	2009-04-30 22:34:13.000000000 +0100
+***************
+*** 2712,2717 ****
+--- 2712,2719 ----
+    BODY *b = NIL;
+    PART *pt;
+    unsigned long i;
++   /* Topal hack 2 */
++   mail_fetchstructure (stream,msgno,&b);
+  				/* make sure have a body */
+    if (section && *section && mail_fetchstructure (stream,msgno,&b) && b)
+      while (*section) {		/* find desired section */
diff --git a/net-libs/c-client/metadata.xml b/net-libs/c-client/metadata.xml
index d257d4fc66f9..20b32568dbd9 100644
--- a/net-libs/c-client/metadata.xml
+++ b/net-libs/c-client/metadata.xml
@@ -4,5 +4,9 @@
     <herd>net-mail</herd>
 	<use>
 		<flag name="doc">Install RFCs related to IMAP</flag>
+		<flag name='topal'>Enable support for <pkg>net-mail/topal</pkg>
+		for use with <pkg>mail-client/alpine</pkg></flag>
+		<flag name='chappa'>Enable Eduardo Chappa's patches for use with
+		<pkg>mail-client/alpine</pkg> (mainly adds support for maildir)</flag>
 	</use>
 </pkgmetadata>