From 00b7732dd7804f6a1a60d0a99d3cb221bf8506a7 Mon Sep 17 00:00:00 2001 From: Grant Goodyear Date: Sat, 13 Jul 2002 21:59:36 +0000 Subject: sasl fixes, closes bug 4958 --- net-mail/sendmail/ChangeLog | 8 +- net-mail/sendmail/files/digest-sendmail-8.12.4-r4 | 1 - net-mail/sendmail/files/digest-sendmail-8.12.4-r5 | 1 + net-mail/sendmail/sendmail-8.12.4-r4.ebuild | 171 --------------------- net-mail/sendmail/sendmail-8.12.4-r5.ebuild | 172 ++++++++++++++++++++++ 5 files changed, 180 insertions(+), 173 deletions(-) delete mode 100644 net-mail/sendmail/files/digest-sendmail-8.12.4-r4 create mode 100644 net-mail/sendmail/files/digest-sendmail-8.12.4-r5 delete mode 100644 net-mail/sendmail/sendmail-8.12.4-r4.ebuild create mode 100644 net-mail/sendmail/sendmail-8.12.4-r5.ebuild (limited to 'net-mail') diff --git a/net-mail/sendmail/ChangeLog b/net-mail/sendmail/ChangeLog index 65556c489781..00290bdfdd36 100644 --- a/net-mail/sendmail/ChangeLog +++ b/net-mail/sendmail/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-mail/sendmail # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/ChangeLog,v 1.8 2002/07/12 21:57:42 g2boojum Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/ChangeLog,v 1.9 2002/07/13 21:59:36 g2boojum Exp $ + +*sendmail-8.12.4-r5 (13 Jul 2002) + + 13 Jul 2002; Grant Goodyear ChangeLog : + + sasl fixes; thanks to Jay 'Eraserhead' Felice *sendmail-8.12.4-r4 (12 Jul 2002) diff --git a/net-mail/sendmail/files/digest-sendmail-8.12.4-r4 b/net-mail/sendmail/files/digest-sendmail-8.12.4-r4 deleted file mode 100644 index ac023cc4008c..000000000000 --- a/net-mail/sendmail/files/digest-sendmail-8.12.4-r4 +++ /dev/null @@ -1 +0,0 @@ -MD5 74121c90862fecafb3db69dc144fc910 sendmail.8.12.4.tar.gz 1858934 diff --git a/net-mail/sendmail/files/digest-sendmail-8.12.4-r5 b/net-mail/sendmail/files/digest-sendmail-8.12.4-r5 new file mode 100644 index 000000000000..ac023cc4008c --- /dev/null +++ b/net-mail/sendmail/files/digest-sendmail-8.12.4-r5 @@ -0,0 +1 @@ +MD5 74121c90862fecafb3db69dc144fc910 sendmail.8.12.4.tar.gz 1858934 diff --git a/net-mail/sendmail/sendmail-8.12.4-r4.ebuild b/net-mail/sendmail/sendmail-8.12.4-r4.ebuild deleted file mode 100644 index 3031db3a53bb..000000000000 --- a/net-mail/sendmail/sendmail-8.12.4-r4.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2002 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.4-r4.ebuild,v 1.1 2002/07/12 21:57:42 g2boojum Exp $ - -DESCRIPTION="Widely-used Mail Transport Agent (MTA)." -HOMEPAGE="http://www.sendmail.org" -LICENSE="Sendmail" -SLOT="0" -KEYWORDS="x86" - -PROVIDE="virtual/mta" -DEPEND="net-dns/hesiod - net-mail/mailbase - sys-libs/gdbm - sys-devel/m4 - sasl? ( dev-libs/cyrus-sasl ) - tcpd? ( sys-apps/tcp-wrappers ) - ssl? ( dev-libs/openssl ) - ldap? ( net-nds/openldap )" - -# We need some db; pick gdbm if none in USE -if [ -n "`use gdbm`" ] -then - DEPEND="${DEPEND} - sys-libs/gdbm" -elif [ -n "`use berkdb`" ] -then - DEPEND="${DEPEND} - sys-libs/db-3.2" -else - DEPEND="${DEPEND} - sys-libs/gdbm" -fi - -RDEPEND="${DEPEND} - >=net-mail/mailbase-0.00 - !virtual/mta" - -SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz" - -S=${WORKDIR}/${P} - -pkg_preinst() { - if ! grep -q ^smmsp: /etc/group - then - groupadd smmsp || die "problem adding group smmsp" - fi - if ! grep -q ^smmsp: /etc/passwd - then - useradd -d /var/spool/mqueue -g smmsp -s /dev/null smmsp \ - || die "problem adding user smmsp" - fi -} - -src_unpack() { - unpack ${A} - for file in ${PN}-8.12.2-{makemapman,smrsh-paths,unix} - do - cat ${FILESDIR}/${file}.patch | patch -d ${S} -p1 || die "${file} patch failed" - done - - confCCOPTS="${CFLAGS}" - confMAPDEF="-DNEWDB -DMAP_REGEX" - confENVDEF="-DXDEBUG=0" - confLIBS="-lnsl -lcrypt" - conf_sendmail_ENVDEF="-DFALSE=0 -DTRUE=1" - conf_sendmail_LIBS="" - use sasl && confLIBS="${confLIBS} -lsasl" \ - && confENVDEF="${confENVDEF} -DSASL" \ - && conf_sendmail_ENVDEF="${conf_sendmail_ENVDEF} -DSASL" \ - && conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl" - 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 gdbm && confLIBS="${confLIBS} -lgdbm" - 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() { - for x in libmilter libsmutil sendmail mailstats rmail praliases smrsh makemap vacation mail.local - do - pushd ${x} - sh Build - popd - done -} - -src_install () { - OBJDIR="obj.`uname -s`.`uname -r`.`arch`" - dodir /etc/pam.d /usr/bin /usr/include/libmilter /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 libmilter libsmutil sendmail mailstats praliases smrsh makemap vacation - 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 - fowners root.smmsp /usr/sbin/sendmail - fowners root.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 - newdoc libmilter/README README.libmilter - newdoc cf/README README.cf - newdoc cf/cf/README README.install-cf - cp -a cf/* ${D}/usr/share/sendmail-cf - insinto /etc/mail - doins ${FILESDIR}/{sendmail.cf,sendmail.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. -# -# by default we allow relaying from localhost... -localhost.localdomain RELAY -localhost RELAY -127.0.0.1 RELAY - -EOF - cat << EOF > ${D}/etc/conf.d/sendmail -# Config file for /etc/init.d/sendmail - -PIDFILE=/var/run/sendmail.pid - -# add start-up options here -SENDMAIL_OPTS="-bd -q30m" # default daemon mode - -EOF - exeinto /etc/init.d - doexe ${FILESDIR}/sendmail -} diff --git a/net-mail/sendmail/sendmail-8.12.4-r5.ebuild b/net-mail/sendmail/sendmail-8.12.4-r5.ebuild new file mode 100644 index 000000000000..85df042151c9 --- /dev/null +++ b/net-mail/sendmail/sendmail-8.12.4-r5.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2002 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.4-r5.ebuild,v 1.1 2002/07/13 21:59:36 g2boojum Exp $ + +DESCRIPTION="Widely-used Mail Transport Agent (MTA)." +HOMEPAGE="http://www.sendmail.org" +LICENSE="Sendmail" +SLOT="0" +KEYWORDS="x86" + +PROVIDE="virtual/mta" +DEPEND="net-dns/hesiod + net-mail/mailbase + sys-libs/gdbm + sys-devel/m4 + sasl? ( dev-libs/cyrus-sasl ) + tcpd? ( sys-apps/tcp-wrappers ) + ssl? ( dev-libs/openssl ) + ldap? ( net-nds/openldap )" + +# We need some db; pick gdbm if none in USE +if [ -n "`use gdbm`" ] +then + DEPEND="${DEPEND} + sys-libs/gdbm" +elif [ -n "`use berkdb`" ] +then + DEPEND="${DEPEND} + sys-libs/db-3.2" +else + DEPEND="${DEPEND} + sys-libs/gdbm" +fi + +RDEPEND="${DEPEND} + >=net-mail/mailbase-0.00 + !virtual/mta" + +SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz" + +S=${WORKDIR}/${P} + +pkg_preinst() { + if ! grep -q ^smmsp: /etc/group + then + groupadd smmsp || die "problem adding group smmsp" + fi + if ! grep -q ^smmsp: /etc/passwd + then + useradd -d /var/spool/mqueue -g smmsp -s /dev/null smmsp \ + || die "problem adding user smmsp" + fi +} + +src_unpack() { + unpack ${A} + for file in ${PN}-8.12.2-{makemapman,smrsh-paths,unix} + do + cat ${FILESDIR}/${file}.patch | patch -d ${S} -p1 || die "${file} patch failed" + done + + confCCOPTS="${CFLAGS}" + confMAPDEF="-DNEWDB -DMAP_REGEX" + confENVDEF="-DXDEBUG=0" + confLIBS="-lnsl -lcrypt" + conf_sendmail_ENVDEF="-DFALSE=0 -DTRUE=1" + conf_sendmail_LIBS="" + use sasl && confLIBS="${confLIBS} -lsasl2" \ + && confENVDEF="${confENVDEF} -DSASL" \ + && confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \ + && conf_sendmail_ENVDEF="${conf_sendmail_ENVDEF} -DSASL" \ + && 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 gdbm && confLIBS="${confLIBS} -lgdbm" + 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() { + for x in libmilter libsmutil sendmail mailstats rmail praliases smrsh makemap vacation mail.local + do + pushd ${x} + sh Build + popd + done +} + +src_install () { + OBJDIR="obj.`uname -s`.`uname -r`.`arch`" + dodir /etc/pam.d /usr/bin /usr/include/libmilter /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 libmilter libsmutil sendmail mailstats praliases smrsh makemap vacation + 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 + fowners root.smmsp /usr/sbin/sendmail + fowners root.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 + newdoc libmilter/README README.libmilter + newdoc cf/README README.cf + newdoc cf/cf/README README.install-cf + cp -a cf/* ${D}/usr/share/sendmail-cf + insinto /etc/mail + doins ${FILESDIR}/{sendmail.cf,sendmail.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. +# +# by default we allow relaying from localhost... +localhost.localdomain RELAY +localhost RELAY +127.0.0.1 RELAY + +EOF + cat << EOF > ${D}/etc/conf.d/sendmail +# Config file for /etc/init.d/sendmail + +PIDFILE=/var/run/sendmail.pid + +# add start-up options here +SENDMAIL_OPTS="-bd -q30m" # default daemon mode + +EOF + exeinto /etc/init.d + doexe ${FILESDIR}/sendmail +} -- cgit v1.2.3-65-gdbad