fix for bug #95964. By Andrea Barisani <lcars@gentoo.org>

Package-Manager: portage-2.0.51.19

5 files changed, 21 insertions, 14 deletions

diff --git a/mail-mta/sendmail/ChangeLog b/mail-mta/sendmail/ChangeLog
index 52075173c707..20d46922507f 100644
--- a/mail-mta/sendmail/ChangeLog
+++ b/mail-mta/sendmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/sendmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.31 2005/05/29 16:17:49 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.32 2005/06/14 13:42:05 ferdy Exp $
+
+  14 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  sendmail-8.13.1-r1.ebuild, sendmail-8.13.3.ebuild, sendmail-8.13.4.ebuild:
+  fix for bug #95964. By Andrea Barisani <lcars@gentoo.org>
 
   29 May 2005; Fernando J. Pereda <ferdy@gentoo.org> files/site.config.m4:
   fix site.config.m4 wrt #94287
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 0562dd0030d8..1e15394be5c6 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3cb655cf9af25ff8de3232afc850c7bd sendmail-8.13.3.ebuild 5952
-MD5 50e814379c50db0570cb6ab678be1691 sendmail-8.13.1-r1.ebuild 5923
-MD5 01569c8ed1454c6c197f5343be395a89 sendmail-8.13.4.ebuild 5816
-MD5 b083f54dfbe11167b938fd8560160af7 ChangeLog 11150
+MD5 6ae9741a6ccd4bd751bb6b69fa4b69a9 sendmail-8.13.3.ebuild 5991
+MD5 c77f180f8a2e154ffd41becf19407a59 sendmail-8.13.1-r1.ebuild 5962
+MD5 e119771544ced11719abdea0aac6b2de sendmail-8.13.4.ebuild 5853
+MD5 08afb1af459776d1b2e0383f5d8a011c ChangeLog 11341
 MD5 07aa1897fda73805b9d68a2b82090e5f metadata.xml 218
 MD5 9cf5b1a30908c5f96f258b835f430865 files/sendmail.cf 39312
 MD5 1a9fedeb2f17b9a7de4f0f8da6c06d63 files/sendmail.mc 299
@@ -24,7 +24,7 @@ MD5 4b37f61de2fd8de372a4bd8ab6f92edf files/sendmail-8.12.2-smrsh-paths.patch 562
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCmetGViELBEf1JB0RAsqAAJ0Zry/MALQsCKYWHuYm+DBvhRLWZQCff9KE
-F9mSQr3JhJ9AOXB39d+SqXg=
-=UhLg
+iD8DBQFCrt7WViELBEf1JB0RAj43AJ49A22Gy3ufgw7SUYIS1neVpwzopACeNfB/
+iw0LLJ7A0g4jF1AW0NoreTY=
+=y8ui
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/sendmail/sendmail-8.13.1-r1.ebuild b/mail-mta/sendmail/sendmail-8.13.1-r1.ebuild
index 9acdefe52dcd..951f965761fa 100644
--- a/mail-mta/sendmail/sendmail-8.13.1-r1.ebuild
+++ b/mail-mta/sendmail/sendmail-8.13.1-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-mta/sendmail/sendmail-8.13.1-r1.ebuild,v 1.8 2005/02/19 18:59:06 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.1-r1.ebuild,v 1.9 2005/06/14 13:42:05 ferdy Exp $
 
 inherit eutils
 
@@ -137,7 +137,8 @@ src_install () {
 	else
 		newins ${FILESDIR}/sendmail-procmail.mc sendmail.mc
 	fi
-	m4 ${D}/etc/mail/sendmail.mc > ${D}/etc/mail/sendmail.cf
+	m4 ${D}/usr/share/sendmail-cf/m4/cf.m4 ${D}/etc/mail/sendmail.mc \
+		> ${D}/etc/mail/sendmail.cf
 	echo "# local-host-names - include all aliases for your machine here" \
 		> ${D}/etc/mail/local-host-names
 	cat << EOF > ${D}/etc/mail/trusted-users
diff --git a/mail-mta/sendmail/sendmail-8.13.3.ebuild b/mail-mta/sendmail/sendmail-8.13.3.ebuild
index 8621511a31d9..d8e20ff318cf 100644
--- a/mail-mta/sendmail/sendmail-8.13.3.ebuild
+++ b/mail-mta/sendmail/sendmail-8.13.3.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-mta/sendmail/sendmail-8.13.3.ebuild,v 1.8 2005/04/24 08:19:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.3.ebuild,v 1.9 2005/06/14 13:42:05 ferdy Exp $
 
 inherit eutils
 
@@ -137,7 +137,8 @@ src_install () {
 	else
 		newins ${FILESDIR}/sendmail-procmail.mc sendmail.mc
 	fi
-	m4 ${D}/etc/mail/sendmail.mc > ${D}/etc/mail/sendmail.cf
+	m4 ${D}/usr/share/sendmail-cf/m4/cf.m4 ${D}/etc/mail/sendmail.mc \
+		> ${D}/etc/mail/sendmail.cf
 	echo "# local-host-names - include all aliases for your machine here" \
 		> ${D}/etc/mail/local-host-names
 	cat <<- EOF > ${D}/etc/mail/trusted-users
diff --git a/mail-mta/sendmail/sendmail-8.13.4.ebuild b/mail-mta/sendmail/sendmail-8.13.4.ebuild
index e760eaf2cb3f..7cdc68576669 100644
--- a/mail-mta/sendmail/sendmail-8.13.4.ebuild
+++ b/mail-mta/sendmail/sendmail-8.13.4.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-mta/sendmail/sendmail-8.13.4.ebuild,v 1.1 2005/04/05 14:41:27 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.4.ebuild,v 1.2 2005/06/14 13:42:05 ferdy Exp $
 
 inherit eutils
 
@@ -125,7 +125,8 @@ src_install () {
 	else
 		newins ${FILESDIR}/sendmail-procmail.mc sendmail.mc
 	fi
-	m4 ${D}/etc/mail/sendmail.mc > ${D}/etc/mail/sendmail.cf
+	m4 ${D}/usr/share/sendmail-cf/m4/cf.m4 ${D}/etc/mail/sendmail.mc \
+		> ${D}/etc/mail/sendmail.cf
 	echo "# local-host-names - include all aliases for your machine here" \
 		> ${D}/etc/mail/local-host-names
 	cat <<- EOF > ${D}/etc/mail/trusted-users