Install helper programs - bug #348621. Read multiple crls - bug #354611. Install /etc/sasl2/Sendmail.conf - bug #144060

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 245 insertions, 6 deletions

diff --git a/mail-mta/sendmail/ChangeLog b/mail-mta/sendmail/ChangeLog
index 1470f2634097..39bb9ea2cd2b 100644
--- a/mail-mta/sendmail/ChangeLog
+++ b/mail-mta/sendmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-mta/sendmail
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.99 2012/06/04 21:12:20 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.100 2012/06/14 18:21:12 eras Exp $
+
+*sendmail-8.14.5-r2 (14 Jun 2012)
+
+  14 Jun 2012; Eray Aslan <eras@gentoo.org> +sendmail-8.14.5-r2.ebuild,
+  +files/sendmail-starttls-multi-crl.patch:
+  Install helper programs - bug #348621. Read multiple crls - bug #354611.
+  Install /etc/sasl2/Sendmail.conf - bug #144060
 
   04 Jun 2012; Zac Medico <zmedico@gentoo.org> sendmail-8.14.4.ebuild,
   sendmail-8.14.5-r1.ebuild, sendmail-8.14.5.ebuild:
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 0535f9ac5287..6b61b2e759ca 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libmilter-sharedlib.patch 2843 RMD160 fc25843bb7d9dd0f7ebddb87fd9e80839438b277 SHA1 ab100120cb86fe362cbd9fefefde8e54c3716bad SHA256 3a753b0881fe622814b471ee5f9037905c7cc3ed08ef74908464ab5307e59d5a
 AUX mailer.conf 1306 RMD160 7f752b3b88208eda71f96de6621e050a684b8fdb SHA1 a2704751d866367f969554841af8f637766db528 SHA256 f07e22401ff9fae449bfb093dfc608b6f8e71af1c7c3790d89a71af9a1411a44
@@ -9,19 +9,31 @@ AUX sendmail-8.14.5+db-5.0.patch 432 RMD160 8d93900ed4638f17f268666af0894baa7358
 AUX sendmail-build-system.patch 13019 RMD160 06819e163471c90f336162e9a6fbf11ecf3f1ea1 SHA1 d2b8ac723a63854fb4149111e5c8ead01bf65328 SHA256 90c8c20517dc253839094c439c23f42ee0472a1094635b6ab1ef12a223ddb50b
 AUX sendmail-delivered_hdr.patch 341 RMD160 a190574a57c643233c0d23e8b69dbf3cd3943f41 SHA1 17d034625524438dc98a2a7a14a7bfe2fb047420 SHA256 bfe354d1047c66ea857e56cb374f583eb779c8f4ccc92ea766e916ec358cd77c
 AUX sendmail-procmail.mc 357 RMD160 e912a3d2f91fc60e0856e1a537b9a9851788172f SHA1 536e5b842ef280f2abd86ee0f8f5987a885350b7 SHA256 8da4cc39758ff1668d7bf7c3713914cb44ef8d084ab822629316ee3caae90856
+AUX sendmail-starttls-multi-crl.patch 643 RMD160 e055be6e4be787bd543900528243f1805610e7b3 SHA1 3f2922e0007022b3a09918ed1706da1e8b62b0b5 SHA256 9cfbc3f9049c6380693854cd1f3af95ec24f02db7116939b808751acaed1f313
 AUX sendmail.mc 299 RMD160 cb659c515cc2b5de750b645fbcfb7a8a60ad60ae SHA1 c93483684c46356cd1d09899517539c5406b5bd0 SHA256 fbf4f2bf7826cabf2072f6c113b3616c1dffd580864d708e344b5f334f1a8a38
 AUX site.config.m4 564 RMD160 5e27f44c72947cdb4f00aaed618691db5a1c9489 SHA1 df71882eb8b19f7779ae349d07665849aa6c2781 SHA256 3a7d586f8dfc24f7ed53621c04374aeca91153ded80cf17411ce417a45aade44
 DIST sendmail.8.14.4.tar.gz 2080472 RMD160 d998062ee6b4e80eb90cc6e790f971bd02b52254 SHA1 ba192f9a5114437aaec952f503fa2f09ee6dbe57 SHA256 bc0109437c5018b3ea8999edb63506db2f3b31c4c1ab4367cb56236a7df97cb1
 DIST sendmail.8.14.5.tar.gz 2092508 RMD160 0961ed4d6bcda73908670c20c8de6c14cac4d0dd SHA1 86dd2a8ad5eac892cd02cf67792a25efccacc100 SHA256 fb65a86a0f87f12aefb933ee8990540f7a680a594f7fedfdd28918f3934bfb88
 EBUILD sendmail-8.14.4.ebuild 6595 RMD160 94164cb76aa698b45cdf57d1c330cd5abc06a0af SHA1 f66cb4dff33112f80d81b17a2a803b536ec8c3a3 SHA256 bfbb2f87e8b2b815f1c9cce8c53af11c8377316318fa2fb8b734f61ad089133f
 EBUILD sendmail-8.14.5-r1.ebuild 6660 RMD160 246ff7a9f666137928f04ded8b94d2631878404b SHA1 3cad8f8344de9b98930a6abe1051e9604721214e SHA256 33fb1058f501c5fb1628f118576f9621ec0062ddde3b403d52b594f7d850c28d
+EBUILD sendmail-8.14.5-r2.ebuild 6899 RMD160 477800d7c899e165c298585fb0ec7b40810ad6cd SHA1 4001f18036ff370ae57465f07bfa46ab7dde796a SHA256 34f90c1d6ae4ecd51326368312e0b14b92e49309f042617f067318aedee0cfe3
 EBUILD sendmail-8.14.5.ebuild 6610 RMD160 a3dbce893f5e35b468096fff90375a5f09ba836b SHA1 f1abb0666fa6097394bc7a7985b3c36328f60e85 SHA256 5e3ca7bf62b60af3bb61f99b5f6c276ee347388e158385e3e5eb567925516fe6
-MISC ChangeLog 21642 RMD160 e6a8acca68936d824999a237b4f7dfe6942a2189 SHA1 d48261cf23d627da56540384c65e5e727efc9b7b SHA256 f26a69f33576d7005c0884b4f6e7971c43d6a1d4144e038606e17612fd4713db
+MISC ChangeLog 21916 RMD160 c3e52741868f9c1155cdcaf62bfcc9c1f7bedbe4 SHA1 e3d117b57d492e4364c68f211b47a811f7897234 SHA256 e151a2123e7f147c4d383b395905a902ab536e3d37164cd3d4d1bc5c22cfa247
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/NJLoACgkQ/ejvha5XGaMD6QCg7heaXlFnKEKzE/99DFGN8dst
-W5QAn3hfI0vQ4/aRI4xOFnvWWayDhUwi
-=FP4q
+iQIcBAEBCAAGBQJP2iunAAoJEHfx8XVYajsfd9wQAID/20dQA4SY0h9BRH5ALpaX
++nKIK7m6OARmc0OPXBcBCpkWIgyDOZVlviZhd+MEjy8i1bTJc+ty9LX/nMU3wVts
+BEKiSXGyPL3rIt0kpnNnj0rQtZxnHgWxhKO/0fZ0t4U1fGWJAYl191eLITTmZ5hQ
+3rn0ZzfqCJT9tBlpWRusUm5NeX1SuTSeFeDKcvpfRftrfSacfNdfD1FzlsegdoQs
+MRFza/RCuLH514qf05+muI6pxFQIORqqb3cUS/sbnr48W34oSKCXrl9seJ3ZAPuW
+IMzUq2gqfmH30qJ4z28GUtP/LREgbShyXYkdmtXk7tou/c5z5HiR7mCqj4c82h6s
+CFklHFbVTZia/jmQdEmhi6FNbZH6Bp8iiBffRUugxfgzUK2iFAA85mI/z26K8Kun
+OS1ARG2RI7CBRnsZB/YjKPl2w0SkVNFlIFeLgpj9C9AxAZL8FEOORaBtmwgbD5Pj
+//Uq6LaH5bLw08j009ay+gYVxkz+3BxCkYdjDqOs/Co7Yv5evkPKwn3Cv44b53Qn
+WWPnPw0ugoHvrqsmwlzpqMM2C/2Jax03K6Bf2+Fp/YwZj6lEIA7MJdfXbXTenBvP
+RzTz/MiYfPqw28VkGZVxPfZYeBJzX3zAgSvc4NQJbat3bb/MKjzbnm8Hwjtn47ZU
+2wFUErYnODwXxUq/LH+e
+=XZKe
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/sendmail/files/sendmail-starttls-multi-crl.patch b/mail-mta/sendmail/files/sendmail-starttls-multi-crl.patch
new file mode 100644
index 000000000000..8d93817d07da
--- /dev/null
+++ b/mail-mta/sendmail/files/sendmail-starttls-multi-crl.patch
@@ -0,0 +1,20 @@
+Bug #354611
+--- sendmail/tls.c.orig	2010-05-26 21:54:30.000000000 -0600
++++ sendmail/tls.c	2010-05-26 21:54:36.000000000 -0600
+@@ -723,11 +723,12 @@
+ 		{
+			if (BIO_read_filename(crl_file, CRLFile) >= 0)
+			{
+-				crl = PEM_read_bio_X509_CRL(crl_file, NULL,
+-							NULL, NULL);
++				while((crl = PEM_read_bio_X509_CRL(crl_file, NULL, NULL, NULL)))
++				{
++					X509_STORE_add_crl(store, crl);
++					X509_CRL_free(crl);
++				}
+ 				BIO_free(crl_file);
+-				X509_STORE_add_crl(store, crl);
+-				X509_CRL_free(crl);
+ 				X509_STORE_set_flags(store,
+					X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL);
+				X509_STORE_set_verify_cb_func(store,
diff --git a/mail-mta/sendmail/sendmail-8.14.5-r2.ebuild b/mail-mta/sendmail/sendmail-8.14.5-r2.ebuild
new file mode 100644
index 000000000000..776e53fd691f
--- /dev/null
+++ b/mail-mta/sendmail/sendmail-8.14.5-r2.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.5-r2.ebuild,v 1.1 2012/06/14 18:21:12 eras Exp $
+
+EAPI="4"
+inherit eutils multilib toolchain-funcs user
+
+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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ssl ldap sasl tcpd mbox ipv6 nis sockets"
+
+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
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/nbsmtp
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]"
+
+PDEPEND="!mbox? ( mail-filter/procmail )"
+
+# libmilter library is part of sendmail, but it does not share the version number with it.
+# In order to find the right libmilter version number, check SMFI_VERSION definition
+# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
+# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001.
+LIBMILTER_VER=1.0.2
+
+pkg_setup() {
+	enewgroup smmsp 209
+	enewuser smmsp 209 -1 /var/spool/mqueue smmsp
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/sendmail-build-system.patch
+	epatch "${FILESDIR}"/sendmail-delivered_hdr.patch
+	epatch "${FILESDIR}"/libmilter-sharedlib.patch
+	epatch "${FILESDIR}"/"${P}"+db-5.0.patch
+	epatch "${FILESDIR}"/sendmail-starttls-multi-crl.patch
+
+	local confCC="$(tc-getCC)"
+	local confCCOPTS="${CFLAGS}"
+	local confLDOPTS="${LDFLAGS}"
+	local confMAPDEF="-DMAP_REGEX"
+	local 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" \
+		&& confENVDEF="${confENVDEF} -D_FFR_TLS_1" \
+		&& 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"
+	use nis && confENVDEF="${confENVDEF} -DNIS"
+	use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP"
+	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
+		-e "s/@@confLDOPTS@@/${confLDOPTS}/" \
+		-e "s/@@confCC@@/${confCC}/" \
+		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
+		-e "s/@@confENVDEF@@/${confENVDEF}/" \
+		-e "s/@@confLIBS@@/${confLIBS}/" \
+		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
+		"${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4
+}
+
+src_compile() {
+	sh Build || die "compilation failed in main Build script"
+	pushd libmilter
+	sh Build MILTER_SOVER=${LIBMILTER_VER} || die "libmilter compilation failed"
+	popd
+}
+
+src_install () {
+	local MY_LIBDIR=/usr/$(get_libdir)
+	local MY_OBJDIR="obj.`uname -s`.`uname -r`.`uname -m`"
+	dodir /usr/bin ${MY_LIBDIR} /usr/include/libmilter
+	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}" LIBDIR="${MY_LIBDIR}" 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 "${MY_OBJDIR}/${dir}" \
+			|| die "install failed"
+	done
+	for dir in rmail mail.local
+	do
+		make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" 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 "${MY_OBJDIR}/${dir}" \
+			|| die "install failed"
+	done
+
+	make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" 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 \
+		MILTER_SOVER=${LIBMILTER_VER} \
+		install -C "${MY_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 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
+
+	docinto contrib
+	dodoc contrib/*
+
+	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
+	if use sasl; then
+		dodir /etc/sasl2
+		cat <<- EOF > "${D}"/etc/sasl2/Sendmail.conf
+		pwcheck_method: saslauthd
+		mech_list: PLAIN LOGIN
+
+		EOF
+	fi
+
+	doinitd "${FILESDIR}"/sendmail
+	keepdir /usr/adm/sm.bin
+}