Bug #153896, bump for security reasons. Also clean up some minor QA issues, and remove the strict requirement on apache - as it works with other web servers too.

(Portage version: 2.1.2_rc1-r4)

5 files changed, 112 insertions, 1 deletions

diff --git a/net-mail/qmailadmin/ChangeLog b/net-mail/qmailadmin/ChangeLog
index 0184d18a610b..59040855bf2e 100644
--- a/net-mail/qmailadmin/ChangeLog
+++ b/net-mail/qmailadmin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/qmailadmin
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/ChangeLog,v 1.10 2006/04/12 00:42:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/ChangeLog,v 1.11 2006/11/11 11:02:13 robbat2 Exp $
+
+*qmailadmin-1.2.10 (11 Nov 2006)
+
+  11 Nov 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +qmailadmin-1.2.10.ebuild:
+  Bug #153896, bump for security reasons. Also clean up some minor QA issues,
+  and remove the strict requirement on apache - as it works with other web
+  servers too.
 
   12 Apr 2006; Mike Frysinger <vapier@gentoo.org> qmailadmin-1.2.9.ebuild:
   Add support for USE=maildrop #117233 by Jeff Thompson.
diff --git a/net-mail/qmailadmin/files/digest-qmailadmin-1.2.1 b/net-mail/qmailadmin/files/digest-qmailadmin-1.2.1
index 50446c616218..f10142619b7f 100644
--- a/net-mail/qmailadmin/files/digest-qmailadmin-1.2.1
+++ b/net-mail/qmailadmin/files/digest-qmailadmin-1.2.1
@@ -1 +1,3 @@
 MD5 ed04f1ce8e95c70c6ba2505e5d81a79e qmailadmin-1.2.1.tar.gz 323295
+RMD160 a92392af174b998f27e02f7c8e0b238f30cff79b qmailadmin-1.2.1.tar.gz 323295
+SHA256 779e0a96cf948534e5243d34dfd8d62292382f2e9204f478186c76d86198f860 qmailadmin-1.2.1.tar.gz 323295
diff --git a/net-mail/qmailadmin/files/digest-qmailadmin-1.2.1-r1 b/net-mail/qmailadmin/files/digest-qmailadmin-1.2.1-r1
index 50446c616218..f10142619b7f 100644
--- a/net-mail/qmailadmin/files/digest-qmailadmin-1.2.1-r1
+++ b/net-mail/qmailadmin/files/digest-qmailadmin-1.2.1-r1
@@ -1 +1,3 @@
 MD5 ed04f1ce8e95c70c6ba2505e5d81a79e qmailadmin-1.2.1.tar.gz 323295
+RMD160 a92392af174b998f27e02f7c8e0b238f30cff79b qmailadmin-1.2.1.tar.gz 323295
+SHA256 779e0a96cf948534e5243d34dfd8d62292382f2e9204f478186c76d86198f860 qmailadmin-1.2.1.tar.gz 323295
diff --git a/net-mail/qmailadmin/files/digest-qmailadmin-1.2.10 b/net-mail/qmailadmin/files/digest-qmailadmin-1.2.10
new file mode 100644
index 000000000000..35337865d3c7
--- /dev/null
+++ b/net-mail/qmailadmin/files/digest-qmailadmin-1.2.10
@@ -0,0 +1,3 @@
+MD5 a3c0aee9829579e3fb6e00e17a8215c9 qmailadmin-1.2.10.tar.gz 390150
+RMD160 1220d99d2f228011760ce670fea94f3e5a019506 qmailadmin-1.2.10.tar.gz 390150
+SHA256 24f27697c268a0031145d1fe3b597f0e3e55af41a09f5c6d499b6c2409ce771b qmailadmin-1.2.10.tar.gz 390150
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild
new file mode 100644
index 000000000000..69e54af6d3aa
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild,v 1.1 2006/11/11 11:02:13 robbat2 Exp $
+
+inherit eutils
+
+# TODO: convert this ebuild to use web-app.
+
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT='userpriv'
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A web interface for managing a qmail system with virtual domains"
+HOMEPAGE="http://www.inter7.com/qmailadmin.html"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="maildrop"
+
+DEPEND="virtual/qmail
+	>=net-mail/vpopmail-5.3
+	net-mail/autorespond
+	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+RDEPEND="${DEPEND}"
+# apache and lighttpd both work, but there's no virtual yet
+#	net-www/apache"
+
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+}
+
+src_compile() {
+	local dir_vpopmail="/var/vpopmail"
+	local dir_vhost="/var/www/localhost"
+	local dir_htdocs="${dir_vhost}/htdocs/${PN}"
+	local dir_htdocs_images="${dir_htdocs}/images"
+	local url_htdocs_images="/${PN}/images"
+	local dir_cgibin="${dir_vhost}/cgi-bin"
+	local url_cgibin="/cgi-bin/${PN}"
+	local dir_htdocs_htmlib="/usr/share/${PN}/htmllib"
+	local dir_qmail="/var/qmail"
+	local dir_true="/bin"
+	local dir_ezmlm="/usr/bin"
+	local dir_autorespond="/var/qmail/bin"
+
+	# Pass spam stuff through $@ so we get the quoting right
+	if use maildrop ; then
+		set -- --enable-modify-spam \
+			--enable-spam-command='|preline maildrop /etc/maildroprc'
+	else
+		set --
+	fi
+
+	econf \
+		--enable-valias \
+		--enable-vpopmaildir=${dir_vpopmail} \
+		--enable-htmldir=${dir_htdocs} \
+		--enable-imageurl=${url_htdocs_images} \
+		--enable-imagedir=${dir_htdocs_images} \
+		--enable-htmllibdir=${dir_htdocs_htmlib} \
+		--enable-qmaildir=${dir_qmail} \
+		--enable-true-path=${dir_true} \
+		--enable-ezmlmdir=${dir_ezmlm} \
+		--enable-cgibindir=${dir_cgibin} \
+		--enable-cgipath=${url_cgibin} \
+		--enable-autoresponder-path=${dir_autorespond} \
+		--enable-domain-autofill \
+		--enable-modify-quota \
+		--enable-no-cache \
+		--enable-maxusersperpage=50 \
+		--enable-maxaliasesperpage=50 \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		"$@" \
+		|| die "econf failed"
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog TRANSLATORS NEWS FAQ README contrib/*
+}
+
+pkg_postinst() {
+	einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
+	einfo "please emerge some variant of ezmlm-idx."
+}