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.

(Portage version: 2.1.2_pre2-r3)

4 files changed, 227 insertions, 1 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/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
+}