Massive updates thanks to lcars

5 files changed, 176 insertions, 7 deletions

diff --git a/net-mail/sendmail/ChangeLog b/net-mail/sendmail/ChangeLog
index 45d6ec6120ca..2006a6964b89 100644
--- a/net-mail/sendmail/ChangeLog
+++ b/net-mail/sendmail/ChangeLog
@@ -1,12 +1,16 @@
 # ChangeLog for net-mail/sendmail
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/ChangeLog,v 1.39 2004/03/24 17:33:52 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/ChangeLog,v 1.40 2004/04/22 00:47:37 g2boojum Exp $
+
+  21 Apr 2004; Grant Goodyear <g2boojum@gentoo.org>
+  sendmail-8.12.11-r2.ebuild, files/site.config.m4:
+  New version thanks to lcars!
 
 *sendmail-8.12.11-r1 (24 Mar 2004)
 
-  24 Mar 2004; Grant Goodyear <g2boojum@hotmail.com>
+  24 Mar 2004; Grant Goodyear <g2boojum@gentoo.org>
   sendmail-8.12.11-r1.ebuild, files/mailer.conf:
-  New revision that adds mailwrapper support
+  New revision that adds mailwrapper support 
 
   19 Mar 2004; Aron Griffis <agriffis@gentoo.org> sendmail-8.12.10.ebuild,
   sendmail-8.12.11.ebuild:
diff --git a/net-mail/sendmail/Manifest b/net-mail/sendmail/Manifest
index 8b8b1eaa014a..8a7907cdbf76 100644
--- a/net-mail/sendmail/Manifest
+++ b/net-mail/sendmail/Manifest
@@ -1,14 +1,16 @@
 MD5 bde4378ef82c234b36af06da9cf22aa9 sendmail-8.12.11-r1.ebuild 5481
 MD5 a358bb35f98aa2d7ba3712daedd08621 sendmail-8.12.11.ebuild 5446
 MD5 7be45ed7ccd3bcede41ca6ca58ae025d sendmail-8.12.10.ebuild 5458
-MD5 4973847ca25cfe8b7ec7cd3a402a9c70 ChangeLog 6338
+MD5 29458d59619dc92e995686490bb8095e ChangeLog 6474
 MD5 07aa1897fda73805b9d68a2b82090e5f metadata.xml 218
+MD5 b1ea1741d7fbba1ce15a7f0f891a6c95 sendmail-8.12.11-r2.ebuild 5449
 MD5 5476fde164f12162d60ed3cffb0a41e3 files/sendmail.cf 39325
 MD5 57c515d75ee6bcb32fc673141ebc41fa files/sendmail.mc 930
-MD5 b908d7f9fe5b925927e6603fad156dfc files/site.config.m4 590
+MD5 bae92533adb7471b10497848f1d32bd9 files/site.config.m4 543
 MD5 d80daec431bd383e452e69f1f82dbff5 files/digest-sendmail-8.12.10 69
 MD5 cf0c79a7387b7d83db30abc68269f467 files/digest-sendmail-8.12.11 69
 MD5 cf0c79a7387b7d83db30abc68269f467 files/digest-sendmail-8.12.11-r1 69
+MD5 cf0c79a7387b7d83db30abc68269f467 files/digest-sendmail-8.12.11-r2 69
 MD5 074c1f0534fd3bf4e541a70e001bc533 files/sendmail-8.12.2-makemapman.patch 2089
 MD5 b412547381b852586d5d4d6ffcd80b4a files/sendmail-8.12.2-unix.patch 395
 MD5 95d58f15432e44c91f8018839f65327c files/sendmail-8.12.6-r1-gentoo.diff 1701
diff --git a/net-mail/sendmail/files/digest-sendmail-8.12.11-r2 b/net-mail/sendmail/files/digest-sendmail-8.12.11-r2
new file mode 100644
index 000000000000..a08afe72d5e8
--- /dev/null
+++ b/net-mail/sendmail/files/digest-sendmail-8.12.11-r2
@@ -0,0 +1 @@
+MD5 fafda7f8043f0c34b9aa295618aa598c sendmail.8.12.11.tar.gz 1899112
diff --git a/net-mail/sendmail/files/site.config.m4 b/net-mail/sendmail/files/site.config.m4
index e4402ba8fb96..f95857391f1c 100644
--- a/net-mail/sendmail/files/site.config.m4
+++ b/net-mail/sendmail/files/site.config.m4
@@ -13,5 +13,3 @@ define(`confMAN8SRC', `8')
 define(`confLDOPTS_SO', `-shared -Wl')
 APPENDDEF(`conf_sendmail_ENVDEF', `@@conf_sendmail_ENVDEF@@')
 APPENDDEF(`conf_sendmail_LIBS', `@@conf_sendmail_LIBS@@')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DMILTER')
-
diff --git a/net-mail/sendmail/sendmail-8.12.11-r2.ebuild b/net-mail/sendmail/sendmail-8.12.11-r2.ebuild
new file mode 100644
index 000000000000..4f21e8b79468
--- /dev/null
+++ b/net-mail/sendmail/sendmail-8.12.11-r2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/sendmail-8.12.11-r2.ebuild,v 1.1 2004/04/22 00:47:37 g2boojum Exp $
+
+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"
+IUSE="ssl ldap sasl tcpd mbox milter"
+
+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
+	"
+RDEPEND="${DEPEND}
+		>=net-mail/mailbase-0.00
+		net-mail/mailwrapper"
+PDEPEND="!mbox? ( net-mail/procmail )"
+PROVIDE="virtual/mta"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	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_ENVDEF="${conf_sendmail_ENVDEF} -DSASL=2"  \
+		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
+	use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
+		&& confLIBS="${confLIBS} -lwrap"
+	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS" \
+		&& confLIBS="${confLIBS} -lssl -lcrypto" \
+		&& conf_sendmail_ENVDEF="${conf_sendmail_ENVDEF} -DSTARTTLS" \
+		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
+	use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
+		&& confLIBS="${confLIBS} -lldap -llber"
+	use milter && confENVDEF="${confENVDEF} -DMILTER"
+	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
+		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
+		-e "s/@@confENVDEF@@/${confENVDEF}/" \
+		-e "s/@@confLIBS@@/${confLIBS}/" \
+		-e "s/@@conf_sendmail_ENVDEF@@/${conf_sendmail_ENVDEF}/" \
+		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
+		${FILESDIR}/site.config.m4 > ${S}/devtools/Site/site.config.m4
+}
+
+src_compile() {
+	sh Build
+
+	if [ -n "` use milter `" ]
+	then
+	    pushd libmilter
+		sh Build
+		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 [ -n "` 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
+
+	mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.sendmail
+	fowners root:smmsp /usr/sbin/sendmail.sendmail
+	fowners smmsp:smmsp /var/spool/clientmqueue
+	fperms 2555 /usr/sbin/sendmail.sendmail
+	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 [ -n "` 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 [ -n "` use mbox `" ]
+	then
+		doins ${FILESDIR}/{sendmail.cf,sendmail.mc}
+	else
+		newins ${FILESDIR}/sendmail-procmail.cf sendmail.cf
+		newins ${FILESDIR}/sendmail-procmail.mc sendmail.mc
+	fi
+	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
+	dosed 's/} sendmail/} sendmail.sendmail/' /etc/init.d/sendmail
+	keepdir /usr/adm/sm.bin
+}