Version bump to 3.1.7. patched to build with gcc hardened

Package-Manager: portage-2.1.4.4

4 files changed, 176 insertions, 6 deletions

diff --git a/mail-filter/spamdyke/ChangeLog b/mail-filter/spamdyke/ChangeLog
index 3b5e7db2dd2f..a43b3cb3184d 100644
--- a/mail-filter/spamdyke/ChangeLog
+++ b/mail-filter/spamdyke/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/spamdyke
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamdyke/ChangeLog,v 1.3 2008/02/11 21:59:07 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamdyke/ChangeLog,v 1.4 2008/05/12 21:49:37 tupone Exp $
+
+*spamdyke-3.1.7 (12 May 2008)
+
+  12 May 2008; <atupone@gentoo.org> +files/spamdyke-3.1.7-nested.patch,
+  +spamdyke-3.1.7.ebuild:
+  Version bump to 3.1.7
+  Make it build with hardened gcc
 
 *spamdyke-3.1.6 (11 Feb 2008)
 
diff --git a/mail-filter/spamdyke/Manifest b/mail-filter/spamdyke/Manifest
index e1d0f634102d..66067ec7e838 100644
--- a/mail-filter/spamdyke/Manifest
+++ b/mail-filter/spamdyke/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX spamdyke-3.1.7-nested.patch 4480 RMD160 6a634cf1ce1fed8d1ae76230cacb12430c1da600 SHA1 4467c24f6c9a9972febaeb6182c041aa9306b28a SHA256 032fb091bb7bf8a900c27eef41bf0696b05d62d296d98e703ac9231a73d0fde4
 DIST spamdyke-3.1.3.tgz 745192 RMD160 ca13a852051ca89d21d6a34aaed14416ab3b5935 SHA1 afa1377ce44697d4c884c3a52158b7e8ec971fdd SHA256 b3c0c21f86cbf6415d3b06ceaf9c6d7d56e3cf728199e9555fe189aa14a448a0
 DIST spamdyke-3.1.4.tgz 259616 RMD160 ad764fe7ed1a18e3fe05cb43850fa021c4a22ca5 SHA1 37fe8977aeb9aa5f6dbb262f883d32b4f8718852 SHA256 9e6718784118328fbea25668473d3d8d9daf9bb075a16ece40a567c996911bce
 DIST spamdyke-3.1.6.tgz 263910 RMD160 66fecd7b9d481233f850c9adc53a798cfbbc6a71 SHA1 afcceab5624526c83aa382415ec74e4cca9c75aa SHA256 3abafc8243819ecacc5b6edee0c5a663efa65762bef7e6f7efa44c8740e221a0
+DIST spamdyke-3.1.7.tgz 264474 RMD160 d2f0c7d3fbc6e5849d986904b97ef87862896267 SHA1 7ec009590a15f6498dc33308aa3c68afa45b73b3 SHA256 cbac61fac4fa9c67fe3ce953252b077fc9f673960d21e022fc0f4a68189de8f1
 EBUILD spamdyke-3.1.3.ebuild 2081 RMD160 68a8c182687f74ed645bc9ad41ca2dac48ad4653 SHA1 225bd4fda06b12fb8cf073ac78afcb038f7517e2 SHA256 801dce626ca4f60c8fc4c3f0c4fdc456bf3459ddef7a1c6d84ea07a73d54dc70
 EBUILD spamdyke-3.1.4.ebuild 2081 RMD160 f7d74994a44bf6abce6e7a7f8b3c69d0941b196f SHA1 6d1e42a4c53b74c9b16ceccd16fe5a77d4e91f9c SHA256 c3ebb7062d9e0738a886433e4e065960fa7f9093e97b48a5327285ead4aa18f4
 EBUILD spamdyke-3.1.6.ebuild 2081 RMD160 30b9c6eb5f02b19b0f3cb86846d08f3b4be4276b SHA1 9e30fc8a82e39def30be0fed4ee517a4fb25c41c SHA256 3822a42c04d7a41c68c4db4232776362255b7ec635a7cf1ba00557e9aab5bc74
-MISC ChangeLog 616 RMD160 20db46f48138dfefa033145e040fe37cf87ff084 SHA1 45aeb75e42ada665344fc755a1929e094cede70b SHA256 1a9c25e463126d9221fbe09e24a49dd4d7fe391172792b2e3411eec4cfae2da5
+EBUILD spamdyke-3.1.7.ebuild 2160 RMD160 740e59aaddf14918a4d694fd4365ace58acd7ad4 SHA1 75e6896c2613ddf91a6a77fd3b5078d150eca5a3 SHA256 26d7f70e5e60639b687e696305926b26ef1d91a828983e565a377c6bf733b077
+MISC ChangeLog 804 RMD160 01519f7004ff6db022c341429a7b6c839df40a29 SHA1 6c15790d6757e04b6227472f81fc9659613401e3 SHA256 b90394bba3aaa10edc4a53950f18455cbb89373de37b44add21b4035f0455a48
 MISC metadata.xml 707 RMD160 9d94c426746073aa110977b08a459bcfda5e70a5 SHA1 7800fbb956db81cf06ee50c0b0aae268a776942c SHA256 d0966a507becd544b333523fc72448af206b719c9c3307011ca0c22df0855dd8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFHsMU98qKy9+b2Hl0RAk1DAKDWd8JhZk3E3dPHHNg7FJfeuTH6lACfVxWr
-Abp8FDz6WuR5vmQPGhDGftE=
-=g86v
+iEYEARECAAYFAkgou30ACgkQFByi98F1FAgeGgCeMEdvXYQ9yHpisEURqpZGHyRT
+djcAniQpdFqYZrfskR+kZGGsg4btWw/Y
+=AOok
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spamdyke/files/spamdyke-3.1.7-nested.patch b/mail-filter/spamdyke/files/spamdyke-3.1.7-nested.patch
new file mode 100644
index 000000000000..dc2290213d32
--- /dev/null
+++ b/mail-filter/spamdyke/files/spamdyke-3.1.7-nested.patch
@@ -0,0 +1,88 @@
+--- configure.ac.old	2008-05-12 23:07:42.000000000 +0200
++++ configure.ac	2008-05-12 23:15:47.000000000 +0200
+@@ -45,7 +45,7 @@
+         AC_CHECK_LIB([ssl],
+                      [SSL_library_init],
+                      [ LIBS="$LIBS -lssl"
+-                       AC_DEFINE([HAVE_LIBSSL], [1])
++                       AC_DEFINE([HAVE_LIBSSL], [1], [Defined if Openssl library exists])
+                        AC_MSG_CHECKING([for OpenSSL libraries (for TLS support)]) 
+                        AC_MSG_RESULT([yes])
+                      ],
+@@ -66,11 +66,12 @@
+ 
+ # Checks for the flag to compile anonymous inner functions.
+ AC_MSG_CHECKING([whether anonymous inner functions are supported by default])
++OLD_CFLAGS=$CFLAGS
++CFLAGS="$OLD_CFLAGS -w"
+ AC_TRY_COMPILE([],
+                [ int (*bar)(int) = ({ int tmp_action(int foo) { foo++; return(0); } &tmp_action; }); (*bar)(0); ],
+                [ AC_MSG_RESULT([yes]) ],
+                [ AC_MSG_RESULT([no])
+-                 OLD_CFLAGS=$CFLAGS
+                  CFLAGS="$OLD_CFLAGS -fnested-functions"
+                  AC_MSG_CHECKING([whether anonymous inner functions are supported with -fnested-functions])
+                  AC_TRY_COMPILE([],
+@@ -102,7 +103,7 @@
+                                 [ int i;
+                                   i = PACKETSZ; ],
+                                 [ AC_MSG_RESULT([yes])
+-                                  AC_DEFINE([HAVE_NAMESER_COMPAT], [1]) ],
++                                  AC_DEFINE([HAVE_NAMESER_COMPAT], [1], [Defined if nameserver constant are defined in arpa/nameser_compat.h]) ],
+                                 [ AC_MSG_RESULT([no])
+                                   AC_MSG_FAILURE([Unable to compile without nameserver constants.])
+                                 ])
+@@ -114,7 +115,7 @@
+                [ struct dirent tmp_dirent;
+                  tmp_dirent.d_type = 0; ],
+                [ AC_MSG_RESULT([yes]) 
+-                 AC_DEFINE([HAVE_DIRENT_TYPES], [1]) 
++                 AC_DEFINE([HAVE_DIRENT_TYPES], [1], [Defined if dirent type exists]) 
+                  AC_MSG_CHECKING([whether readdir() and stat() understand whiteout files])
+                  AC_TRY_COMPILE([ #include <sys/types.h>
+                                   #include <sys/stat.h>
+@@ -122,7 +123,7 @@
+                                 [ short dir_wht = DT_WHT;
+                                   mode_t stat_wht = S_IFWHT; ],
+                                 [ AC_MSG_RESULT([yes])
+-                                  AC_DEFINE([HAVE_WHITEOUT], [1]) ],
++                                  AC_DEFINE([HAVE_WHITEOUT], [1], [Defined if have whiteout]) ],
+                                 [ AC_MSG_RESULT([no]) ])
+                ],
+                [ AC_MSG_RESULT([no]) ])
+@@ -132,9 +133,9 @@
+                  #include <unistd.h> ],
+                [ printf("%u", getpid()); ],
+                [ AC_MSG_RESULT([unsigned int])
+-                 AC_DEFINE([FORMAT_PID_T], ["%u"]) ],
++                 AC_DEFINE([FORMAT_PID_T], ["%u"], [Defined if unsigned int]) ],
+                [ AC_MSG_RESULT([unsigned long])
+-                 AC_DEFINE([FORMAT_PID_T], ["%lu"]) ])
++                 AC_DEFINE([FORMAT_PID_T], ["%lu"], [Defined if unsigned long]) ])
+ 
+ AC_MSG_CHECKING([whether uid_t is an unsigned int or an unsigned long])
+ AC_TRY_COMPILE([ #include <stdio.h>
+@@ -142,9 +143,9 @@
+                  #include <unistd.h> ],
+                [ printf("%u", getuid()); ],
+                [ AC_MSG_RESULT([unsigned int])
+-                 AC_DEFINE([FORMAT_UID_T], ["%u"]) ],
++                 AC_DEFINE([FORMAT_UID_T], ["%u"], [Defined if unsigned int]) ],
+                [ AC_MSG_RESULT([unsigned long])
+-                 AC_DEFINE([FORMAT_UID_T], ["%lu"]) ])
++                 AC_DEFINE([FORMAT_UID_T], ["%lu"], [Defined if unsigned long]) ])
+ 
+ AC_MSG_CHECKING([whether gid_t is an unsigned int or an unsigned long])
+ AC_TRY_COMPILE([ #include <stdio.h>
+@@ -152,9 +153,9 @@
+                  #include <unistd.h> ],
+                [ printf("%u", getgid()); ],
+                [ AC_MSG_RESULT([unsigned int])
+-                 AC_DEFINE([FORMAT_GID_T], ["%u"]) ],
++                 AC_DEFINE([FORMAT_GID_T], ["%u"], [Defined if unsigned int]) ],
+                [ AC_MSG_RESULT([unsigned long])
+-                 AC_DEFINE([FORMAT_GID_T], ["%lu"]) ])
++                 AC_DEFINE([FORMAT_GID_T], ["%lu"]), [Defined if unsigned long] ])
+ 
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
diff --git a/mail-filter/spamdyke/spamdyke-3.1.7.ebuild b/mail-filter/spamdyke/spamdyke-3.1.7.ebuild
new file mode 100644
index 000000000000..3a7d36d90585
--- /dev/null
+++ b/mail-filter/spamdyke/spamdyke-3.1.7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamdyke/spamdyke-3.1.7.ebuild,v 1.1 2008/05/12 21:49:37 tupone Exp $
+
+EAPI="1"
+
+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"
+IUSE="+tls"
+
+DEPEND="tls? ( dev-libs/openssl )"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-nested.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-dir=/var/tmp/${PN}/graylist" >> ${PN}.conf
+	echo "never-graylist-rdns-dir=/etc/${PN}/never-graylist" >> ${PN}.conf
+	echo "reject-empty-rdns" >> ${PN}.conf
+	echo "reject-unresolvable-rdns" >> ${PN}.conf
+	eautoreconf
+}
+
+src_compile() {
+	econf --with-debug \
+		$(use_enable tls) || die "econf failed"
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
+	cd ../utils
+	econf || die "econf failed in 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"
+	keepdir /var/tmp/${PN}/graylist/$(../utils/domain2path -d localhost)
+	fowners -R qmaild /var/tmp/${PN}
+	insinto /etc/${PN}/never-graylist/$(../utils/domain2path -d localhost)
+	touch localhost
+	doins localhost
+	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.conf accordingly"
+}