Closing bug # 4916.

5 files changed, 16 insertions, 198 deletions

diff --git a/net-mail/sendmail/ChangeLog b/net-mail/sendmail/ChangeLog
index a22fe3af3b92..65556c489781 100644
--- a/net-mail/sendmail/ChangeLog
+++ b/net-mail/sendmail/ChangeLog
@@ -1,6 +1,13 @@
 # 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.7 2002/07/04 04:55:29 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sendmail/ChangeLog,v 1.8 2002/07/12 21:57:42 g2boojum Exp $
+
+*sendmail-8.12.4-r4 (12 Jul 2002)
+
+  12 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
+
+  fixed permissions (thanks to Harald Kubota for catching the problem),
+  moved group/passwd stuff to pkg_preinst
 
 *sendmail-8.12.4-r3 (04 Jul 2002)
 
diff --git a/net-mail/sendmail/files/digest-sendmail-8.12.4-r3 b/net-mail/sendmail/files/digest-sendmail-8.12.4-r3
deleted file mode 100644
index ac023cc4008c..000000000000
--- a/net-mail/sendmail/files/digest-sendmail-8.12.4-r3
+++ /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-r2 b/net-mail/sendmail/files/digest-sendmail-8.12.4-r4
index ac023cc4008c..ac023cc4008c 100644
--- a/net-mail/sendmail/files/digest-sendmail-8.12.4-r2
+++ b/net-mail/sendmail/files/digest-sendmail-8.12.4-r4
diff --git a/net-mail/sendmail/sendmail-8.12.4-r3.ebuild b/net-mail/sendmail/sendmail-8.12.4-r3.ebuild
deleted file mode 100644
index 576c08167ce2..000000000000
--- a/net-mail/sendmail/sendmail-8.12.4-r3.ebuild
+++ /dev/null
@@ -1,180 +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-r3.ebuild,v 1.1 2002/07/04 04:55:29 g2boojum Exp $
-
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)."
-HOMEPAGE="http://www.sendmail.org"
-LICENSE="Sendmail"
-SLOT="0"
-
-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}
-
-#adds ".keep" files so that dirs aren't auto-cleaned
-keepdir() {
-	dodir $*
-	local x
-	for x in $*
-	do
-		touch ${D}/${x}/.keep
-	done
-}
-
-pkg_setup() {
-	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
-	fperms 770 /var/spool/clientmqueue
-	fperms 700 /var/spool/mqueue
-	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
-	fowners root.smmsp /usr/sbin/sendmail
-	fowners root.smmsp /var/spool/clientmqueue
-	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
-	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-r2.ebuild b/net-mail/sendmail/sendmail-8.12.4-r4.ebuild
index 1d756dfcbfa5..3031db3a53bb 100644
--- a/net-mail/sendmail/sendmail-8.12.4-r2.ebuild
+++ b/net-mail/sendmail/sendmail-8.12.4-r4.ebuild
@@ -1,14 +1,16 @@
 # 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-r2.ebuild,v 1.2 2002/06/29 12:36:37 seemant Exp $
+# $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 )
@@ -38,17 +40,7 @@ SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
 
 S=${WORKDIR}/${P}
 
-#adds ".keep" files so that dirs aren't auto-cleaned
-keepdir() {
-	dodir $*
-	local x
-	for x in $*
-	do
-		touch ${D}/${x}/.keep
-	done
-}
-
-pkg_setup() {
+pkg_preinst() {
 	if ! grep -q ^smmsp: /etc/group
 	then
 		groupadd smmsp || die "problem adding group smmsp"
@@ -109,8 +101,6 @@ src_install () {
 	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
-	fperms 770 /var/spool/clientmqueue
-	fperms 700 /var/spool/mqueue
 	keepdir /var/spool/{clientmqueue,mqueue}
 	for dir in libmilter libsmutil sendmail mailstats praliases smrsh makemap vacation
 	do
@@ -122,8 +112,6 @@ src_install () {
 			install -C ${OBJDIR}/${dir} \
 			|| die "install failed"
 	done
-	fowners root.smmsp /usr/sbin/sendmail
-	fowners root.smmsp /var/spool/clientmqueue
 	for dir in rmail mail.local
 	do
 		make DESTDIR=${D} MANROOT=/usr/share/man/man \
@@ -134,6 +122,10 @@ src_install () {
 			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