Version bump to 4.2.1 Fixes vulnerability described on bug #397941

Package-Manager: portage-2.1.10.44/cvs/Linux i686

4 files changed, 104 insertions, 7 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/Manifest b/mail-filter/spamdyke/Manifest
index f2917e082c5c..28fd8d069070 100644
--- a/mail-filter/spamdyke/Manifest
+++ b/mail-filter/spamdyke/Manifest
@@ -2,17 +2,20 @@
 Hash: SHA1
 
 AUX spamdyke-4.2.0-gcc46.patch 237 RMD160 05a2a81616687c108c0630c770bfee60535f7c33 SHA1 342c3bc8d8e8ed3ba323315c6cbec9c694436950 SHA256 608dec91f87afbec072f7fbc9c7a937beee3f25c81a6970bb33271315e160f1e
+AUX spamdyke-4.2.1-gcc46.patch 237 RMD160 05a2a81616687c108c0630c770bfee60535f7c33 SHA1 342c3bc8d8e8ed3ba323315c6cbec9c694436950 SHA256 608dec91f87afbec072f7fbc9c7a937beee3f25c81a6970bb33271315e160f1e
 DIST spamdyke-4.0.10.tgz 454117 RMD160 2f31c939c949038265039c10704dfed3cea68802 SHA1 69a94678a78ab845030177fa2916438b0ee98d9e SHA256 daacc661c149f41fe12229da805f849c0dae2595f7b051c5091589502f8341f3
 DIST spamdyke-4.2.0.tgz 502879 RMD160 eb325e06f69de48934ade4140da30adff5b5dd60 SHA1 8434906f761e5d81337150e77c4a9291a49bf5e3 SHA256 eb5fd04893f12bc6613c7afd9d7884f1d66eaaed17c4af58abc567e9de6ab416
+DIST spamdyke-4.2.1.tgz 511744 RMD160 34b7d1c24b3d397aa414e11e60d336970b495dba SHA1 827981420c9cee470172be44325c3af84f503b6d SHA256 a60ebbc0f5302156fc9a4a6637831c41ba058ec52ffe6074833dbdbabfcf132e
 EBUILD spamdyke-4.0.10-r1.ebuild 2178 RMD160 6a9e324c43de72675e216609ba90a82374dbf629 SHA1 430ee0201cec5be910fa3add9e820f9151db6c42 SHA256 3fc74d61795056de7d16160f7a79bc7ee039d7aabf5179f119605f42c7401211
 EBUILD spamdyke-4.0.10.ebuild 2234 RMD160 5bcc520cbce7c68bf9579588ba32491c47d96bac SHA1 909c0253d6ae977bf89b17c91f88c9da97ce3b1f SHA256 5818d31706c4822ac3b4620ba3f0bbd737bfbd7fcc41ed33d49272083dfd9e98
 EBUILD spamdyke-4.2.0.ebuild 2275 RMD160 a70aa9d420995291cb527ab485bed5c6d6471726 SHA1 d923141ecce4d2c1a246b196349b8d3780163ee6 SHA256 9b7173cfad38e6c0a650de7f9e6179cfd04c883186bbcbae8e694934803bfc8d
-MISC ChangeLog 2778 RMD160 04f578b9f40b4346a18a09e81bb894a42dff2419 SHA1 693225ca464877317b40a30dfd05318a286d9260 SHA256 b5a4da8af2d3fc8fea5544929c3f74883727d90081258f44cbbd8f8413dc3c25
+EBUILD spamdyke-4.2.1.ebuild 2262 RMD160 1edd02a7a8c126d7af9bc1fe584dac3e8277ee0b SHA1 dca4e0ae14f2319c6bd6e6f8b86062962e1f1d09 SHA256 e41bad6666c6a506d0c74c75962e6097d16e19389b56d3e49b03e6a9beb6ad5b
+MISC ChangeLog 3012 RMD160 aaf06875a4c34c78678bea49d2355e4713085b52 SHA1 ceb0afb0b5ac3e5e094c09e146c1c29917b3faf4 SHA256 8e73710790296f6adcd7818ae6d5ce520392661c0ddaff03dbb26ac817e6d6fe
 MISC metadata.xml 779 RMD160 9b025454580ef303ffa5acd0dcc5baaa1d323a6b SHA1 b5e1fa8bb45cb34876e3b6207d37efc0156a03a9 SHA256 99a5ee30cac08fd1556678c111df83f027e54c71a5dc0884887787d21a5fe17c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2dotYACgkQIY77eQFFFC0niwCdF0l/Hp4mEFT+644C3qbNQeF2
-EoEAoMO7NZ3t1QCGwnlPZdh2cN64f73o
-=e8F3
+iEYEARECAAYFAk8S2RAACgkQIY77eQFFFC3dzwCdHVV0Xx3v47Sa0nD1XguJ7tdJ
+3iQAoLnoPG+gB+ZUqZszuSBaGUhixZzV
+=vTk0
 -----END PGP SIGNATURE-----
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"
+}