Don't use lazy bindings neither on procmail nor in lockfile

(Portage version: 2.0.51.19)

4 files changed, 28 insertions, 15 deletions

diff --git a/mail-filter/procmail/ChangeLog b/mail-filter/procmail/ChangeLog
index e6c29347c077..dad48fe08d2f 100644
--- a/mail-filter/procmail/ChangeLog
+++ b/mail-filter/procmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/procmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.11 2005/01/27 19:03:06 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.12 2005/05/23 08:42:56 ferdy Exp $
+
+  23 May 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/procmail-lazy-bindings.diff, procmail-3.22-r6.ebuild:
+  Don't use lazy bindings neither on procmail nor in lockfile
 
   27 Jan 2005; Andrej Kacian <ticho@gentoo.org> procmail-3.22-r6.ebuild:
   Added selinux support. Bug #79751.
diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest
index 9c0a9ba60ced..c42db32e7751 100644
--- a/mail-filter/procmail/Manifest
+++ b/mail-filter/procmail/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 eca993d91961415113072ebe1db4e2f7 procmail-3.22-r6.ebuild 1916
 MD5 9a07ed94b3189b73d869484a676f3700 ChangeLog 5668
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 4e2f3c96303ff521c37e8ea0a2304b19 procmail-3.22-r6.ebuild 1815
 MD5 280e86cd3850b13629b0beee3c2c5522 files/gentoo-maildir2.diff 797
+MD5 e0c638b848ae112a847d5ef48cb9f209 files/procmail-lazy-bindings.diff 622
 MD5 3b583fb1759a67d82e1f304ea40c2859 files/digest-procmail-3.22-r6 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB+TsCQlM6RnzZP+IRAly4AJ0dS1Obvgnuba1VL8ISf0qdpckvRACfehib
-varOVo0jFwXIvUudrRPjzv4=
-=KCza
------END PGP SIGNATURE-----
diff --git a/mail-filter/procmail/files/procmail-lazy-bindings.diff b/mail-filter/procmail/files/procmail-lazy-bindings.diff
new file mode 100644
index 000000000000..f1c4221650e6
--- /dev/null
+++ b/mail-filter/procmail/files/procmail-lazy-bindings.diff
@@ -0,0 +1,16 @@
+--- src/Makefile.0.old	2005-05-23 10:34:25.000000000 +0200
++++ src/Makefile.0	2005-05-23 10:34:52.000000000 +0200
+@@ -18,11 +18,11 @@
+ .PRECIOUS: Makefile
+ 
+ procmail: procmail.$(O) $(PM_OBJ) setid
+-	$(CC) $(CFLAGS) $@.$(O) $(PM_OBJ) -o $@ $(LDFLAGS)
++	$(CC) $(CFLAGS) $@.$(O) $(PM_OBJ) -o $@ -Wl,-z,now $(LDFLAGS)
+ 	@test -z "$(STRIP)" || ( echo $(STRIP) $@; $(STRIP) $@ )
+ 
+ lockfile: lockfile.$(O) $(LF_OBJ)
+-	$(CC) $(CFLAGS) $@.$(O) $(LF_OBJ) -o $@ $(LDFLAGS)
++	$(CC) $(CFLAGS) $@.$(O) $(LF_OBJ) -o $@ -Wl,-z,now $(LDFLAGS)
+ 	@test -z "$(STRIP)" || ( echo $(STRIP) $@; $(STRIP) $@ )
+ 
+ formail: formail.$(O) $(FM_OBJ)
diff --git a/mail-filter/procmail/procmail-3.22-r6.ebuild b/mail-filter/procmail/procmail-3.22-r6.ebuild
index d70826911127..0159f5da7cb6 100644
--- a/mail-filter/procmail/procmail-3.22-r6.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r6.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-filter/procmail/procmail-3.22-r6.ebuild,v 1.12 2005/01/27 19:03:06 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/procmail-3.22-r6.ebuild,v 1.13 2005/05/23 08:42:56 ferdy Exp $
 
 inherit eutils
 
@@ -29,8 +29,7 @@ src_compile() {
 		-e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \
 		-i Makefile
 
-	if ! use mbox;
-	then
+	if ! use mbox ; then
 		echo "# Use maildir-style mailbox in user's home directory" > ${S}/procmailrc
 		echo 'DEFAULT=$HOME/.maildir/' >> ${S}/procmailrc
 		cd ${S}
@@ -40,6 +39,9 @@ src_compile() {
 		echo 'DEFAULT=/var/spool/mail/$LOGNAME' >> ${S}/procmailrc
 	fi
 
+	# Do not use lazy bindings on lockfile and procmail
+	epatch "${FILESDIR}/${PN}-lazy-bindings.diff"
+
 	emake || die
 }