Version bump

(Portage version: 2.0.51-r14)

7 files changed, 222 insertions, 22 deletions

diff --git a/mail-mta/sendmail/ChangeLog b/mail-mta/sendmail/ChangeLog
index e42c23a69a7c..8449e56dd654 100644
--- a/mail-mta/sendmail/ChangeLog
+++ b/mail-mta/sendmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/sendmail
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.18 2004/12/29 00:26:36 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.19 2005/02/12 14:37:37 g2boojum Exp $
+
+*sendmail-8.13.3 (12 Feb 2005)
+
+  12 Feb 2005; Grant Goodyear <g2boojum@gentoo.org>
+  sendmail-8.13.1-r1.ebuild, +sendmail-8.13.3.ebuild:
+  Stable request for 8.13.1-r1.  8.13.3 added to the tree as ~all.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 0b02d1577b05..f4fa4aef89c4 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -1,20 +1,22 @@
-MD5 70881845624fd16b80936c0aeb0b2bc8 ChangeLog 9248
+MD5 cb59ba5f37b96485e737883eb49cd466 sendmail-8.13.3.ebuild 5934
+MD5 c70c97ef64cd27bdd4766dc67cfac0df sendmail-8.13.1-r1.ebuild 5933
 MD5 93a365615996aed3e45735bb24914bf0 sendmail-8.12.11-r3.ebuild 5845
-MD5 cb59ba5f37b96485e737883eb49cd466 sendmail-8.13.1-r1.ebuild 5934
 MD5 17156e0ae4d330ec87483ee2986c9b1b sendmail-8.13.1.ebuild 5852
+MD5 70881845624fd16b80936c0aeb0b2bc8 ChangeLog 9248
 MD5 07aa1897fda73805b9d68a2b82090e5f metadata.xml 218
-MD5 61d4e49cceb149f6ff46cf6a1b598b88 files/mailer.conf 1306
-MD5 7b2a2b2f8f608ddbd8b0c1b910ffb981 files/sendmail-delivered_hdr.patch 341
+MD5 9cf5b1a30908c5f96f258b835f430865 files/sendmail.cf 39312
+MD5 1a9fedeb2f17b9a7de4f0f8da6c06d63 files/sendmail.mc 299
+MD5 edb5fd06df2d238778a89dd5265dd9e5 files/site.config.m4 481
 MD5 cf0c79a7387b7d83db30abc68269f467 files/digest-sendmail-8.12.11-r3 69
-MD5 b412547381b852586d5d4d6ffcd80b4a files/sendmail-8.12.2-unix.patch 395
-MD5 34585ddfef902dacb4e02e6eeace6dec files/sendmail 596
-MD5 875d3c33bfa16e73e5e75ecb1d1a9d2b files/sendmail-procmail.cf 39897
 MD5 d7d99c72954d524b1d0eafbfe0e77afc files/sendmail-8.12.2-makemapman.patch 2088
-MD5 4b37f61de2fd8de372a4bd8ab6f92edf files/sendmail-8.12.2-smrsh-paths.patch 5625
-MD5 0027be040b9dacdf253813fe2ddb8982 files/digest-sendmail-8.13.1-r1 68
+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 45c504b2c249bc5724f0029328d56b78 files/digest-sendmail-8.13.3 68
+MD5 875d3c33bfa16e73e5e75ecb1d1a9d2b files/sendmail-procmail.cf 39897
 MD5 40db5be0dc4aad98df023d3af8e8c132 files/sendmail-procmail.mc 357
-MD5 95d58f15432e44c91f8018839f65327c files/sendmail-8.12.6-r1-gentoo.diff 1701
-MD5 1a9fedeb2f17b9a7de4f0f8da6c06d63 files/sendmail.mc 299
-MD5 9cf5b1a30908c5f96f258b835f430865 files/sendmail.cf 39312
-MD5 edb5fd06df2d238778a89dd5265dd9e5 files/site.config.m4 481
+MD5 34585ddfef902dacb4e02e6eeace6dec files/sendmail 596
+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.3 b/mail-mta/sendmail/files/digest-sendmail-8.13.3
new file mode 100644
index 000000000000..58795fed825f
--- /dev/null
+++ b/mail-mta/sendmail/files/digest-sendmail-8.13.3
@@ -0,0 +1 @@
+MD5 2809fbf9c8b067947b650d0128928d05 sendmail.8.13.3.tar.gz 1969226
diff --git a/mail-mta/sendmail/sendmail-8.12.11-r3.ebuild b/mail-mta/sendmail/sendmail-8.12.11-r3.ebuild
index d03d5a3a3644..7c582a243ca3 100644
--- a/mail-mta/sendmail/sendmail-8.12.11-r3.ebuild
+++ b/mail-mta/sendmail/sendmail-8.12.11-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.12.11-r3.ebuild,v 1.12 2004/07/21 20:53:23 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.12.11-r3.ebuild,v 1.13 2005/02/12 14:37:37 g2boojum Exp $
 
 DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
 HOMEPAGE="http://www.sendmail.org/"
diff --git a/mail-mta/sendmail/sendmail-8.13.1-r1.ebuild b/mail-mta/sendmail/sendmail-8.13.1-r1.ebuild
index 3b5d696b9780..3f68a9699f75 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-2004 Gentoo Foundation
+# 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.1 2004/12/07 01:59:31 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.1-r1.ebuild,v 1.2 2005/02/12 14:37:37 g2boojum Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~s390 ~amd64 ~ppc64"
 IUSE="ssl ldap sasl tcpd mbox milter mailwrapper ipv6"
 
 DEPEND="net-mail/mailbase
diff --git a/mail-mta/sendmail/sendmail-8.13.1.ebuild b/mail-mta/sendmail/sendmail-8.13.1.ebuild
index 70fa78a61b6c..10dc55ed7ce1 100644
--- a/mail-mta/sendmail/sendmail-8.13.1.ebuild
+++ b/mail-mta/sendmail/sendmail-8.13.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.ebuild,v 1.1 2004/09/19 18:14:04 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.1.ebuild,v 1.2 2005/02/12 14:37:37 g2boojum Exp $
 
 DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
 HOMEPAGE="http://www.sendmail.org/"
diff --git a/mail-mta/sendmail/sendmail-8.13.3.ebuild b/mail-mta/sendmail/sendmail-8.13.3.ebuild
new file mode 100644
index 000000000000..beed08af7132
--- /dev/null
+++ b/mail-mta/sendmail/sendmail-8.13.3.ebuild
@@ -0,0 +1,191 @@
+# 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.1 2005/02/12 14:37:37 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
+}