Add note to configure a default mail storage location when using maildir (#249579), do not strip binaries and respect LDFLAGS (#249202)

Package-Manager: portage-2.2_rc19/cvs/Linux 2.6.25-gentoo-r7 x86_64

3 files changed, 110 insertions, 12 deletions

diff --git a/mail-filter/procmail/ChangeLog b/mail-filter/procmail/ChangeLog
index 566138991902..c35cd39bfaf1 100644
--- a/mail-filter/procmail/ChangeLog
+++ b/mail-filter/procmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/procmail
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.35 2008/12/02 06:51:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.36 2008/12/27 17:09:00 dertobi123 Exp $
+
+*procmail-3.22-r10 (27 Dec 2008)
+
+  27 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  +procmail-3.22-r10.ebuild:
+  Add note to configure a default mail storage location when using maildir
+  (#249579), do not strip binaries and respect LDFLAGS (#249202)
 
   02 Dec 2008; Jeroen Roovers <jer@gentoo.org> procmail-3.22-r9.ebuild:
   Stable for HPPA (bug #233595).
diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest
index adf27f555034..7fe867e963ed 100644
--- a/mail-filter/procmail/Manifest
+++ b/mail-filter/procmail/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gentoo-maildir2.diff 797 RMD160 3bba3a5e93b754dbd90fd74506731ef1957e7083 SHA1 131f6ce4806b5bbd88b43eeb013e572de70945a0 SHA256 80ebd16b7fec85a231d40066a3d112141c5000954f878cb6789c30872681af8c
 AUX gentoo-maildir3.diff 461 RMD160 8cf4b6139b178e415402eff34923207a937d657d SHA1 3b0df435f8215d49585883f1eac382e615a17197 SHA256 b4cf36c3b5c9f73ca1877e1c424f5e7100908ba6997410c68a945d5d2fb65a3e
 AUX procmail-comsat-segfault.diff 822 RMD160 13049da7c6ee55a42ff197a14ba3cc65899f4051 SHA1 975b9d87ef5071c37f737663fe99bf567337077d SHA256 16a8c19b44b2f0eba0afd276d8b8af255efa31385c88942e4a1b251556afc23f
@@ -8,15 +5,9 @@ AUX procmail-lazy-bindings.diff 622 RMD160 3ced5004cabd094d0efe99c219f636bfea543
 AUX procmail-maxprocs-fix.diff 465 RMD160 edfd9d379cbdf95692c5fa152fc18e32b3b2d555 SHA1 be4704c5ade711615af53cf0e251905c7b33579a SHA256 08c2a210d6936a63f29d93f2c57daa92740fb011d916ddcbba16475f03ed2d2b
 AUX procmail-pipealloc.diff 825 RMD160 3334414d128d2eb0358a55caa06ad37570e052ba SHA1 87e6cb76f6c091d3a5afc528e31d18a3e9e73bd7 SHA256 bc2c755c287252d252fb46a60a86850074ca1020d4f0d0d272615c89db11d4ba
 DIST procmail-3.22.tar.gz 226817 RMD160 e609ec94ea9ab3b93629c62b3e29add497806483 SHA1 cd4e44c15559816453fd60349e5a32289f6f2965 SHA256 087c75b34dd33d8b9df5afe9e42801c9395f4bf373a784d9bc97153b0062e117
+EBUILD procmail-3.22-r10.ebuild 2722 RMD160 2360f711805d22b2e60c8b8e674e8abdb59c5f5d SHA1 c5fc2c570ffe9d3c40ec7246f902dcd9e5129124 SHA256 01a5b0569ac7ca191a296a88605a6bf63795e0320cf016b8ec0c3d0dbab46f67
 EBUILD procmail-3.22-r7.ebuild 1869 RMD160 97598553d4ff1755d394b456aad54c95fe1006f8 SHA1 8204f50d7e57cbf5ec1e323c51a74e39d4fa21e0 SHA256 f78938982e83e63c4b9b7c6171ef7cd6b3c06dc1b279466a46815b2bfd327abf
 EBUILD procmail-3.22-r8.ebuild 1973 RMD160 e5228239c247905743c8178b3e8bfd320810149b SHA1 8adcc0e4b7f33fa8f9b403a619518c5ebb41f01a SHA256 97ea65368073dd2924abcb7db4b89b98721f59f0a9c0f1375152eeeb46fb8812
 EBUILD procmail-3.22-r9.ebuild 2370 RMD160 da67097ff8e57f64b3da604e001252aa8aeef601 SHA1 32417fe55c5f7dbc0eca349f92872eb48ae2688b SHA256 50b6fb0a33f820be37191f1628592e86cb57fdf4dd7d53d9aa4a2941fa2ec04f
-MISC ChangeLog 8628 RMD160 9940ba1adbd3be3c90d0905bea640e8c8428ca89 SHA1 124c6e772c483d7b61e9ce501a8028f0d8c4b408 SHA256 c2b6ac0bd47ffc1e104470471c0dd41e3a00248fc98849bb64217dee1487c100
+MISC ChangeLog 8895 RMD160 4cce447d49cc4d12ebfe5f7e5c3cf743b6dcf82e SHA1 1ee4b9ca78719ab196cf58692368e86000cfa0a4 SHA256 602d71c29266f2005268ae0a4cfed46d24ef0ba04350835173f17114c5f99096
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkk8EFoACgkQ67wieSYcaxcz+QCfRI1TcfrBk47+lIsw6fl8OqPq
-0dkAn1eg4jh6DRGEop6mXZtoVBXmMNOj
-=j2Sn
------END PGP SIGNATURE-----
diff --git a/mail-filter/procmail/procmail-3.22-r10.ebuild b/mail-filter/procmail/procmail-3.22-r10.ebuild
new file mode 100644
index 000000000000..0b2f8dac5fff
--- /dev/null
+++ b/mail-filter/procmail/procmail-3.22-r10.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/procmail-3.22-r10.ebuild,v 1.1 2008/12/27 17:09:00 dertobi123 Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Mail delivery agent/filter"
+HOMEPAGE="http://www.procmail.org/"
+SRC_URI="http://www.procmail.org/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="mbox selinux"
+
+DEPEND="virtual/libc virtual/mta"
+RDEPEND="virtual/libc
+	selinux? ( sec-policy/selinux-procmail )"
+PROVIDE="virtual/mda"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# disable flock, using both fcntl and flock style locking
+	# doesn't work with NFS with 2.6.17+ kernels, bug #156493
+
+	sed -e "s:/\*#define NO_flock_LOCK:#define NO_flock_LOCK:" \
+		-i config.h || die "sed failed"
+
+	if ! use mbox ; then
+		echo "# Use maildir-style mailbox in user's home directory" > "${S}"/procmailrc
+		echo 'DEFAULT=$HOME/.maildir/' >> "${S}"/procmailrc
+		cd "${S}"
+		epatch "${FILESDIR}/gentoo-maildir3.diff"
+	else
+		echo '# Use mbox-style mailbox in /var/spool/mail' > "${S}"/procmailrc
+		echo 'DEFAULT=/var/spool/mail/$LOGNAME' >> "${S}"/procmailrc
+	fi
+
+	# Do not use lazy bindings on lockfile and procmail
+	epatch "${FILESDIR}/${PN}-lazy-bindings.diff"
+
+	# Fix for bug #102340
+	epatch "${FILESDIR}/${PN}-comsat-segfault.diff"
+
+	# Fix for bug #119890
+	epatch "${FILESDIR}/${PN}-maxprocs-fix.diff"
+
+	# Fix for bug #200006
+	epatch "${FILESDIR}/${PN}-pipealloc.diff"
+}
+
+src_compile() {
+	# -finline-functions (implied by -O3) leaves strstr() in an infinite loop.
+	# To work around this, we append -fno-inline-functions to CFLAGS
+	append-flags -fno-inline-functions
+
+	sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \
+		-e "s:LDFLAGS0= -s:LDFLAGS0 = ${LDFLAGS}:" \
+		-e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \
+		-e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \
+		-i Makefile || die "sed failed"
+
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	cd "${S}"/new
+	insinto /usr/bin
+	insopts -m 6755
+	doins procmail || die
+
+	doins lockfile || die
+	fowners root:mail /usr/bin/lockfile
+	fperms 2775 /usr/bin/lockfile
+
+	dobin formail mailstat || die
+	insopts -m 0644
+
+	doman *.1 *.5
+
+	cd "${S}"
+	dodoc FAQ FEATURES HISTORY INSTALL KNOWN_BUGS README
+
+	insinto /etc
+	doins procmailrc || die
+
+	docinto examples
+	dodoc examples/*
+}
+
+pkg_postinst() {
+	if ! use mbox ; then
+		elog "Starting with mail-filter/procmail-3.22-r9 you'll need to ensure"
+		elog "that you configure a mail storage  location using DEFAULT in"
+		elog "/etc/procmailrc, for example:"
+		elog "\tDEFAULT=\$HOME/.maildir/"
+	fi
+}