new revision

(Portage version: 2.1)

7 files changed, 248 insertions, 1 deletions

diff --git a/mail-mta/sendmail/ChangeLog b/mail-mta/sendmail/ChangeLog
index 9bb4aa204034..c8fe623c8a1b 100644
--- a/mail-mta/sendmail/ChangeLog
+++ b/mail-mta/sendmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-mta/sendmail
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.53 2006/06/15 09:39:15 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.54 2006/06/16 09:09:20 lcars Exp $
+
+*sendmail-8.13.7-r1 (16 Jun 2006)
+
+  16 Jun 2006; Andrea Barisani <lcars@gentoo.org>
+  +files/errata-8.13.7-1.patch, +files/errata-8.13.7-2.patch,
+  +sendmail-8.13.7-r1.ebuild:
+  Revision bump with 2 errata published by sendmail.org.
 
   15 Jun 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   sendmail-8.13.7.ebuild:
diff --git a/mail-mta/sendmail/files/digest-sendmail-8.13.6 b/mail-mta/sendmail/files/digest-sendmail-8.13.6
index 1f17765b98d3..87a3e00f6a5d 100644
--- a/mail-mta/sendmail/files/digest-sendmail-8.13.6
+++ b/mail-mta/sendmail/files/digest-sendmail-8.13.6
@@ -1 +1,3 @@
 MD5 484cca51f74b5e562b3cf119ceb2f900 sendmail.8.13.6.tar.gz 1986576
+RMD160 cbb0649b5dec8e4b4850c76ad4a132a15335df3b sendmail.8.13.6.tar.gz 1986576
+SHA256 68764cf48a6cdab3786791e3a4b0cd19941a18b083d4c53a362e4026f4c72a7a sendmail.8.13.6.tar.gz 1986576
diff --git a/mail-mta/sendmail/files/digest-sendmail-8.13.6-r1 b/mail-mta/sendmail/files/digest-sendmail-8.13.6-r1
index 1f17765b98d3..87a3e00f6a5d 100644
--- a/mail-mta/sendmail/files/digest-sendmail-8.13.6-r1
+++ b/mail-mta/sendmail/files/digest-sendmail-8.13.6-r1
@@ -1 +1,3 @@
 MD5 484cca51f74b5e562b3cf119ceb2f900 sendmail.8.13.6.tar.gz 1986576
+RMD160 cbb0649b5dec8e4b4850c76ad4a132a15335df3b sendmail.8.13.6.tar.gz 1986576
+SHA256 68764cf48a6cdab3786791e3a4b0cd19941a18b083d4c53a362e4026f4c72a7a sendmail.8.13.6.tar.gz 1986576
diff --git a/mail-mta/sendmail/files/digest-sendmail-8.13.7-r1 b/mail-mta/sendmail/files/digest-sendmail-8.13.7-r1
new file mode 100644
index 000000000000..cc6c02f8a0b9
--- /dev/null
+++ b/mail-mta/sendmail/files/digest-sendmail-8.13.7-r1
@@ -0,0 +1,3 @@
+MD5 5327e065cb0c1919122c8cecbeddbc28 sendmail.8.13.7.tar.gz 2010008
+RMD160 a1cab6a7f015bf50c1773a67f35b800c751d55ed sendmail.8.13.7.tar.gz 2010008
+SHA256 4ed72f2cd43e2ab492c91248319c03e224a272a4d683cfc4c3ee484a79471b22 sendmail.8.13.7.tar.gz 2010008
diff --git a/mail-mta/sendmail/files/errata-8.13.7-1.patch b/mail-mta/sendmail/files/errata-8.13.7-1.patch
new file mode 100644
index 000000000000..35c7ad8fd201
--- /dev/null
+++ b/mail-mta/sendmail/files/errata-8.13.7-1.patch
@@ -0,0 +1,13 @@
+diff -u -r8.954 -r8.954.2.2
+--- sendmail/queue.c	22 Apr 2006 01:07:00 -0000	8.954
++++ sendmail/queue.c	14 Jun 2006 21:50:56 -0000	8.954.2.2
+@@ -6695,8 +6695,7 @@
+ 	static time_t nextupdate = 0;
+ 
+ #if SM_CONF_SHM
+-	/* only the daemon updates this structure */
+-	if (ShmId == SM_SHM_NO_ID || DaemonPid != CurrentPid)
++	if (ShmId == SM_SHM_NO_ID && DaemonPid != CurrentPid)
+ 		return;
+ #endif /* SM_CONF_SHM */
+ 	now = curtime();
diff --git a/mail-mta/sendmail/files/errata-8.13.7-2.patch b/mail-mta/sendmail/files/errata-8.13.7-2.patch
new file mode 100644
index 000000000000..c48d84c580be
--- /dev/null
+++ b/mail-mta/sendmail/files/errata-8.13.7-2.patch
@@ -0,0 +1,23 @@
+diff -u -r8.944 main.c
+--- sendmail/main.c	21 Apr 2006 23:56:42 -0000	8.944
++++ sendmail/main.c	15 Jun 2006 18:38:35 -0000
+@@ -2408,6 +2408,8 @@
+ 	{
+ 		char dtype[200];
+ 
++		/* avoid cleanup in finis(), DaemonPid will be set below */
++		DaemonPid = 0;
+ 		if (!run_in_foreground && !tTd(99, 100))
+ 		{
+ 			/* put us in background */
+@@ -2440,7 +2442,10 @@
+ 
+ 		dtype[0] = '\0';
+ 		if (OpMode == MD_DAEMON)
++		{
+ 			(void) sm_strlcat(dtype, "+SMTP", sizeof dtype);
++			DaemonPid = CurrentPid;
++		}
+ 		if (QueueIntvl > 0)
+ 		{
+ 			(void) sm_strlcat2(dtype,
diff --git a/mail-mta/sendmail/sendmail-8.13.7-r1.ebuild b/mail-mta/sendmail/sendmail-8.13.7-r1.ebuild
new file mode 100644
index 000000000000..3ccaf2a5bec6
--- /dev/null
+++ b/mail-mta/sendmail/sendmail-8.13.7-r1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.7-r1.ebuild,v 1.1 2006/06/16 09:09:20 lcars 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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ssl ldap sasl tcpd mbox 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
+	epatch ${FILESDIR}/errata-8.13.7-1.patch || die
+	epatch ${FILESDIR}/errata-8.13.7-2.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 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"
+	pushd libmilter
+	sh Build || die "libmilter compilation failed"
+	popd
+}
+
+src_install () {
+	OBJDIR="obj.`uname -s`.`uname -r`.`arch`"
+	dodir /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
+
+	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"
+
+	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/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
+	newdoc libmilter/README README.libmilter
+
+	newdoc cf/README README.cf
+	newdoc cf/cf/README README.install-cf
+	cp -pPR 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}/usr/share/sendmail-cf/m4/cf.m4 ${D}/etc/mail/sendmail.mc \
+		> ${D}/etc/mail/sendmail.cf
+	echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
+		> ${D}/etc/mail/submit.mc
+	cat ${D}/usr/share/sendmail-cf/cf/submit.mc >> ${D}/etc/mail/submit.mc
+	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
+		rm ${D}/usr/bin/mailq
+		rm ${D}/usr/bin/newaliases
+		mv ${D}/usr/share/man/man8/sendmail.8 \
+			${D}/usr/share/man/man8/sendmail-sendmail.8
+		mv ${D}/usr/share/man/man1/mailq.1 \
+			${D}/usr/share/man/man1/mailq-sendmail.1
+		mv ${D}/usr/share/man/man1/newaliases.1 \
+			${D}/usr/share/man/man1/newaliases-sendmail.1
+		mv ${D}/usr/share/man/man5/aliases.5 \
+			${D}/usr/share/man/man5/aliases-sendmail.5
+		dosed 's/} sendmail/} sendmail.sendmail/' /etc/init.d/sendmail
+		dosed 's/sbin\/sendmail/sbin\/sendmail.sendmail/' /etc/init.d/sendmail
+	fi
+
+}
+
+pkg_setup() {
+	einfo "checking for smmsp group...    create if missing."
+	enewgroup smmsp 209 || die "problem adding group smmsp"
+	einfo "checking for smmsp user...     create if missing."
+	enewuser smmsp 209 -1 /var/spool/mqueue smmsp \
+		|| die "problem adding user smmsp"
+}
+
+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
+}