Version bump to 4.2.1 Fixes vulnerability described on bug #397941

(Portage version: 2.1.10.44/cvs/Linux i686)

3 files changed, 96 insertions, 2 deletions

diff --git a/mail-filter/spamdyke/ChangeLog b/mail-filter/spamdyke/ChangeLog
index c194a9787bc7..6d6e674f59f3 100644
--- a/mail-filter/spamdyke/ChangeLog
+++ b/mail-filter/spamdyke/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/spamdyke
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamdyke/ChangeLog,v 1.19 2011/04/07 11:41:00 tupone Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamdyke/ChangeLog,v 1.20 2012/01/15 13:47:46 tupone Exp $
+
+*spamdyke-4.2.1 (14 Jan 2012)
+
+  14 Jan 2012; Tupone Alfredo <tupone@gentoo.org> +spamdyke-4.2.1.ebuild,
+  +files/spamdyke-4.2.1-gcc46.patch:
+  Version bump to 4.2.1 Fixes vulnerability described on bug #397941 by Michael
+  Harrison
 
   07 Apr 2011; Alfredo Tupone <tupone@gentoo.org> spamdyke-4.2.0.ebuild,
   +files/spamdyke-4.2.0-gcc46.patch:
diff --git a/mail-filter/spamdyke/files/spamdyke-4.2.1-gcc46.patch b/mail-filter/spamdyke/files/spamdyke-4.2.1-gcc46.patch
new file mode 100644
index 000000000000..f9428bee6bf0
--- /dev/null
+++ b/mail-filter/spamdyke/files/spamdyke-4.2.1-gcc46.patch
@@ -0,0 +1,10 @@
+--- configure.ac.old	2011-04-07 09:37:58.000000000 +0200
++++ configure.ac	2011-04-07 09:38:12.000000000 +0200
+@@ -22,7 +22,6 @@
+ AC_CONFIG_HEADER([config.h])
+ 
+ AC_LANG_WERROR
+-CFLAGS=-Wall
+ 
+ # Checks for programs.
+ AC_PROG_CC([[gcc]])
diff --git a/mail-filter/spamdyke/spamdyke-4.2.1.ebuild b/mail-filter/spamdyke/spamdyke-4.2.1.ebuild
new file mode 100644
index 000000000000..e2365a7e970b
--- /dev/null
+++ b/mail-filter/spamdyke/spamdyke-4.2.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamdyke/spamdyke-4.2.1.ebuild,v 1.1 2012/01/15 13:47:46 tupone Exp $
+
+EAPI="2"
+inherit eutils autotools
+
+DESCRIPTION="A drop-in connection-time spam filter for qmail"
+HOMEPAGE="http://www.spamdyke.org/"
+SRC_URI="http://www.spamdyke.org/releases/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+tls"
+
+DEPEND="tls? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}
+	virtual/qmail"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc46.patch
+	echo "# Configuration option for ${PN}" > ${PN}.conf
+	if use tls; then
+		echo "tls-certificate-file=/var/qmail/control/clientcert.pem" \
+			>> ${PN}.conf
+	fi
+	echo "graylist-level=always-create-dir" >> ${PN}.conf
+	echo "graylist-dir=/var/tmp/${PN}/graylist" >> ${PN}.conf
+	echo "reject-empty-rdns" >> ${PN}.conf
+	echo "reject-unresolvable-rdns" >> ${PN}.conf
+	echo "dns-blacklist-entry=zen.spamhaus.org" >> ${PN}.conf
+	echo "local-domains-file=/var/qmail/control/rcpthosts" >> ${PN}.conf
+	sed -i \
+		-e "/STRIP_CMD/d" \
+		Makefile.in || die "sed on Makefile.in failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tls) || die "econf failed"
+	cd ../utils
+	econf || die "econf failed in utils"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
+	cd ../utils
+	emake CFLAGS="${CFLAGS}" || die "emake in utils died"
+}
+
+src_install() {
+	dobin ${PN} || die "Installing ${PN} binary failed"
+	insinto /etc/${PN}
+	doins ${PN}.conf || die "Installing ${PN} configuration file failed"
+	dodir /var/tmp/${PN}/graylist
+	fowners -R qmaild /var/tmp/${PN}/graylist
+	cd ../utils
+	dobin domain2path || die "Installing domain2path binary failed"
+	cd ../documentation
+	dodoc {Changelog,INSTALL,UPGRADING}.txt
+	dohtml FAQ.html \
+		README.html \
+		README_ip_file_format.html \
+		README_rdns_directory_format.html \
+		README_rdns_file_format.html
+}
+
+pkg_postinst() {
+	elog "In /var/qmail/control/conf-smtpd insert the line:"
+	elog "QMAIL_SMTP_PRE=\"${QMAIL_SMTP_PRE} spamdyke -f /etc/${PN}/${PN}.conf\""
+	elog "Run spamdyke with the '-h' flag to see the available options and"
+	elog "update /etc/spamdyke/spamdyke.conf accordingly"
+}