Updated chappa-patch. 4.62-r1 stable on x86. Removed spooldir warning.

(Portage version: 2.0.51.19)

6 files changed, 218 insertions, 19 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index 9519451473fb..24bec0e72ccd 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/pine
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.41 2005/03/05 07:05:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.42 2005/03/29 21:52:34 ticho Exp $
+
+*pine-4.62-r2 (29 Mar 2005)
+
+  29 Mar 2005; Andrej Kacian <ticho@gentoo.org>
+  +files/pine-4.62-spooldir-permissions.patch, pine-4.62-r1.ebuild,
+  +pine-4.62-r2.ebuild:
+  Updated the chappa-patchset. 4.62-r1 stable on x86. Introduced patch which
+  turns off .lockfile usage to get rid of "vulnerable" spool directory on
+  startup.
 
   05 Mar 2005; Joseph Jezak <josejx@gentoo.org> pine-4.62.ebuild:
   Marked ppc stable for bug #83249.
diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest
index b159b2857829..2a32d0ae5835 100644
--- a/mail-client/pine/Manifest
+++ b/mail-client/pine/Manifest
@@ -1,25 +1,28 @@
-MD5 0e5258e6e45955daf4a7b559b97ba396 ChangeLog 14634
+MD5 5bbfb0a715c67efc73e5f4b9a15e2753 ChangeLog 14817
+MD5 f245da5a3d62442c119242a51f954fd3 pine-4.62-r1.ebuild 5206
 MD5 d3210060048b2a6df3bbb18110bec61e pine-4.61-r2.ebuild 4688
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 e47ce30788b990def76b3429e05647a4 pine-4.61-r3.ebuild 4691
-MD5 80055259213721a085dd8a1987e39bb7 pine-4.62.ebuild 5790
-MD5 8a21bd61ca5eb2f04ba57dedd7904bc3 pine-4.62-r1.ebuild 5207
+MD5 297309d89e1ebd11ec6609d199d9d450 pine-4.62-r2.ebuild 5253
 MD5 8ec3c94572364f8758088a64b46344a7 pine-4.61-r5.ebuild 5004
+MD5 80055259213721a085dd8a1987e39bb7 pine-4.62.ebuild 5790
+MD5 e47ce30788b990def76b3429e05647a4 pine-4.61-r3.ebuild 4691
 MD5 4e9b706db460df4a4f4392b4c519b837 pine-4.61-r4.ebuild 4813
-MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
-MD5 4239f06fa5f26e5cf181bb4cd5d96035 files/imap-4.7c2-flock.patch 531
-MD5 c0d53400c157de12da7e429dd0f21185 files/imap-2000-time.patch 1646
-MD5 fa3a8604150ceb9b876b6c5f1f2309ab files/digest-pine-4.62 206
-MD5 6fca405df4fd22a5708ddf83e8081716 files/pine-4.40-lockfile-perm.patch 932
-MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
-MD5 de52689ee75160c695bf4659ee956845 files/imap-4.7c2-flock_4.60.patch 537
+MD5 8f1d4661a745dab7f2113e7068c6e04e files/digest-pine-4.61-r3 139
 MD5 8f1d4661a745dab7f2113e7068c6e04e files/digest-pine-4.61-r4 139
+MD5 8f1d4661a745dab7f2113e7068c6e04e files/digest-pine-4.61-r5 139
+MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
 MD5 4c1ce6a4925676bcfe5c53a2cf05b7f7 files/digest-pine-4.61-r2 139
+MD5 7e8bb5286b4b14ec695fce340f8bb6b5 files/pine-4.62-spooldir-permissions.patch 488
+MD5 4239f06fa5f26e5cf181bb4cd5d96035 files/imap-4.7c2-flock.patch 531
+MD5 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182
 MD5 17031d0e1279dabd445a3deb5d19287c files/pine-4.61-largeterminal.patch 526
-MD5 1d3052dda4b361277ca31ce465a29626 files/digest-pine-4.62-r1 139
-MD5 8f1d4661a745dab7f2113e7068c6e04e files/digest-pine-4.61-r3 139
 MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420
-MD5 1057540bd7b50f92e88b3af6f8d69c99 files/pine-4.61-subjectlength.patch 2363
-MD5 8f1d4661a745dab7f2113e7068c6e04e files/digest-pine-4.61-r5 139
+MD5 b3fd3bd534ef04e16efb8755b8e845be files/digest-pine-4.62-r2 139
+MD5 c0d53400c157de12da7e429dd0f21185 files/imap-2000-time.patch 1646
+MD5 6fca405df4fd22a5708ddf83e8081716 files/pine-4.40-lockfile-perm.patch 932
+MD5 fa3a8604150ceb9b876b6c5f1f2309ab files/digest-pine-4.62 206
+MD5 1d3052dda4b361277ca31ce465a29626 files/digest-pine-4.62-r1 139
+MD5 de52689ee75160c695bf4659ee956845 files/imap-4.7c2-flock_4.60.patch 537
+MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
 MD5 dadc9e153e023ad3b24d8cefd4bf5a2b files/pine-4.56-passfile.patch 504
-MD5 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182
+MD5 1057540bd7b50f92e88b3af6f8d69c99 files/pine-4.61-subjectlength.patch 2363
diff --git a/mail-client/pine/files/digest-pine-4.62-r2 b/mail-client/pine/files/digest-pine-4.62-r2
new file mode 100644
index 000000000000..980668a7532f
--- /dev/null
+++ b/mail-client/pine/files/digest-pine-4.62-r2
@@ -0,0 +1,2 @@
+MD5 60e58c0676b4761d1e9bd3570dd7c222 pine4.62.tar.bz2 3079348
+MD5 b066689674b5dd7ea3239b5b6c6cc333 pine-4.62-r2-chappa-all.patch.gz 165504
diff --git a/mail-client/pine/files/pine-4.62-spooldir-permissions.patch b/mail-client/pine/files/pine-4.62-spooldir-permissions.patch
new file mode 100644
index 000000000000..eb8c2f3eee96
--- /dev/null
+++ b/mail-client/pine/files/pine-4.62-spooldir-permissions.patch
@@ -0,0 +1,12 @@
+diff -bur pine4.62/imap/src/osdep/unix/env_unix.c pine4.62-gentoo/imap/src/osdep/unix/env_unix.c
+--- pine4.62/imap/src/osdep/unix/env_unix.c	2004-09-13 23:32:11.000000000 +0200
++++ pine4.62-gentoo/imap/src/osdep/unix/env_unix.c	2005-03-24 23:38:13.000000000 +0100
+@@ -106,7 +106,7 @@
+  * on the mail spool, or install mlock.
+  */
+ 				/* disable warning if can't make .lock file */
+-static short disableLockWarning = NIL;
++static short disableLockWarning = 1;
+ 
+ /* UNIX namespaces */
+ 
diff --git a/mail-client/pine/pine-4.62-r1.ebuild b/mail-client/pine/pine-4.62-r1.ebuild
index 5357708d907f..f7339ce366c8 100644
--- a/mail-client/pine/pine-4.62-r1.ebuild
+++ b/mail-client/pine/pine-4.62-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.62-r1.ebuild,v 1.2 2005/02/25 16:30:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.62-r1.ebuild,v 1.3 2005/03/29 21:52:34 ticho Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/pine/${P/-/}.tar.bz2
 
 LICENSE="PICO"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc-macos ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64 ~ppc-macos ~ia64"
 IUSE="ssl ldap kerberos largeterminal pam passfile debug"
 
 DEPEND="virtual/libc
diff --git a/mail-client/pine/pine-4.62-r2.ebuild b/mail-client/pine/pine-4.62-r2.ebuild
new file mode 100644
index 000000000000..0edf4d184372
--- /dev/null
+++ b/mail-client/pine/pine-4.62-r2.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.62-r2.ebuild,v 1.1 2005/03/29 21:52:34 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. (see #59573) 
+CHAPPA_PF="${P}-r2"
+
+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="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc-macos ~ia64"
+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"
+
+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}/${P}-spooldir-permissions.patch" || die
+
+	# Various fixes and features.
+	epatch "${WORKDIR}/${CHAPPA_PF}-chappa-all.patch" || die
+	# 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" || die
+	if use ldap ; then
+		# Link to shared ldap libs instead of static.
+		epatch "${FILESDIR}/pine-4.30-ldap.patch" || die
+		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" || die
+	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" || die
+	fi
+
+	# Something from RedHat.
+	epatch "${FILESDIR}/pine-4.31-segfix.patch" || die
+	# Create lockfiles with a mode of 0600 instead of 0666.
+	epatch "${FILESDIR}/pine-4.40-lockfile-perm.patch" || die
+	# Add missing time.h includes.
+	epatch "${FILESDIR}/imap-2000-time.patch" || die
+	# Bug #23336 - makes pine transparent in terms that support it.
+	epatch "${FILESDIR}/transparency.patch" || die
+
+	# Bug #72861 - relaxes subject length for base64-encoded subjects
+	epatch "${FILESDIR}/pine-4.61-subjectlength.patch" || die
+
+	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 pam ; then
+		target=lnp
+	else
+		target=slx
+	fi
+
+	./build ${myconf} ${target} || die "compile problem"
+}
+
+src_install() {
+	dobin bin/pine bin/pico bin/pilot bin/mtest bin/rpdump bin/rpload \
+	      mailutil/mailutil
+
+	# 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 \
+	      imap/src/mailutil/mailutil.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
+}