Apply patch to fix segfault from bug #75846. Keeping stable keywords.

5 files changed, 166 insertions, 10 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index 7930d5c0477a..6814bf4b9983 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/maildrop
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.17 2004/12/21 13:14:41 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.18 2004/12/28 00:05:19 ticho Exp $
+
+*maildrop-1.7.0.20040907-r1 (28 Dec 2004)
+
+  28 Dec 2004; Andrej Kacian <ticho@gentoo.org>
+  +files/maildrop-1.7.0-0x0B-fix.patch, +maildrop-1.7.0.20040907-r1.ebuild:
+  Apply patch to fix segfault when maildropmysql.cf can not be read. Bug
+  #75846, reported by Ivo Bitter <gentoo@joeniks.nl>. Keeping stable
+  keywords.
 
   21 Dec 2004; Ferris McCormick <fmccor@gentoo.org>
   maildrop-1.7.0.20040907.ebuild:
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index f1c047d87a4a..a9b71ae222c8 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,19 +1,32 @@
-MD5 eddbe46e7fa90588dd5ed2099f8803bb maildrop-1.4.0-r1.ebuild 1617
-MD5 2f6b908e9a85e034339c04df7218ed8a maildrop-1.5.2.ebuild 2531
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 069713490f75d995d256007633022ad3 ChangeLog 8059
 MD5 de4ecb43fe9d690e3d007552e51638f3 maildrop-1.5.3-r1.ebuild 2432
-MD5 15157536de2356260894b623b3dbbc0b maildrop-1.5.3.ebuild 2508
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 6ffed03234bca79452da5f1c66c985ec ChangeLog 7738
+MD5 fc43b47fc878f7aca46f5bdc17005546 maildrop-1.7.0.20040907-r1.ebuild 3247
 MD5 cd5b95543ea004da5346384c4e1deec8 maildrop-1.7.0.ebuild 2580
 MD5 775ecfe921ead64a3b3cfac58912b3dc maildrop-1.7.0-r2.ebuild 3296
+MD5 2f6b908e9a85e034339c04df7218ed8a maildrop-1.5.2.ebuild 2531
 MD5 fca1c425da7abe0dd2b2271170e7a1c7 maildrop-1.7.0.20040907.ebuild 3111
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 15157536de2356260894b623b3dbbc0b maildrop-1.5.3.ebuild 2508
+MD5 eddbe46e7fa90588dd5ed2099f8803bb maildrop-1.4.0-r1.ebuild 1617
+MD5 afbd9f7ee066fa84ac9efd57bce9f461 files/digest-maildrop-1.5.3-r1 67
 MD5 953fc332e6ec019b91dba0b85d9745e9 files/digest-maildrop-1.4.0-r1 66
+MD5 be89a292c7c2bd4365fd160f4db22fb9 files/digest-maildrop-1.7.0.20040907 77
 MD5 a0e238f4cd5c4a52dfb06754051b6dfe files/digest-maildrop-1.5.2 67
-MD5 afbd9f7ee066fa84ac9efd57bce9f461 files/digest-maildrop-1.5.3 67
-MD5 afbd9f7ee066fa84ac9efd57bce9f461 files/digest-maildrop-1.5.3-r1 67
-MD5 c9c1f6d4020a5fd19162f20c537eb5cf files/maildroprc 58
 MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0 68
 MD5 532cc225eb7ae73b01639168857445be files/maildrop-1.7.0-db4-bdbobj_configure.in.patch 1211
 MD5 72eeead0d2cb72de0ee2571af5c63bd5 files/maildrop-1.7.0-db4-configure.in.patch 1290
 MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0-r2 68
-MD5 be89a292c7c2bd4365fd160f4db22fb9 files/digest-maildrop-1.7.0.20040907 77
+MD5 afbd9f7ee066fa84ac9efd57bce9f461 files/digest-maildrop-1.5.3 67
+MD5 be89a292c7c2bd4365fd160f4db22fb9 files/digest-maildrop-1.7.0.20040907-r1 77
+MD5 54e776919d1cd1729e5c6c1f27c40444 files/maildrop-1.7.0-0x0B-fix.patch 525
+MD5 c9c1f6d4020a5fd19162f20c537eb5cf files/maildroprc 58
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB0KNHQlM6RnzZP+IRAmreAKCROXBGA2miB99X+xrC3qeon9E2UACgrJ5g
+KXqtTwAOdHhOVPX/kkg92EI=
+=96ie
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/maildrop/files/digest-maildrop-1.7.0.20040907-r1 b/mail-filter/maildrop/files/digest-maildrop-1.7.0.20040907-r1
new file mode 100644
index 000000000000..0ed5befa6046
--- /dev/null
+++ b/mail-filter/maildrop/files/digest-maildrop-1.7.0.20040907-r1
@@ -0,0 +1 @@
+MD5 19c3ee25c71e3508c953cfae2f1fb17e maildrop-1.7.0.20040907.tar.bz2 1210399
diff --git a/mail-filter/maildrop/files/maildrop-1.7.0-0x0B-fix.patch b/mail-filter/maildrop/files/maildrop-1.7.0-0x0B-fix.patch
new file mode 100644
index 000000000000..85be44f3968c
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-1.7.0-0x0B-fix.patch
@@ -0,0 +1,14 @@
+diff -bur maildrop-1.7.0.20040907-orig/maildrop/main.C maildrop-1.7.0.20040907/maildrop/main.C
+--- maildrop-1.7.0.20040907-orig/maildrop/main.C	2004-06-26 17:20:14.000000000 +0200
++++ maildrop-1.7.0.20040907/maildrop/main.C	2004-12-28 00:50:09.164726264 +0100
+@@ -326,7 +326,9 @@
+ 
+ 	// Read the config
+ 	mysqlcfg = (mdmysqlconfig*)get_mysql_config(MAILDROPMYSQLCONFIG);
+-	if ( mysqlcfg )
++	if ( !mysqlcfg )
++	  return 0;
++	else
+ 	  if ( !(mysqlcfg->hostname && mysqlcfg->database && mysqlcfg->dbtable) )
+ 	      return 0;
+ 
diff --git a/mail-filter/maildrop/maildrop-1.7.0.20040907-r1.ebuild b/mail-filter/maildrop/maildrop-1.7.0.20040907-r1.ebuild
new file mode 100644
index 000000000000..b703f9d77bf8
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-1.7.0.20040907-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2004 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.20040907-r1.ebuild,v 1.1 2004/12/28 00:05:19 ticho Exp $
+
+
+inherit eutils
+IUSE="mysql ldap gdbm berkdb"
+
+DESCRIPTION="Mail delivery agent/filter"
+HOMEPAGE="http://www.courier-mta.org/maildrop/"
+SRC_URI="http://www.courier-mta.org/beta/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc ~alpha ~amd64"
+
+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."
+
+	# fix segfault on unreadable maildropmysql.cf (bug #75846)
+	epatch ${FILESDIR}/maildrop-1.7.0-0x0B-fix.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
+		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
+	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
+}
+