Updated chappa-all patchset. Apply patch that preserves symlinks when pine rewrites a file. Suggested by Haroon Rafique <corporate_gadfly at hotmail.com> in bug #58664.

Package-Manager: portage-2.1.2_pre2-r3

5 files changed, 246 insertions, 8 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index fccaa6532c20..d422d170fb87 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/pine
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.85 2006/09/19 21:03:42 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.86 2006/10/07 01:02:45 ticho Exp $
+
+*pine-4.64-r5 (07 Oct 2006)
+
+  07 Oct 2006; Andrej Kacian <ticho@gentoo.org> +files/rename-symlink.patch,
+  +pine-4.64-r5.ebuild:
+  Updated chappa-all patchset. Apply patch that preserves symlinks when pine
+  rewrites a file. Suggested by Haroon Rafique <corporate_gadfly at
+  hotmail.com> in bug #58664.
 
 *pine-4.64-r4 (19 Sep 2006)
 
diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest
index 75077b7a0640..1f5093a3f85b 100644
--- a/mail-client/pine/Manifest
+++ b/mail-client/pine/Manifest
@@ -41,6 +41,10 @@ AUX pine-4.62-spooldir-permissions.patch 488 RMD160 e286a3e588ab8440d6d33cc9eeb8
 MD5 7e8bb5286b4b14ec695fce340f8bb6b5 files/pine-4.62-spooldir-permissions.patch 488
 RMD160 e286a3e588ab8440d6d33cc9eeb81dbc17298afb files/pine-4.62-spooldir-permissions.patch 488
 SHA256 88eb08e815586a51ab453f709b0aae7bc2a5c09f5f7f74544c4cdcf718853c9b files/pine-4.62-spooldir-permissions.patch 488
+AUX rename-symlink.patch 860 RMD160 76a815fad144699892158cd99a1f18e55d7b6b06 SHA1 d7f909f90ba1146629b12a5dd21c7b892f21cde0 SHA256 0ae8442d1e8b7f9a9d6f64785238043c9749a0b3b46f7de4fded28b37463dc16
+MD5 a02b2e80929434b5bcae07a09ef0f51d files/rename-symlink.patch 860
+RMD160 76a815fad144699892158cd99a1f18e55d7b6b06 files/rename-symlink.patch 860
+SHA256 0ae8442d1e8b7f9a9d6f64785238043c9749a0b3b46f7de4fded28b37463dc16 files/rename-symlink.patch 860
 AUX transparency.patch 447 RMD160 47005c14ec0efb7fc484b164da7d6df6fe2f4e90 SHA1 3358b25f7d48160b0ca0c1ad0a146564e854fd1d SHA256 404a615f1c88a6e781fb4bd8ba87657dd4c505d566c2678fd7b15bd198efca00
 MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
 RMD160 47005c14ec0efb7fc484b164da7d6df6fe2f4e90 files/transparency.patch 447
@@ -51,6 +55,7 @@ DIST pine-4.64-chappa-all.patch.gz 168807
 DIST pine-4.64-r1-chappa-all.patch.gz 168825
 DIST pine-4.64-r3-chappa-all.patch.gz 172627 RMD160 f0682f3d8baf555f7940f0c2764a3b5870407a0d SHA1 0b1eae55685bc3b92523498c9591d61b5d40ea89 SHA256 6570a5b5daf5fec0c75feb90e5d9e561c33bff9223d60d01a32ade92754880fc
 DIST pine-4.64-r4-chappa-all.patch.gz 181492 RMD160 12cc42e20e23ef275cc302961e4e75c4d443666b SHA1 a2e544103e7792d9a5c9645e80756b0ba18f4014 SHA256 68ce52ec065997c9f273518c2149b5810bf9866ad6280a79515215eb346da2be
+DIST pine-4.64-r5-chappa-all.patch.gz 181492 RMD160 12cc42e20e23ef275cc302961e4e75c4d443666b SHA1 a2e544103e7792d9a5c9645e80756b0ba18f4014 SHA256 68ce52ec065997c9f273518c2149b5810bf9866ad6280a79515215eb346da2be
 DIST pine4.61.tar.bz2 3032253
 DIST pine4.63.tar.bz2 3083721
 DIST pine4.64.tar.bz2 3110790 RMD160 8661cd3c0875e46c8cd5eafa7c7c964f79a3b3fd SHA1 b88aeb64ec2fa30bbb38fda3a051d98dc0e19c5e SHA256 5a697f1ffed84bba2dddb3534d0829eab6dacd169ea0122621e6b3dd522eb783
@@ -74,14 +79,18 @@ EBUILD pine-4.64-r4.ebuild 5453 RMD160 2915014df99cdb2a36d3a549390efb5723461574
 MD5 f70d685dad0641f986ecc95b9c16ee3c pine-4.64-r4.ebuild 5453
 RMD160 2915014df99cdb2a36d3a549390efb5723461574 pine-4.64-r4.ebuild 5453
 SHA256 3a91da1b630a463fa880b6a632161d031c96459c5c141dc02a1d2aba326f5195 pine-4.64-r4.ebuild 5453
+EBUILD pine-4.64-r5.ebuild 5420 RMD160 0e271cf9dafbe23906604cebbd2f2799c0c3e5cc SHA1 2f4c36b4096d446b9d0f8d470842046ca086568f SHA256 568e6d37e363d83d5ced0e862a2c50184dc6d0e1471008b8eb5f51eb54ba5c4a
+MD5 bd743bae20cc3532450e8e8b01dbd296 pine-4.64-r5.ebuild 5420
+RMD160 0e271cf9dafbe23906604cebbd2f2799c0c3e5cc pine-4.64-r5.ebuild 5420
+SHA256 568e6d37e363d83d5ced0e862a2c50184dc6d0e1471008b8eb5f51eb54ba5c4a pine-4.64-r5.ebuild 5420
 EBUILD pine-4.64.ebuild 5489 RMD160 30bb63d99b45066e1822930976712885c4aca611 SHA1 a165b55211945a8dcafdbe9fabac8f5bf8a16b05 SHA256 68dbe9181a569a1fef0740c369e7cf183a792d30cd6fb9bc961dc51f1f72de72
 MD5 f5c3b6e2fcc8955980d54be53436e01e pine-4.64.ebuild 5489
 RMD160 30bb63d99b45066e1822930976712885c4aca611 pine-4.64.ebuild 5489
 SHA256 68dbe9181a569a1fef0740c369e7cf183a792d30cd6fb9bc961dc51f1f72de72 pine-4.64.ebuild 5489
-MISC ChangeLog 19849 RMD160 985c8d9267edaf39df7302cf95d763254985efe0 SHA1 f81669dbce4edd82eabe3ff9f62aa48781e2596b SHA256 5ec6d8adbc7b1ea794e6f5c63fc7ca612c2b1c6930df62a83ad15e8e4820a0af
-MD5 70cca5c07c24893ab1a928a2c2a5d059 ChangeLog 19849
-RMD160 985c8d9267edaf39df7302cf95d763254985efe0 ChangeLog 19849
-SHA256 5ec6d8adbc7b1ea794e6f5c63fc7ca612c2b1c6930df62a83ad15e8e4820a0af ChangeLog 19849
+MISC ChangeLog 20155 RMD160 5d5a42d4aaaa5a53258f0ce16f8d3db44700ea4a SHA1 0536a8d01422df8cf2e88db5c5debc3f465a384c SHA256 e6088e5521f0dc52b3987e672adfa64e0a0f9401c8467d9bb3e90447e720421f
+MD5 018add5eb8bcb0e1cd228f5c7782ef36 ChangeLog 20155
+RMD160 5d5a42d4aaaa5a53258f0ce16f8d3db44700ea4a ChangeLog 20155
+SHA256 e6088e5521f0dc52b3987e672adfa64e0a0f9401c8467d9bb3e90447e720421f ChangeLog 20155
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -104,10 +113,13 @@ SHA256 de15698ef68041fd629de450333b1e72128f0ed153644075d9784d1735384e94 files/di
 MD5 ed81cffb27e2c3f2c85abf958b69f8d3 files/digest-pine-4.64-r4 509
 RMD160 c80f632a217408df863eb2f4e24776c249e5c6b9 files/digest-pine-4.64-r4 509
 SHA256 a4f0d969831e832d6498fdf1627cf6231f641496de238577580e6ae60a831868 files/digest-pine-4.64-r4 509
+MD5 cc06d833379c1f6819c7a82235357222 files/digest-pine-4.64-r5 509
+RMD160 884eb6aec4a12255ae6be8e6d1c7a0a7fdd694bf files/digest-pine-4.64-r5 509
+SHA256 f02d8805a81d0077f980f437e8ab03882c427830ced5f1a0b8421eec4bd6bc32 files/digest-pine-4.64-r5 509
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFEFs310xuJSrg3/sRAt1fAJ9yHnOdIXqnmfO+pl6BFbQASY0igwCfayV3
-9UFuKpG8aBHgFuqxwlSPx30=
-=H1By
+iD8DBQFFJvzFQlM6RnzZP+IRAk83AKC6wPzWyvbmoEv9QWFYjRQaBwmB5wCgqY42
+5qtYL9Vgnk+pbMicjgMMJRA=
+=7Gc0
 -----END PGP SIGNATURE-----
diff --git a/mail-client/pine/files/digest-pine-4.64-r5 b/mail-client/pine/files/digest-pine-4.64-r5
new file mode 100644
index 000000000000..f32e3efd5cfb
--- /dev/null
+++ b/mail-client/pine/files/digest-pine-4.64-r5
@@ -0,0 +1,6 @@
+MD5 0684c783061a2e1d48b8f340288ce9fd pine-4.64-r5-chappa-all.patch.gz 181492
+RMD160 12cc42e20e23ef275cc302961e4e75c4d443666b pine-4.64-r5-chappa-all.patch.gz 181492
+SHA256 68ce52ec065997c9f273518c2149b5810bf9866ad6280a79515215eb346da2be pine-4.64-r5-chappa-all.patch.gz 181492
+MD5 39ca07b3d305b4cd0d6aaf4585123275 pine4.64.tar.bz2 3110790
+RMD160 8661cd3c0875e46c8cd5eafa7c7c964f79a3b3fd pine4.64.tar.bz2 3110790
+SHA256 5a697f1ffed84bba2dddb3534d0829eab6dacd169ea0122621e6b3dd522eb783 pine4.64.tar.bz2 3110790
diff --git a/mail-client/pine/files/rename-symlink.patch b/mail-client/pine/files/rename-symlink.patch
new file mode 100644
index 000000000000..8af77448a3fd
--- /dev/null
+++ b/mail-client/pine/files/rename-symlink.patch
@@ -0,0 +1,30 @@
+diff -aur pine4.50.orig/pine/osdep/rename pine4.50/pine/osdep/rename
+--- pine4.50.orig/pine/osdep/rename	1993-07-15 19:07:14.000000000 -0400
++++ pine4.50/pine/osdep/rename	2002-12-06 16:14:17.000000000 -0500
+@@ -1,3 +1,6 @@
++#ifndef PATH_MAX
++#define PATH_MAX	2048
++#endif
+ /*----------------------------------------------------------------------
+       Rename a file
+ 
+@@ -10,7 +13,18 @@
+ rename_file(tmpfname, fname)
+     char *tmpfname, *fname;
+ {
+-    return(rename(tmpfname, fname));
++	char *resolvedpath;
++	int rc = 0;
++	if( (resolvedpath = (char *) malloc(PATH_MAX*sizeof(char))) == NULL ) {
++		dprint(2,(debugfile,"---- rename_file(%s, %s) failed ------\n",
++					tmpfname, fname));
++		return(-1);
++	}
++	/* resolves symbolic links */
++	realpath(fname, resolvedpath);
++	rc = rename(tmpfname, resolvedpath);
++	free(resolvedpath);
++    return(rc);
+ }
+ 
+ 
diff --git a/mail-client/pine/pine-4.64-r5.ebuild b/mail-client/pine/pine-4.64-r5.ebuild
new file mode 100644
index 000000000000..9835bebfc3e0
--- /dev/null
+++ b/mail-client/pine/pine-4.64-r5.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r5.ebuild,v 1.1 2006/10/07 01:02:45 ticho Exp $
+
+inherit eutils
+
+# Using this ugly hack, since we're making our own versioned copies of chappa 
+# patch, as upstream doesn't version them, and patch revision number doesn't
+# always have to correspond to ebuild revision number. (see #59573) 
+CHAPPA_PF="${PF}"
+
+DESCRIPTION="A tool for reading, sending and managing electronic messages."
+HOMEPAGE="http://www.washington.edu/pine/
+	http://www.math.washington.edu/~chappa/pine/patches/"
+SRC_URI="ftp://ftp.cac.washington.edu/pine/${P/-/}.tar.bz2
+	mirror://gentoo/${CHAPPA_PF}-chappa-all.patch.gz"
+#	ipv6? (
+#		http://www.ngn.euro6ix.org/IPv6/${PN}/${P}-v6-20031001.diff
+#		http://www.ngn.euro6ix.org/IPv6/${PN}/readme.${P}-v6-20031001
+#	)"
+
+LICENSE="PICO"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="ssl ldap kerberos largeterminal pam passfile debug"
+
+DEPEND="virtual/libc
+	>=sys-apps/sed-4
+	>=sys-libs/ncurses-5.1
+	pam? ( >=sys-libs/pam-0.72 )
+	ssl? ( dev-libs/openssl )
+	ldap? ( net-nds/openldap )
+	kerberos? ( app-crypt/mit-krb5 )"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+	net-mail/uw-mailutils
+	!<=net-mail/uw-imap-2004g"
+
+S="${WORKDIR}/${P/-/}"
+
+maildir_warn() {
+	einfo
+	einfo "This build of Pine has Maildir support built in as"
+	einfo "part of the chappa-all patch."
+	einfo
+	einfo "If you have a maildir at ~/Maildir it will be your"
+	einfo "default INBOX. The path may be changed with the"
+	einfo "\"maildir-location\" setting in Pine."
+	einfo
+	einfo "To use /var/spool/mail INBOX again, set"
+	einfo "\"disable-these-drivers=md\" in your .pinerc file."
+	einfo
+	einfo "Alternately, you might want to read following webpage, which explains how to"
+	einfo "use multiple mailboxes simultaneously:"
+	echo
+	echo "http://www.math.washington.edu/~chappa/pine/pine-info/collections/incoming-folders/"
+	echo
+}
+
+pkg_setup() {
+	maildir_warn
+}
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	epatch "${FILESDIR}/pine-4.62-spooldir-permissions.patch"
+
+	# Various fixes and features.
+	epatch "${WORKDIR}/${CHAPPA_PF}-chappa-all.patch"
+	# Fix flock() emulation.
+	cp "${FILESDIR}/flock.c" "${S}/imap/src/osdep/unix" || die
+	# Build the flock() emulation.
+	epatch "${FILESDIR}/imap-4.7c2-flock_4.60.patch"
+	if use ldap ; then
+		# Link to shared ldap libs instead of static.
+		epatch "${FILESDIR}/pine-4.30-ldap.patch"
+		mkdir "${S}/ldap"
+		ln -s /usr/lib "${S}/ldap/libraries"
+		ln -s /usr/include "${S}/ldap/include"
+	fi
+#	if use ipv6 ; then
+#		epatch "${DISTDIR}/${P}-v6-20031001.diff" || die
+#	fi
+	if use passfile ; then
+		#Is this really the correct place to define it?
+		epatch "${FILESDIR}/pine-4.56-passfile.patch"
+	fi
+	if use largeterminal ; then
+		# Add support for large terminals by doubling the size of pine's internal display buffer
+		epatch "${FILESDIR}/pine-4.61-largeterminal.patch"
+	fi
+
+	# Something from RedHat.
+	epatch "${FILESDIR}/pine-4.31-segfix.patch"
+	# Create lockfiles with a mode of 0600 instead of 0666.
+	epatch "${FILESDIR}/pine-4.40-lockfile-perm.patch"
+	# Add missing time.h includes.
+	epatch "${FILESDIR}/imap-2000-time.patch"
+	# Bug #23336 - makes pine transparent in terms that support it.
+	epatch "${FILESDIR}/transparency.patch"
+
+	# Bug #72861 - relaxes subject length for base64-encoded subjects
+	epatch "${FILESDIR}/pine-4.61-subjectlength.patch"
+
+	epatch "${FILESDIR}/rename-symlink.patch"
+
+	if use debug ; then
+		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
+			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
+		sed -e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \
+			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
+	else
+		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS}:" \
+			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
+		sed -e "s:-g -DDEBUG:${CFLAGS}:" \
+			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
+	fi
+
+	sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
+		-i "${S}/pine/osdep/os-lnx.h" || die "sed os-lnx.h failed"
+}
+
+src_compile() {
+	local myconf
+	if use ssl ; then
+		myconf="${myconf} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs"
+		sed -e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \
+			-e "s:\$(SSLCERTS):/etc/ssl/certs:" \
+			-e "s:-I\$(SSLINCLUDE) ::" \
+			-i "${S}/imap/src/osdep/unix/Makefile" || die "sed Makefile failed"
+	else
+		myconf="${myconf} NOSSL"
+	fi
+	if use ldap ; then
+		./contrib/ldap-setup lnp lnp
+		myconf="${myconf} LDAPCFLAGS=-DENABLE_LDAP"
+	else
+		myconf="${myconf} NOLDAP"
+	fi
+	if use kerberos ; then
+		myconf="${myconf} EXTRAAUTHENTICATORS=gss"
+	fi
+
+	if use ppc-macos; then
+		target=osx
+	else
+		if use pam ; then
+			target=lnp
+		else
+			target=slx
+		fi
+	fi
+
+	./build ${myconf} ${target} || die "compile problem"
+}
+
+src_install() {
+	dobin bin/pine bin/pico bin/pilot bin/rpdump bin/rpload
+
+	# Only mailbase should install /etc/mailcap
+#	donewins doc/mailcap.unx mailcap
+
+	doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1
+	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
+#	if use ipv6 ; then
+#		dodoc "${DISTDIR}/readme.${P}-v6-20031001"
+#	fi
+
+	docinto imap
+	dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/RELNOTES
+
+	docinto imap/rfc
+	dodoc imap/docs/rfc/*.txt
+
+	docinto html/tech-notes
+	dohtml -r doc/tech-notes/
+}
+
+pkg_postinst() {
+	maildir_warn
+}