Add CipherList option - bug #381139

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

3 files changed, 212 insertions, 15 deletions

diff --git a/mail-mta/sendmail/ChangeLog b/mail-mta/sendmail/ChangeLog
index 3f602ee93e56..5e1c77e1fc9b 100644
--- a/mail-mta/sendmail/ChangeLog
+++ b/mail-mta/sendmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/sendmail
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.96 2011/05/17 17:59:20 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.97 2011/09/08 06:41:38 eras Exp $
+
+*sendmail-8.14.5-r1 (08 Sep 2011)
+
+  08 Sep 2011; Eray Aslan <eras@gentoo.org> +sendmail-8.14.5-r1.ebuild:
+  Add CipherList option - bug #381139
 
 *sendmail-8.14.5 (17 May 2011)
 
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 2d9affffad4b..b7dbd59fdf2d 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -14,23 +14,24 @@ AUX site.config.m4 564 RMD160 5e27f44c72947cdb4f00aaed618691db5a1c9489 SHA1 df71
 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 6775 RMD160 a5fd3706f80f6f77977cb5cee4b4a371e88be849 SHA1 e1c8e4d42636be83a14f4de7c9130b735ae05467 SHA256 8a5f73f0ef6554c02776a61111117fce3a5913e05e579e62cc9ae05cbe5d9212
+EBUILD sendmail-8.14.5-r1.ebuild 6836 RMD160 00669f5068b48d7c7529b2a1adaf8ae62453cf1f SHA1 754eca823b508fc55fce9e2eb628e2bcc4dacbd7 SHA256 2a4721bcff653e411de10b084a0b505025ad7424336b48162252fc273fcba7c8
 EBUILD sendmail-8.14.5.ebuild 6786 RMD160 6e5db7de5db5ef1a5659717bdf1b498e054ec009 SHA1 25b954b2e4e66e645079999e9ee9856bb5822a29 SHA256 c24e1b4bbdb77ed49f108712ff5678ba80faaba40cd3428a5b82d6bcc010ed96
-MISC ChangeLog 21067 RMD160 7785cef416f76a35cf4e7df6538026311385c73a SHA1 627b412064a8f090ed640005eb01034e065ea05a SHA256 4b8d5deccdb3a8ae32ea5c97f9bd1fc541d3cd1f9081ed2ff13c43754f3c84d4
+MISC ChangeLog 21213 RMD160 53ae9868c24a6bc8ce09351634ce3dd8cf73f0c7 SHA1 1b6412a2276bc7e4a912a39fafdb6be9783e1bf5 SHA256 b3fc334d251a8f6b2578b92cb2521e77572d9f3b4f2292f556185e323bfb19b4
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN0reIAAoJEHfx8XVYajsf0esQAJ9Spkxw8mfNyrEHu1eR+0Vp
-oBuiv4lzMscLLL9ZD3DVc6P5RtMTaoRaOJ9RYV4Oefl2SXPS7Z/2yFxaoyBLxEWs
-g7Hq4zjKjJN18AftgxnZG/FvWYgSLE10kdgw4aJLgO4GNY4sZFDCGB9i5rcQdBDi
-oAbihF3Sz3xEAzoZPu11iPCBxZmESZjRorJwDJJHhgnTX6SfgsnzPoupSkEconEV
-ZSzcuwcNc4sy+gEoif0/LCYkhkvzXRXNqE3qXeGszvjowg6fqpkJz5mJu92xXAO+
-GYFkWhc92wJCtt6papDamlo3c5LeoxqHAyCUM5bSs70UaKzBpF7aBV835ZeoDz+r
-79m8EIC8SDT41Ro6h2fyM8dU8HFFOv1xEZWz1BELlnMH6xDG/6F2a0O+9gduyFbI
-2dWnHcF5kCBRExBBSdpHBFfdmXIFyqz8JLszjR+LdJoBzqvfboPgopH+qN2wyP1g
-G4ShdhfPHy7hh1nFJOh613iK215xJ226nyahPwtHKO7Kkv5/zN5I7s9SoaQGf5EF
-OAiNLOzLZ49OtXOJalVPHo++vPOCwuteRZeKqxmak+EM+4QS6KWpaltfDGWf6leh
-nV6nMGzD7gp2a8rHryDACST86V5bg9gHVbPYDxst75HmaqVt1IwPO2Q2HkGC/1we
-1tlwGrxitCFZKy8OmFcQ
-=lrd0
+iQIcBAEBCAAGBQJOaGOxAAoJEHfx8XVYajsfw7kQAI8hRV4ef4uI2amgXfXW6QA+
+U0I+LnbVXdxyA4cA6fMnDAL3n/b6U5M3aWeVAGjAsCxLf2yZrzpN0Sr3+SEbyCCy
+ipcROYfJAJgje8uCqf+sWMVMlljPJn7ttuKhCNq8zTMmCJ/7ETV8EP+HOUYQQAq0
+kxhzyfSLEB0RVIp3D1G3XgqorBnvoqBn/ny85utpBNFJ9uEGUYl7F7nD0dACYppz
+5sObmADPIOnoTLvDN76nIbUbV22Rqc483OC+R/jnUfVuF5BkllnNU8KUmv7/+z90
+83eaXciNK0lolzRCBkeaYgqiWkRp1he5UCGXrv3g8cO+eTuzuCkGMOVT+zaj5jIT
+BzNr7Bpkoqi0CGw7gPNaIjj8GGcYdgk/6Zlbs226ai1MRldHGKFD2k5G5IgmhdzI
+DG1luFzNJUlY7ivx8S98nq4JkO81Kexjv8PMl1vJ3jtvTChLk8vanOTcmEN2J18U
+6VpoT+ixQ71sOpMe8U09UOBVEGk9tr4CwPf3Q3R52dTLPHUatwlWHOWfG41amy/w
+sQG2s4cyV1djGkZbiReJISLDHDqDC4zcue8MQMFlXJADIDp5LYwz4ieInxh1/esd
+fp3B/VjCHxCClvochBDqpEsFMg/gwxoQga6IlwFHdvCxb+1l5oUoXscSbo5k2lUl
+VMLu8v9mEx1eUWGTBA9s
+=OdWh
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/sendmail/sendmail-8.14.5-r1.ebuild b/mail-mta/sendmail/sendmail-8.14.5-r1.ebuild
new file mode 100644
index 000000000000..8e561f741291
--- /dev/null
+++ b/mail-mta/sendmail/sendmail-8.14.5-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/09/08 06:41:38 eras Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+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() {
+	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"
+}
+
+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
+
+	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
+	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
+	doinitd "${FILESDIR}"/sendmail
+	keepdir /usr/adm/sm.bin
+
+}