Lots of fixes

8 files changed, 213 insertions, 48 deletions

diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 946143bce5cc..aee4908e18c2 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -1,17 +1,20 @@
+MD5 40d7afb19b4f17f9f3d8fcfd6d61f958 sendmail-8.13.1-r1.ebuild 5931
 MD5 93a365615996aed3e45735bb24914bf0 sendmail-8.12.11-r3.ebuild 5845
 MD5 17156e0ae4d330ec87483ee2986c9b1b sendmail-8.13.1.ebuild 5852
 MD5 5dc09b6ae9149950eff0923cfee7777e ChangeLog 9004
 MD5 07aa1897fda73805b9d68a2b82090e5f metadata.xml 218
 MD5 9cf5b1a30908c5f96f258b835f430865 files/sendmail.cf 39312
-MD5 a029154f3bd93696277b71733be6fa11 files/sendmail.mc 929
-MD5 bae92533adb7471b10497848f1d32bd9 files/site.config.m4 543
+MD5 2f83612b988d56f64ce4022219e832fa files/sendmail.mc 298
+MD5 edb5fd06df2d238778a89dd5265dd9e5 files/site.config.m4 481
 MD5 cf0c79a7387b7d83db30abc68269f467 files/digest-sendmail-8.12.11-r3 69
 MD5 d7d99c72954d524b1d0eafbfe0e77afc files/sendmail-8.12.2-makemapman.patch 2088
 MD5 b412547381b852586d5d4d6ffcd80b4a files/sendmail-8.12.2-unix.patch 395
 MD5 95d58f15432e44c91f8018839f65327c files/sendmail-8.12.6-r1-gentoo.diff 1701
 MD5 0027be040b9dacdf253813fe2ddb8982 files/digest-sendmail-8.13.1 68
 MD5 875d3c33bfa16e73e5e75ecb1d1a9d2b files/sendmail-procmail.cf 39897
-MD5 247288da5ccc5b2836791dfffac7fc08 files/sendmail-procmail.mc 987
-MD5 a316ad36c567063810fb793c5320179e files/sendmail 598
+MD5 6c0170a579cfc76e487d777a32b60b8e files/sendmail-procmail.mc 356
+MD5 c417ff0c36c692a17851c20b4d899bec files/sendmail 670
 MD5 61d4e49cceb149f6ff46cf6a1b598b88 files/mailer.conf 1306
+MD5 0027be040b9dacdf253813fe2ddb8982 files/digest-sendmail-8.13.1-r1 68
+MD5 7b2a2b2f8f608ddbd8b0c1b910ffb981 files/sendmail-delivered_hdr.patch 341
 MD5 4b37f61de2fd8de372a4bd8ab6f92edf files/sendmail-8.12.2-smrsh-paths.patch 5625
diff --git a/mail-mta/sendmail/files/digest-sendmail-8.13.1-r1 b/mail-mta/sendmail/files/digest-sendmail-8.13.1-r1
new file mode 100644
index 000000000000..7c05c7348120
--- /dev/null
+++ b/mail-mta/sendmail/files/digest-sendmail-8.13.1-r1
@@ -0,0 +1 @@
+MD5 5407db289086261d7e7a09920d2ea14e sendmail.8.13.1.tar.gz 1963257
diff --git a/mail-mta/sendmail/files/sendmail b/mail-mta/sendmail/files/sendmail
index fb46c290be82..1e3bec4dbc77 100644
--- a/mail-mta/sendmail/files/sendmail
+++ b/mail-mta/sendmail/files/sendmail
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/files/sendmail,v 1.2 2004/07/14 22:36:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/files/sendmail,v 1.3 2004/12/07 01:59:31 g2boojum Exp $
 
 depend() {
 	need net
@@ -14,6 +14,7 @@ start() {
 	/usr/bin/newaliases > /dev/null 2>&1
 	(cd /var/spool/mqueue; rm -f xf*)
 	/usr/sbin/sendmail ${SENDMAIL_OPTS} > /dev/null 2>&1
+	/usr/sbin/sendmail -C /etc/mail/sendmail-slow.cf -q5m > /dev/null 2>&1
 	/usr/sbin/sendmail ${CLIENTMQUEUE_OPTS} > /dev/null 2>&1
 	eend $?
 }
diff --git a/mail-mta/sendmail/files/sendmail-delivered_hdr.patch b/mail-mta/sendmail/files/sendmail-delivered_hdr.patch
new file mode 100644
index 000000000000..6837fed1c46d
--- /dev/null
+++ b/mail-mta/sendmail/files/sendmail-delivered_hdr.patch
@@ -0,0 +1,10 @@
+--- sendmail/conf.c.orig	2004-07-14 21:54:23.000000000 +0000
++++ sendmail/conf.c	2004-12-06 15:22:05.000000000 +0000
+@@ -117,6 +117,7 @@
+ 	{ "content-length",		H_ACHECK,		NULL	},
+ 	{ "subject",			H_ENCODABLE,		NULL	},
+ 	{ "x-authentication-warning",	H_FORCE,		NULL	},
++	{ "delivered-to",	    H_FORCE,		NULL	},
+ 
+ 	{ NULL,				0,			NULL	}
+ };
diff --git a/mail-mta/sendmail/files/sendmail-procmail.mc b/mail-mta/sendmail/files/sendmail-procmail.mc
index e578f8c5d0ed..312760ed6d98 100644
--- a/mail-mta/sendmail/files/sendmail-procmail.mc
+++ b/mail-mta/sendmail/files/sendmail-procmail.mc
@@ -1,27 +1,7 @@
 divert(-1)
-#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
-#	All rights reserved.
-# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
-# Copyright (c) 1988, 1993
-#	The Regents of the University of California.  All rights reserved.
-#
-# By using this file, you agree to the terms and conditions set
-# forth in the LICENSE file which can be found at the top level of
-# the sendmail distribution.
-#
-#
-
-#
-#  This is a generic configuration file for Linux.
-#  It has support for local and SMTP mail only.  If you want to
-#  customize it, copy it to a name appropriate for your environment
-#  and do the modifications there.
-#
-
 divert(0)dnl
 include(`/usr/share/sendmail-cf/m4/cf.m4')dnl
-VERSIONID(`$Id: sendmail-procmail.mc,v 1.1 2004/05/30 09:20:40 robbat2 Exp $')dnl
+VERSIONID(`$Id: sendmail-procmail.mc,v 1.2 2004/12/07 01:59:31 g2boojum Exp $')dnl
 OSTYPE(linux)dnl
 DOMAIN(generic)dnl
 FEATURE(`smrsh',`/usr/sbin/smrsh')dnl
diff --git a/mail-mta/sendmail/files/sendmail.mc b/mail-mta/sendmail/files/sendmail.mc
index c351d4bcd20a..e8772eee6fcb 100644
--- a/mail-mta/sendmail/files/sendmail.mc
+++ b/mail-mta/sendmail/files/sendmail.mc
@@ -1,27 +1,7 @@
 divert(-1)
-#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
-#	All rights reserved.
-# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
-# Copyright (c) 1988, 1993
-#	The Regents of the University of California.  All rights reserved.
-#
-# By using this file, you agree to the terms and conditions set
-# forth in the LICENSE file which can be found at the top level of
-# the sendmail distribution.
-#
-#
-
-#
-#  This is a generic configuration file for Linux.
-#  It has support for local and SMTP mail only.  If you want to
-#  customize it, copy it to a name appropriate for your environment
-#  and do the modifications there.
-#
-
 divert(0)dnl
 include(`/usr/share/sendmail-cf/m4/cf.m4')dnl
-VERSIONID(`$Id: sendmail.mc,v 1.1 2004/05/30 09:20:40 robbat2 Exp $')dnl
+VERSIONID(`$Id: sendmail.mc,v 1.2 2004/12/07 01:59:31 g2boojum Exp $')dnl
 OSTYPE(linux)dnl
 DOMAIN(generic)dnl
 FEATURE(`smrsh',`/usr/sbin/smrsh')dnl
diff --git a/mail-mta/sendmail/files/site.config.m4 b/mail-mta/sendmail/files/site.config.m4
index f95857391f1c..58aeae149911 100644
--- a/mail-mta/sendmail/files/site.config.m4
+++ b/mail-mta/sendmail/files/site.config.m4
@@ -11,5 +11,4 @@ define(`confMAN1SRC', `1')
 define(`confMAN5SRC', `5')
 define(`confMAN8SRC', `8')
 define(`confLDOPTS_SO', `-shared -Wl')
-APPENDDEF(`conf_sendmail_ENVDEF', `@@conf_sendmail_ENVDEF@@')
 APPENDDEF(`conf_sendmail_LIBS', `@@conf_sendmail_LIBS@@')
diff --git a/mail-mta/sendmail/sendmail-8.13.1-r1.ebuild b/mail-mta/sendmail/sendmail-8.13.1-r1.ebuild
new file mode 100644
index 000000000000..3b5d696b9780
--- /dev/null
+++ b/mail-mta/sendmail/sendmail-8.13.1-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2004 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.1 2004/12/07 01:59:31 g2boojum Exp $
+
+inherit eutils
+
+DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
+HOMEPAGE="http://www.sendmail.org/"
+SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
+
+LICENSE="Sendmail"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~s390 ~amd64 ~ppc64"
+IUSE="ssl ldap sasl tcpd mbox milter mailwrapper ipv6"
+
+DEPEND="net-mail/mailbase
+	sys-devel/m4
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( dev-libs/openssl )
+	ldap? ( net-nds/openldap )
+	>=sys-libs/db-3.2
+	!net-mail/vacation
+	"
+RDEPEND="${DEPEND}
+		>=net-mail/mailbase-0.00
+		!mailwrapper? ( !virtual/mta )
+		mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
+PDEPEND="!mbox? ( mail-filter/procmail )"
+PROVIDE="virtual/mta"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/sendmail-delivered_hdr.patch || die
+
+	confCCOPTS="${CFLAGS}"
+	confMAPDEF="-DMAP_REGEX"
+	conf_sendmail_LIBS=""
+	use sasl && confLIBS="${confLIBS} -lsasl2"  \
+		&& confENVDEF="${confENVDEF} -DSASL=2" \
+		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
+		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
+	use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
+		&& confLIBS="${confLIBS} -lwrap"
+	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \
+		&& confLIBS="${confLIBS} -lssl -lcrypto" \
+		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
+	use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
+		&& confLIBS="${confLIBS} -lldap -llber"
+	use milter && confENVDEF="${confENVDEF} -DMILTER"
+	use ipv6 && confENVDEF="${confENVDEF} -DNETINET6"
+	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
+		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
+		-e "s/@@confENVDEF@@/${confENVDEF}/" \
+		-e "s/@@confLIBS@@/${confLIBS}/" \
+		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
+		${FILESDIR}/site.config.m4 > ${S}/devtools/Site/site.config.m4
+}
+
+src_compile() {
+	sh Build || die "compilation failed in main Build script"
+
+	if use milter
+	then
+	    pushd libmilter
+		sh Build || die "libmilter compilation failed"
+		popd
+	fi
+}
+
+src_install () {
+	OBJDIR="obj.`uname -s`.`uname -r`.`arch`"
+	dodir /etc/pam.d /usr/bin /usr/lib
+	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
+	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
+	keepdir /var/spool/{clientmqueue,mqueue}
+	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap
+	do
+		make DESTDIR=${D} MANROOT=/usr/share/man/man \
+			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
+			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
+			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
+			MSPQOWN=root CFOWN=root CFGRP=root \
+			install -C ${OBJDIR}/${dir} \
+			|| die "install failed"
+	done
+	for dir in rmail mail.local
+	do
+		make DESTDIR=${D} MANROOT=/usr/share/man/man \
+			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
+			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
+			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
+			MSPQOWN=root CFOWN=root CFGRP=root \
+			force-install -C ${OBJDIR}/${dir} \
+			|| die "install failed"
+	done
+
+	if use milter
+	then
+	    dodir /usr/include/libmilter
+		make DESTDIR=${D} MANROOT=/usr/share/man/man \
+			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
+			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
+			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
+			MSPQOWN=root CFOWN=root CFGRP=root \
+			install -C ${OBJDIR}/libmilter \
+			|| die "install failed"
+	fi
+
+	fowners root:smmsp /usr/sbin/sendmail
+	fperms 2555 /usr/sbin/sendmail
+	fowners smmsp:smmsp /var/spool/clientmqueue
+	fperms 770 /var/spool/clientmqueue
+	fperms 700 /var/spool/mqueue
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
+	dosym /usr/sbin/makemap /usr/bin/makemap
+	dodoc FAQ LICENSE KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
+	newdoc sendmail/README README.sendmail
+	newdoc sendmail/SECURITY SECURITY
+	newdoc sendmail/TUNING TUNING
+	newdoc smrsh/README README.smrsh
+
+	if use milter
+	then
+		newdoc libmilter/README README.libmilter
+	fi
+
+	newdoc cf/README README.cf
+	newdoc cf/cf/README README.install-cf
+	cp -a cf/* ${D}/usr/share/sendmail-cf
+	insinto /etc/mail
+	if use mbox
+	then
+		doins ${FILESDIR}/sendmail.mc
+	else
+		newins ${FILESDIR}/sendmail-procmail.mc sendmail.mc
+	fi
+	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
+# trusted-users - users that can send mail as others without a warning
+# apache, mailman, majordomo, uucp are good candidates
+EOF
+	cat << EOF > ${D}/etc/mail/access
+# Check the /usr/share/doc/sendmail/README.cf file for a description
+# of the format of this file. (search for access_db in that file)
+# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
+# package.
+#
+
+EOF
+cat << EOF > ${D}/etc/conf.d/sendmail
+# Config file for /etc/init.d/sendmail
+# add start-up options here
+SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
+CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
+KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
+
+EOF
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/sendmail
+	keepdir /usr/adm/sm.bin
+
+	if use mailwrapper
+	then
+		mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.sendmail
+		insinto /etc/mail
+		doins ${FILESDIR}/mailer.conf
+		dosed 's/} sendmail/} sendmail.sendmail/' /etc/init.d/sendmail
+	fi
+
+}
+
+pkg_preinst() {
+	if ! groupmod smmsp; then
+		groupadd smmsp || die "problem adding group smmsp"
+	fi
+}
+
+pkg_postinst() {
+	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
+	then
+		einfo
+		einfo "Since you emerged sendmail without mailwrapper in USE,"
+		einfo "you probably want to 'emerge -C mailwrapper' now."
+		einfo
+	fi
+}