fix security bug (#91465), reported by: eromang <eromang@zataz.net>

(Portage version: 2.0.51.19)

4 files changed, 130 insertions, 11 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index 3348bf5cd6a3..1db649986a17 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/maildrop
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.23 2005/03/10 18:25:40 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.24 2005/05/04 19:40:31 ferdy Exp $
+
+*maildrop-1.7.0-r3 (04 May 2005)
+
+  04 May 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +maildrop-1.7.0-r3.ebuild:
+  fix security bug (#91465), reported by: eromang <eromang@zataz.net>
 
 *maildrop-1.8.0-r3 (10 Mar 2005)
 
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 2d4c09b6800e..fed825c3c2db 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 82c63c5d17a6b106d8d5b68f9998d2e6 maildrop-1.7.0.20040907.ebuild 3110
 MD5 9e67ce523864322ba8e622f5312b066c maildrop-1.5.2.ebuild 2531
+MD5 e42d4d7c6fe30f0bef7229527f2da340 maildrop-1.7.0-r3.ebuild 3296
 MD5 9450abd9af48a08d64cc44ae9896e9f3 maildrop-1.8.0-r1.ebuild 3094
 MD5 3e1454badff95e0e8a01a24260f77a06 maildrop-1.4.0-r1.ebuild 1617
 MD5 5f8fb2e1e1e2e6941232e47f31d1520c maildrop-1.7.0.ebuild 2580
@@ -24,6 +22,7 @@ MD5 be89a292c7c2bd4365fd160f4db22fb9 files/digest-maildrop-1.7.0.20040907-r1 77
 MD5 953fc332e6ec019b91dba0b85d9745e9 files/digest-maildrop-1.4.0-r1 66
 MD5 afbd9f7ee066fa84ac9efd57bce9f461 files/digest-maildrop-1.5.3-r1 67
 MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0-r2 68
+MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0-r3 68
 MD5 72eeead0d2cb72de0ee2571af5c63bd5 files/maildrop-1.7.0-db4-configure.in.patch 1290
 MD5 eb7acda28529a85c74150a140f143d75 files/digest-maildrop-1.8.0-r1 68
 MD5 eb7acda28529a85c74150a140f143d75 files/digest-maildrop-1.8.0-r2 68
@@ -32,10 +31,3 @@ MD5 c9c1f6d4020a5fd19162f20c537eb5cf files/maildroprc 58
 MD5 54e776919d1cd1729e5c6c1f27c40444 files/maildrop-1.7.0-0x0B-fix.patch 525
 MD5 532cc225eb7ae73b01639168857445be files/maildrop-1.7.0-db4-bdbobj_configure.in.patch 1211
 MD5 2f8014fea76e32d9bb682d00ee5ce7c7 files/maildrop-1.8.0-db4.patch 2501
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCMJE0ViELBEf1JB0RAh/oAJwJs5fG+geWO75O5X22TuQEfFqtdwCfWH1R
-CvJRsl1cjYnhYjaZifhIZZ8=
-=B6QT
------END PGP SIGNATURE-----
diff --git a/mail-filter/maildrop/files/digest-maildrop-1.7.0-r3 b/mail-filter/maildrop/files/digest-maildrop-1.7.0-r3
new file mode 100644
index 000000000000..3dee98c621e4
--- /dev/null
+++ b/mail-filter/maildrop/files/digest-maildrop-1.7.0-r3
@@ -0,0 +1 @@
+MD5 fa2dbbb84795e459db36ea0013f6f214 maildrop-1.7.0.tar.bz2 1209721
diff --git a/mail-filter/maildrop/maildrop-1.7.0-r3.ebuild b/mail-filter/maildrop/maildrop-1.7.0-r3.ebuild
new file mode 100644
index 000000000000..11718d9d2328
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-1.7.0-r3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.7.0-r3.ebuild,v 1.1 2005/05/04 19:40:31 ferdy Exp $
+
+
+inherit eutils
+IUSE="mysql ldap gdbm berkdb"
+
+DESCRIPTION="Mail delivery agent/filter"
+HOMEPAGE="http://www.courier-mta.org/maildrop/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~sparc ~alpha ~amd64 ~ia64"
+
+DEPEND="dev-lang/perl
+	virtual/mta
+	berkdb? ( >=sys-libs/db-3* )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	ldap? ( >=net-nds/openldap-2.0.23 )"
+PROVIDE="virtual/mda"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# patch for db-4.x detection
+	epatch ${FILESDIR}/maildrop-1.7.0-db4-configure.in.patch \
+		|| die "patch failed."
+	epatch ${FILESDIR}/maildrop-1.7.0-db4-bdbobj_configure.in.patch \
+		|| die "patch failed."
+
+	ebegin "Recreating configure."
+	autoconf || die "recreate configure failed."
+	eend $?
+
+	ebegin "Recreating configure in bdbobj."
+	cd ${S}/bdbobj
+	autoconf || die "recreate configure failed."
+	eend $?
+	cd ${S}
+}
+
+src_compile() {
+	local myconf
+	use mysql \
+		&& myconf="${myconf} --enable-maildropmysql \
+			--with-mysqlconfig=/etc/maildrop/maildropmysql.cf" \
+		|| myconf="${myconf} --disable-maildropmysql"
+
+	use ldap \
+		&& myconf="${myconf} --enable-maildropldap \
+			--with-ldapconfig=/etc/maildrop/maildropldap.cf" \
+		|| myconf="${myconf} --disable-maildropldap"
+
+	if use gdbm ; then
+		# both flags present; default to gdbm.
+		einfo "build with GDBM support."
+		myconf="${myconf} --with-db=gdbm \
+		--enable-userdb"
+	elif use berkdb ; then
+		einfo "build with DB support."
+		myconf="${myconf} --with-db=db \
+		--enable-userdb"
+	else
+		# without a db library support, can't build this.
+		einfo "moving ${S}/makedat to ${S}/makedat.org"
+		mv ${S}/makedat ${S}/makedat.org || "failed to move makedat."
+		einfo "build without-db."
+		myconf="${myconf} --without-db"
+	fi
+
+	econf \
+		--with-devel \
+		--disable-tempdir \
+		--enable-syslog=1 \
+		--enable-use-flock=1 \
+		--enable-maildirquota \
+		--enable-use-dotlock=1 \
+		--enable-restrict-trusted=1 \
+		--enable-trusted-users='apache dspam root mail daemon postmaster qmaild mmdf vmail' \
+		--with-default-maildrop=./.maildir/ \
+		--enable-sendmail=/usr/sbin/sendmail \
+		${myconf} || die
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	local i
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README \
+		README.postfix UPGRADE maildroptips.txt
+	mv ${D}/usr/share/maildrop/html ${D}/usr/share/doc/${PF}
+	dohtml {INSTALL,README,UPGRADE}.html
+
+	# this just cleans up /usr/share/maildrop a little bit..
+	for i in makedat makeuserdb pw2userdb userdb userdbpw vchkpw2userdb ; do
+		rm -f ${D}/usr/bin/$i
+		mv -f ${D}/usr/share/maildrop/scripts/$i \
+			${D}/usr/share/maildrop
+		dosym /usr/share/maildrop/$i /usr/bin/$i
+	done
+	rm -rf ${D}/usr/share/maildrop/scripts
+
+	insinto /etc
+	doins ${FILESDIR}/maildroprc
+
+	insinto /etc/maildrop
+	insopts -m0640
+	if use mysql ; then
+		sed -e "s:/var/lib/mysql/mysql.sock:/var/run/mysqld/mysqld.sock:" \
+		 	${S}/maildropmysql.config > ${S}/maildropmysql.cf
+		newins ${S}/maildropmysql.cf maildropmysql.cf
+	fi
+	use ldap && newins ${S}/maildropldap.config maildropldap.cf
+}
+