Add Prefix changes

(Portage version: 2.2.14_rc1-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)

4 files changed, 191 insertions, 6 deletions

diff --git a/mail-filter/procmail/ChangeLog b/mail-filter/procmail/ChangeLog
index 4ea2656954e7..333d2e11158f 100644
--- a/mail-filter/procmail/ChangeLog
+++ b/mail-filter/procmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/procmail
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.49 2014/04/22 05:48:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.50 2014/10/24 19:03:15 grobian Exp $
+
+  24 Oct 2014; Fabian Groffen <grobian@gentoo.org>
+  +files/procmail-3.22-interix.patch, +files/procmail-prefix.patch,
+  procmail-3.22-r10.ebuild:
+  Add Prefix changes
 
   22 Apr 2014; Fabian Groffen <grobian@gentoo.org> procmail-3.22-r10.ebuild:
   Fix build using GCC 4.7, thanks Denis Kaganovich in bug #466552
diff --git a/mail-filter/procmail/files/procmail-3.22-interix.patch b/mail-filter/procmail/files/procmail-3.22-interix.patch
new file mode 100644
index 000000000000..a24c052f3d2b
--- /dev/null
+++ b/mail-filter/procmail/files/procmail-3.22-interix.patch
@@ -0,0 +1,16 @@
+diff -ru procmail-3.22.orig/src/setid.c procmail-3.22/src/setid.c
+--- procmail-3.22.orig/src/setid.c	2010-02-04 10:05:43 +0100
++++ procmail-3.22/src/setid.c	2010-02-04 10:11:18 +0100
+@@ -15,7 +15,11 @@
+      return EX_USAGE;
+    }
+   endpwent();
+-  if(initgroups(argv[1],p->pw_gid)||setgid(p->pw_gid)||setuid(p->pw_uid))
++  if(
++#ifndef __INTERIX
++  	initgroups(argv[1],p->pw_gid)||
++#endif
++	setgid(p->pw_gid)||setuid(p->pw_uid))
+      return EX_OSERR;
+   if(fopen(CHECK_FILE,"r"))
+    { struct stat stbuf;
diff --git a/mail-filter/procmail/files/procmail-prefix.patch b/mail-filter/procmail/files/procmail-prefix.patch
new file mode 100644
index 000000000000..0f1bb2dee433
--- /dev/null
+++ b/mail-filter/procmail/files/procmail-prefix.patch
@@ -0,0 +1,155 @@
+--- config.h~	2007-10-03 17:55:24 +0200
++++ config.h	2007-10-03 18:01:38 +0200
+@@ -116,11 +116,11 @@
+ 	is not found, maildelivery will proceed as normal to the default
+ 	system mailbox.	 This also must be an absolute path */
+ 
+-#define ETCRC	"/etc/procmailrc"	/* optional global procmailrc startup
++#define ETCRC	"@GENTOO_PORTAGE_EPREFIX@/etc/procmailrc"	/* optional global procmailrc startup
+ 					   file (will only be read if procmail
+ 	is started with no rcfile on the command line). */
+ 
+-#define ETCRCS	"/etc/procmailrcs/"	/* optional trusted path prefix for
++#define ETCRCS	"@GENTOO_PORTAGE_EPREFIX@/etc/procmailrcs/"	/* optional trusted path prefix for
+ 					   rcfiles which will be executed with
+ 	the uid of the owner of the rcfile (this only happens if procmail is
+ 	called with the -m option, without variable assignments on the command
+@@ -168,7 +168,7 @@
+ #define INEFFICIENTrealloc			  /* don't pussy-foot around */
+ #endif
+ #define MAXinMEM	(1024*1024)		 /* when to switch to mmap() */
+-#define MMAP_DIR	"/var/spool/procmail/"		     /* where to put */
++#define MMAP_DIR	"@GENTOO_PORTAGE_EPREFIX@/var/spool/procmail/"		     /* where to put */
+ #endif								/* the files */
+ #define MINlogbuf	81			       /* fit an entire line */
+ #define MAXlogbuf	1000		       /* in case someone abuses LOG */
+@@ -220,8 +220,8 @@
+ #define DEFcomsat	offvalue	/* when an rcfile has been specified */
+ 				      /* set to either "offvalue" or "empty" */
+ 
+-#define BinSh		"/bin/sh"
+-#define ROOT_DIR	"/"
++#define BinSh		"@GENTOO_PORTAGE_EPREFIX@/bin/sh"
++#define ROOT_DIR	"@GENTOO_PORTAGE_EPREFIX@"
+ #define DEAD_LETTER	"/tmp/dead.letter"    /* $ORGMAIL if no passwd entry */
+ #define DevNull		"/dev/null"
+ #define NICE_RANGE	39			  /* maximal nice difference */
+--- Makefile~	2007-10-03 18:07:51 +0200
++++ Makefile	2007-10-03 18:10:07 +0200
+@@ -2,7 +2,7 @@
+ 
+ # BASENAME should point to where the whole lot will be installed
+ # change BASENAME to your home directory if need be
+-BASENAME	= /usr
++BASENAME	= @GENTOO_PORTAGE_EPREFIX@/usr
+ # For display in the man pages
+ VISIBLE_BASENAME= $(BASENAME)
+ 
+@@ -79,7 +79,7 @@
+ #			-lresolv	# not really needed, is it?
+ 
+ # Informal list of directories where we look for the libraries in SEARCHLIBS
+-LIBPATHS=/lib /usr/lib /usr/local/lib
++LIBPATHS=@GENTOO_PORTAGE_EPREFIX@/lib @GENTOO_PORTAGE_EPREFIX@/usr/lib
+ 
+ GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat -Wtraditional \
+  -Wpointer-arith -Wconversion -Waggregate-return \
+@@ -97,10 +97,10 @@
+ ####CC	= cc # gcc
+ # object file extension
+ O	= o
+-RM	= /bin/rm -f
++RM	= @GENTOO_PORTAGE_EPREFIX@/bin/rm -f
+ MV	= mv -f
+ LN	= ln
+-BSHELL	= /bin/sh
++BSHELL	= @GENTOO_PORTAGE_EPREFIX@/bin/sh
+ INSTALL = cp
+ DEVNULL = /dev/null
+ STRIP	= strip
+@@ -112,7 +112,7 @@
+ MANS5S	= procmailrc procmailsc procmailex
+ 
+ # Possible locations for the sendmail.cf file
+-SENDMAILCFS = /etc/mail/sendmail.cf /etc/sendmail.cf /usr/lib/sendmail.cf
++SENDMAILCFS = @GENTOO_PORTAGE_EPREFIX@/etc/mail/sendmail.cf @GENTOO_PORTAGE_EPREFIX@/etc/sendmail.cf @GENTOO_PORTAGE_EPREFIX@/usr/lib/sendmail.cf
+ 
+ # Makefile.1 - mark, don't (re)move this, a sed script needs it
+ 
+--- src/autoconf~	2001-09-11 06:55:46 +0200
++++ src/autoconf	2007-10-03 19:17:51 +0200
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! @GENTOO_PORTAGE_EPREFIX@/bin/sh
+ :
+ # Copyright (c) 1990-1997, S.R. van den Berg, The Netherlands
+ #$Id: procmail-prefix.patch,v 1.1 2014/10/24 19:03:15 grobian Exp $
+@@ -1416,20 +1416,10 @@
+ 
+ found=no
+ 
+-for a in /var/spool/mail /usr/spool/mail /var/mail /usr/mail /spool/mail
+-do
+-  test -d $a -a $found != yes &&
+-   echo '#define MAILSPOOLDIR "'$a'/"' >>$ACONF && found=yes
+-done
+-if test $found != yes
+-then
+- echo '#define MAILSPOOLDIR "/var/spool/mail/"' >>$ACONF
+- echo Could not find the system-mailbox directory, supplied default.
+-fi
++echo '#define MAILSPOOLDIR "@GENTOO_PORTAGE_EPREFIX@/var/spool/mail/"' >>$ACONF
+ 
+ cat >lookfor <<HERE
+-for a in /usr/sbin /usr/lib /lib /usr/etc /etc /usr/bin /bin /usr/local/bin \
+- /usr/lbin /usr/local/lib /usr/local /usr/.lib /local/bin /sbin
++for a in @GENTOO_PORTAGE_EPREFIX@/usr/sbin
+ do
+  if test -f "\$a/\$1"
+  then
+@@ -1458,7 +1448,7 @@
+ grep '^#define SENDMAIL ".*/sendmail"' $ACONF >$DEVNULL ||
+  echo "#define DEFflagsendmail \"\"" >>$ACONF
+ 
+-a=/tmp/_chowntst.$$
++a=@GENTOO_PORTAGE_EPREFIX@/tmp/_chowntst.$$
+ $RM -r $a
+ OLDTESTDIRS="$a $OLDTESTDIRS"
+ mkdir $a
+@@ -1466,19 +1456,18 @@
+ 
+ _autotst $a/__ $a/__/__ 4 >>$ACONF
+ 
+-cat /usr/lib/sendmail.cf /etc/sendmail.cf /etc/mail/sendmail.cf 2>$DEVNULL |
++cat @GENTOO_PORTAGE_EPREFIX@/usr/lib/sendmail.cf @GENTOO_PORTAGE_EPREFIX@/etc/sendmail.cf @GENTOO_PORTAGE_EPREFIX@/etc/mail/sendmail.cf 2>$DEVNULL |
+  grep 'Mlocal.*procmail' >$DEVNULL ||
+  echo '#define CF_no_procmail_yet' >>$ACONF
+ 
+-cat /usr/lib/sendmail.cf /etc/sendmail.cf /etc/mail/sendmail.cf 2>$DEVNULL |
++cat @GENTOO_PORTAGE_EPREFIX@/usr/lib/sendmail.cf @GENTOO_PORTAGE_EPREFIX@/etc/sendmail.cf @GENTOO_PORTAGE_EPREFIX@/etc/mail/sendmail.cf 2>$DEVNULL |
+  grep '^V' >$DEVNULL ||
+  echo '#define buggy_SENDMAIL' >>$ACONF
+ 
+-lpath='/bin'
+-bins="/bin"
++lpath='@GENTOO_PORTAGE_EPREFIX@/bin'
++bins='@GENTOO_PORTAGE_EPREFIX@/bin'
+ 
+-for newd in /usr/bin /usr/ucb /usr/5bin $BINDIR /local/bin /usr/local/bin \
+- /global/bin /usr/bin/X11 /usr/X*/bin
++for newd in @GENTOO_PORTAGE_EPREFIX@/usr/bin
+ do
+   if test -d $newd
+   then
+--- src/recommend.c~	2007-10-03 19:10:01 +0200
++++ src/recommend.c	2007-10-03 19:11:04 +0200
+@@ -9,8 +9,7 @@
+ 
+ char mailspooldir[]=MAILSPOOLDIR;
+ const char dirsep[]=DIRSEP,
+- *const checkf[]={"/bin/mail","/bin/lmail","/usr/lib/sendmail",
+- "/usr/lib/smail",0};
++ *const checkf[]={"@GENTOO_PORTAGE_EPREFIX@/usr/bin/sendmail",0};
+ 
+ int main(argc,argv)const int argc;const char*const argv[];
+ { struct group*grp;struct stat stbuf;gid_t gid=(gid_t)-1;
diff --git a/mail-filter/procmail/procmail-3.22-r10.ebuild b/mail-filter/procmail/procmail-3.22-r10.ebuild
index ac619f898e8f..d0979a682bb2 100644
--- a/mail-filter/procmail/procmail-3.22-r10.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 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.13 2014/04/22 05:48:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/procmail-3.22-r10.ebuild,v 1.14 2014/10/24 19:03:15 grobian Exp $
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs prefix
 
 DESCRIPTION="Mail delivery agent/filter"
 HOMEPAGE="http://www.procmail.org/"
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="mbox selinux"
 
 DEPEND="virtual/mta"
@@ -33,11 +33,13 @@ src_unpack() {
 		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
+		echo 'DEFAULT=${EPREFIX}/var/spool/mail/$LOGNAME' >> "${S}"/procmailrc
 	fi
 
 	# Do not use lazy bindings on lockfile and procmail
-	epatch "${FILESDIR}/${PN}-lazy-bindings.diff"
+	if [[ ${CHOST} != *-darwin* && ${CHOST} != *-interix* ]]; then
+		epatch "${FILESDIR}/${PN}-lazy-bindings.diff"
+	fi
 
 	# Fix for bug #102340
 	epatch "${FILESDIR}/${PN}-comsat-segfault.diff"
@@ -45,11 +47,18 @@ src_unpack() {
 	# Fix for bug #119890
 	epatch "${FILESDIR}/${PN}-maxprocs-fix.diff"
 
+	# Prefixify config.h
+	epatch "${FILESDIR}"/${PN}-prefix.patch
+	eprefixify config.h Makefile src/autoconf src/recommend.c
+
 	# Fix for bug #200006
 	epatch "${FILESDIR}/${PN}-pipealloc.diff"
 
 	# Fix for bug #270551
 	epatch "${FILESDIR}/${PN}-3.22-glibc-2.10.patch"
+
+	# Fix for x86-interix - doesn't have initgroups
+	epatch "${FILESDIR}"/${P}-interix.patch
 }
 
 src_compile() {