mailwrapper USE flag fixes

7 files changed, 226 insertions, 24 deletions

diff --git a/mail-mta/sendmail/ChangeLog b/mail-mta/sendmail/ChangeLog
index f799c8a2a0b8..123858c36dc8 100644
--- a/mail-mta/sendmail/ChangeLog
+++ b/mail-mta/sendmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/sendmail
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.1 2004/05/30 09:20:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.2 2004/05/30 21:13:45 g2boojum Exp $
+
+*sendmail-8.12.11-r3 (30 May 2004)
+
+  30 May 2004; Grant Goodyear <g2boojum@gentoo.org> files/mailer.conf,
+  sendmail-8.12.11-r1.ebuild, sendmail-8.12.11-r2.ebuild,
+  +sendmail-8.12.11-r3.ebuild:
+  Changes so that mailwrapper can be optional (w/ a "mailwrapper" USE flag).
 
 *sendmail-8.12.11-r2 (30 May 2004)
 
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 4a8b8a4ef598..e63213f9cd9d 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -1,21 +1,24 @@
-MD5 3af9618801cc2a40c05bf7fe7d32dd55 ChangeLog 6607
+MD5 505c389e2f23322075d98facdaab4f52 sendmail-8.12.11-r1.ebuild 5485
+MD5 e86704a6965326f8aaa3775eed3cc2c4 sendmail-8.12.11.ebuild 5445
+MD5 3e8cf8842b2d2febb98b43eb603e3357 sendmail-8.12.11-r3.ebuild 5813
+MD5 f17fe73fdeae8e3e2c6f6473c3e864eb sendmail-8.12.10.ebuild 5457
+MD5 5223c95d447269f5900a3b4a95e89b04 .sendmail-8.12.11-r3.ebuild.swp 20480
+MD5 52aa71f987c0b2a89876bfe3dfcb5c4c ChangeLog 7189
 MD5 07aa1897fda73805b9d68a2b82090e5f metadata.xml 218
-MD5 7be45ed7ccd3bcede41ca6ca58ae025d sendmail-8.12.10.ebuild 5458
-MD5 bde4378ef82c234b36af06da9cf22aa9 sendmail-8.12.11-r1.ebuild 5481
-MD5 a358bb35f98aa2d7ba3712daedd08621 sendmail-8.12.11.ebuild 5446
-MD5 a7db919664170ceeffbdc766bfc30024 sendmail-8.12.11-r2.ebuild 5451
+MD5 7f8eea0beabc3ba84d29065848030219 sendmail-8.12.11-r2.ebuild 5503
+MD5 9cf5b1a30908c5f96f258b835f430865 files/sendmail.cf 39312
+MD5 a029154f3bd93696277b71733be6fa11 files/sendmail.mc 929
+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 bddac02de95e12dcef98e718ddb5151b files/mailer.conf 999
-MD5 66e8128c1f0dd987c0a78f1ca61ec79d files/sendmail 606
-MD5 074c1f0534fd3bf4e541a70e001bc533 files/sendmail-8.12.2-makemapman.patch 2089
-MD5 4b37f61de2fd8de372a4bd8ab6f92edf files/sendmail-8.12.2-smrsh-paths.patch 5625
+MD5 cf0c79a7387b7d83db30abc68269f467 files/digest-sendmail-8.12.11-r2 69
+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 6faca1941f582ad8a893b0e4fa4dd757 files/sendmail-procmail.cf 39867
-MD5 03494c29693bd3ceb921bbc398be4cda files/sendmail-procmail.mc 985
-MD5 5476fde164f12162d60ed3cffb0a41e3 files/sendmail.cf 39325
-MD5 57c515d75ee6bcb32fc673141ebc41fa files/sendmail.mc 930
-MD5 bae92533adb7471b10497848f1d32bd9 files/site.config.m4 543
-MD5 cf0c79a7387b7d83db30abc68269f467 files/digest-sendmail-8.12.11-r2 69
+MD5 875d3c33bfa16e73e5e75ecb1d1a9d2b files/sendmail-procmail.cf 39897
+MD5 247288da5ccc5b2836791dfffac7fc08 files/sendmail-procmail.mc 987
+MD5 307c5cb0f5eff2b1a4612d3e43d0f5f0 files/sendmail 606
+MD5 eb656382be3d2bb0805b17472a2ddb6d files/mailer.conf 1307
+MD5 4b37f61de2fd8de372a4bd8ab6f92edf files/sendmail-8.12.2-smrsh-paths.patch 5625
diff --git a/mail-mta/sendmail/files/digest-sendmail-8.12.11-r3 b/mail-mta/sendmail/files/digest-sendmail-8.12.11-r3
new file mode 100644
index 000000000000..a08afe72d5e8
--- /dev/null
+++ b/mail-mta/sendmail/files/digest-sendmail-8.12.11-r3
@@ -0,0 +1 @@
+MD5 fafda7f8043f0c34b9aa295618aa598c sendmail.8.12.11.tar.gz 1899112
diff --git a/mail-mta/sendmail/files/mailer.conf b/mail-mta/sendmail/files/mailer.conf
index c269540d914c..90a364d338ae 100644
--- a/mail-mta/sendmail/files/mailer.conf
+++ b/mail-mta/sendmail/files/mailer.conf
@@ -1,5 +1,6 @@
-#	$OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
-#
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/files/mailer.conf,v 1.2 2004/05/30 21:13:45 g2boojum Exp $
+# $OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
+
 # Execute the "real" sendmail program, named /usr/sbin/sendmail
 #
 sendmail	/usr/sbin/sendmail.sendmail
@@ -8,7 +9,7 @@ mailq		/usr/sbin/sendmail.sendmail
 newaliases	/usr/sbin/sendmail.sendmail
 hoststat	/usr/sbin/sendmail.sendmail
 purgestat	/usr/sbin/sendmail.sendmail
-#
+
 # Execute the "real" sendmail program from exim, 
 # named /usr/sbin/exim
 #
@@ -19,7 +20,12 @@ purgestat	/usr/sbin/sendmail.sendmail
 #rsmtp		/usr/sbin/exim
 #rmail		/usr/sbin/exim
 #mail		/usr/sbin/exim
-#
+
+# Execute the "real" sendmail program from nullmailer
+# named /usr/sbin/sendmail.nullmailer
+#sendmail	/usr/sbin/sendmail.nullmailer
+#mailq		/usr/bin/mailq.nullmailer
+
 # Execute the "real" sendmail program from postfix, 
 # named /usr/sbin/sendmail.postfix
 #
@@ -32,5 +38,7 @@ purgestat	/usr/sbin/sendmail.sendmail
 # named /usr/sbin/ssmtp
 #
 #sendmail	/usr/sbin/ssmtp
+#send-mail	/usr/sbin/ssmtp
 #mailq		/usr/sbin/ssmtp
 #newaliases	/usr/sbin/ssmtp
+
diff --git a/mail-mta/sendmail/sendmail-8.12.11-r1.ebuild b/mail-mta/sendmail/sendmail-8.12.11-r1.ebuild
index 3808ba72c302..465b9ad5abac 100644
--- a/mail-mta/sendmail/sendmail-8.12.11-r1.ebuild
+++ b/mail-mta/sendmail/sendmail-8.12.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.12.11-r1.ebuild,v 1.1 2004/05/30 09:20:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.12.11-r1.ebuild,v 1.2 2004/05/30 21:13:45 g2boojum Exp $
 
 DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
 HOMEPAGE="http://www.sendmail.org/"
@@ -26,7 +26,7 @@ DEPEND="net-dns/hesiod
 	)"
 RDEPEND="${DEPEND}
 		>=net-mail/mailbase-0.00
-		net-mail/mailwrapper"
+		=net-mail/mailwrapper-0.1"
 PDEPEND="!mbox? ( net-mail/procmail )"
 PROVIDE="virtual/mta"
 
diff --git a/mail-mta/sendmail/sendmail-8.12.11-r2.ebuild b/mail-mta/sendmail/sendmail-8.12.11-r2.ebuild
index ee788fdebec2..bb7f78863dee 100644
--- a/mail-mta/sendmail/sendmail-8.12.11-r2.ebuild
+++ b/mail-mta/sendmail/sendmail-8.12.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.12.11-r2.ebuild,v 1.1 2004/05/30 09:20:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.12.11-r2.ebuild,v 1.2 2004/05/30 21:13:45 g2boojum Exp $
 
 DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
 HOMEPAGE="http://www.sendmail.org/"
@@ -21,7 +21,7 @@ DEPEND="net-mail/mailbase
 	"
 RDEPEND="${DEPEND}
 		>=net-mail/mailbase-0.00
-		net-mail/mailwrapper"
+		=net-mail/mailwrapper-0.1"
 PDEPEND="!mbox? ( net-mail/procmail )"
 PROVIDE="virtual/mta"
 
@@ -127,6 +127,8 @@ src_install () {
 	newdoc cf/README README.cf
 	newdoc cf/cf/README README.install-cf
 	cp -a cf/* ${D}/usr/share/sendmail-cf
+	insinto /etc
+	doins ${FILESDIR}/mailer.conf
 	insinto /etc/mail
 	if [ -n "` use mbox `" ]
 	then
diff --git a/mail-mta/sendmail/sendmail-8.12.11-r3.ebuild b/mail-mta/sendmail/sendmail-8.12.11-r3.ebuild
new file mode 100644
index 000000000000..6d3b1f62b80d
--- /dev/null
+++ b/mail-mta/sendmail/sendmail-8.12.11-r3.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/05/30 21:13:45 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 s390"
+IUSE="ssl ldap sasl tcpd mbox milter mailwrapper"
+
+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
+		mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
+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 || 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.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
+	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_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
+}