Always install hash storage backend and add ewarns about how to use it (#185718).

Package-Manager: portage-2.1.2.7

4 files changed, 50 insertions, 34 deletions

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index 758ffd746031..bf1c1d79af02 100644
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/dspam
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.92 2007/07/08 07:52:02 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.93 2007/07/19 08:28:32 mrness Exp $
+
+*dspam-3.8.0-r3 (19 Jul 2007)
+
+  19 Jul 2007; Alin Năstac <mrness@gentoo.org> -dspam-3.8.0-r2.ebuild,
+  +dspam-3.8.0-r3.ebuild:
+  Always install hash storage backend and add ewarns about how to use it
+  (#185718).
 
 *dspam-3.8.0-r2 (08 Jul 2007)
 
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index e10f6d3a3b17..eeda5a70cdb2 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX README.postfix 309 RMD160 34f35ffa4e393ba1791cef2800bc8b4d4f49df5b SHA1 c004a3e7d54dfdd6fae8a654e44d0b9240935739 SHA256 e0928cf2d734e79419c30a4ee829962351ef5a1247ed1d1ddf3b58410e14828b
 MD5 c12a54112c6fec3530a7b1a368d04ac8 files/README.postfix 309
 RMD160 34f35ffa4e393ba1791cef2800bc8b4d4f49df5b files/README.postfix 309
@@ -21,18 +24,25 @@ SHA256 75e04139e564ad55011ee77b8245dc5cdefbb6d56ca451feab5861ab907d614e files/lo
 DIST dspam-3.8.0-patches-20070624.tar.gz 7808 RMD160 bc0d8d439e7a9a89bfc3dfb4bee3a72d116abb6a SHA1 1f95834dc06fa9a8ed402df015cf57aac957c7fe SHA256 6fcbb5b50d48d6aae716e88a52f4ed89debe93c0df875ff4c003c6147e2f8583
 DIST dspam-3.8.0.tar.gz 726160 RMD160 e7831e2415e30e819dd9cbc0ba3f269e113e2fb9 SHA1 d1de7ee2134522adaf52f49167accecf1589fa96 SHA256 84a227934a7aee73516bdb82c33ee7b359e955c8cd95a1544a9a13069f79bfc7
 DIST dspam_sa_trainer.tar.gz 1230 RMD160 c3d0fca7169d23ecf9d44c850ee255b42d97d818 SHA1 71a002f26a888bdfe47759cf1f780cd6478dacac SHA256 8fb6b1ebe592acf00a028737ef8e174544af166768b987d29048b2319bc5a215
-EBUILD dspam-3.8.0-r2.ebuild 15422 RMD160 38f81af51bc3a641ca2d17c38afa33f979684ec4 SHA1 ab4203d68b07ae9f989c91dae3fad64dcc69277d SHA256 9ca849c09e8949030056f1de147fc26549b8c12959a08693147932594245492c
-MD5 d70795315e517670549a5f20a635cac9 dspam-3.8.0-r2.ebuild 15422
-RMD160 38f81af51bc3a641ca2d17c38afa33f979684ec4 dspam-3.8.0-r2.ebuild 15422
-SHA256 9ca849c09e8949030056f1de147fc26549b8c12959a08693147932594245492c dspam-3.8.0-r2.ebuild 15422
-MISC ChangeLog 16563 RMD160 6638dc6518cc5c19a5dcbd0cb6e3d0621b7ecf2e SHA1 398955b13d9521b8ce761c42ee57ed7c22ef022f SHA256 0902b0890ed02e68c53ec6e3fe69bac72380b58b95e63984194366882ebae896
-MD5 18b2d7a88b7d2b82021dbe7485858ee6 ChangeLog 16563
-RMD160 6638dc6518cc5c19a5dcbd0cb6e3d0621b7ecf2e ChangeLog 16563
-SHA256 0902b0890ed02e68c53ec6e3fe69bac72380b58b95e63984194366882ebae896 ChangeLog 16563
+EBUILD dspam-3.8.0-r3.ebuild 15493 RMD160 c57b822ad3e36cada188c7c0d1412892ade0de49 SHA1 de9fb1417171aa0074531e1ed7f43d94cb0377e7 SHA256 6b56aed3af33b3619b43b971cf77e7b908322af11ef8eec35e89696921956908
+MD5 04939571f1627c2851591b7c62543a54 dspam-3.8.0-r3.ebuild 15493
+RMD160 c57b822ad3e36cada188c7c0d1412892ade0de49 dspam-3.8.0-r3.ebuild 15493
+SHA256 6b56aed3af33b3619b43b971cf77e7b908322af11ef8eec35e89696921956908 dspam-3.8.0-r3.ebuild 15493
+MISC ChangeLog 16779 RMD160 f51c6d39caf63f28893104d599a07edc10f43bea SHA1 3e41815b3c6360f567ef66ee85227a1e8afb7075 SHA256 2bebab18d6e0c8abea154343051448d72bffbffd89760878e031b24d028b083b
+MD5 3723b9b35850f8859c8d88ded928f050 ChangeLog 16779
+RMD160 f51c6d39caf63f28893104d599a07edc10f43bea ChangeLog 16779
+SHA256 2bebab18d6e0c8abea154343051448d72bffbffd89760878e031b24d028b083b ChangeLog 16779
 MISC metadata.xml 335 RMD160 acb18f015dcada8300ffce56be0c4a285ce2a215 SHA1 87ddabb196434e9e9363ba4b5b5596b78aa463f1 SHA256 23816215482cfc089c2e3fe9ae75547c364ad01fbb2a98886ad91d28f5971e17
 MD5 47349dfc68ef142782e134a2e7696a37 metadata.xml 335
 RMD160 acb18f015dcada8300ffce56be0c4a285ce2a215 metadata.xml 335
 SHA256 23816215482cfc089c2e3fe9ae75547c364ad01fbb2a98886ad91d28f5971e17 metadata.xml 335
-MD5 a74e4aa7ca3ad4921fe67e6cfa1df108 files/digest-dspam-3.8.0-r2 759
-RMD160 14e7e6d6f1e5badf2ed418a835e5f2181609d401 files/digest-dspam-3.8.0-r2 759
-SHA256 5357c68185e991aa8d22f5b183aa9d1777db157eabee31acb78ffb0cb27521e7 files/digest-dspam-3.8.0-r2 759
+MD5 a74e4aa7ca3ad4921fe67e6cfa1df108 files/digest-dspam-3.8.0-r3 759
+RMD160 14e7e6d6f1e5badf2ed418a835e5f2181609d401 files/digest-dspam-3.8.0-r3 759
+SHA256 5357c68185e991aa8d22f5b183aa9d1777db157eabee31acb78ffb0cb27521e7 files/digest-dspam-3.8.0-r3 759
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGnyC2VSA5X31g7/gRAoHiAJ4+gleLdQI/HKt6xDm3JzhAjvWffgCbBa79
+wH8Irxzdwb8oEyV4jhIdBXA=
+=YTW1
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/dspam/dspam-3.8.0-r2.ebuild b/mail-filter/dspam/dspam-3.8.0-r3.ebuild
index 3950472db3bf..8ed1f6e01396 100644
--- a/mail-filter/dspam/dspam-3.8.0-r2.ebuild
+++ b/mail-filter/dspam/dspam-3.8.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.8.0-r2.ebuild,v 1.2 2007/07/15 02:43:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.8.0-r3.ebuild,v 1.1 2007/07/19 08:28:32 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -58,15 +58,6 @@ pkg_setup() {
 		die "Incompatible USE flag selection"
 	fi
 
-	if ! ( use mysql || use postgres || use sqlite || use sqlite3 ) ; then
-		echo
-		ewarn "You didn't selected any database backend, therefore hash backend will be used."
-		ewarn "Be advised that hash backend has some issues (see http://bugs.gentoo.org/show_bug.cgi?id=179400),"
-		ewarn "Hit Ctrl-C now and select one database backend through the corespondent USE flag."
-		echo
-		ebeep
-	fi
-
 	create_dspam_usergroup
 }
 
@@ -104,31 +95,24 @@ src_compile() {
 		myconf="${myconf} --enable-preferences-extension"
 	fi
 
-	local STORAGE
+	local STORAGE="hash_drv"
 	# select storage driver
 	if use sqlite ; then
-		if [ "$STORAGE" ] ; then STORAGE="${STORAGE}," ; fi
-		STORAGE="${STORAGE}sqlite_drv"
+		STORAGE="${STORAGE},sqlite_drv"
 	fi
 	if use sqlite3 ; then
-		if [ "$STORAGE" ] ; then STORAGE="${STORAGE}," ; fi
-		STORAGE="${STORAGE}sqlite3_drv"
+		STORAGE="${STORAGE},sqlite3_drv"
 	fi
 	if use mysql; then
-		if [ "$STORAGE" ] ; then STORAGE="${STORAGE}," ; fi
-		STORAGE="${STORAGE}mysql_drv"
+		STORAGE="${STORAGE},mysql_drv"
 		myconf="${myconf} --with-mysql-includes=/usr/include/mysql"
 		myconf="${myconf} --with-mysql-libraries=/usr/$(get_libdir)/mysql"
 	fi
 	if use postgres ; then
-		if [ "$STORAGE" ] ; then STORAGE="${STORAGE}," ; fi
-		STORAGE="${STORAGE}pgsql_drv"
+		STORAGE="${STORAGE},pgsql_drv"
 		myconf="${myconf} --with-pgsql-includes=/usr/include/postgresql"
 		myconf="${myconf} --with-pgsql-libraries=/usr/$(get_libdir)/postgresql"
 	fi
-	if [[ -z "${STORAGE}" ]]; then
-		STORAGE="${STORAGE}hash_drv"
-	fi
 
 	econf ${myconf} --with-storage-driver=${STORAGE} \
 			--with-dspam-home=${HOMEDIR} \
@@ -261,6 +245,16 @@ src_install () {
 		-e "s:^#\(Purge.*\):\1:g" \
 		-e "s:^###\(Purge.*\):#\1:g" \
 		-i "${D}"/${CONFDIR}/dspam.conf
+	if ! ( use mysql || use postgres || use sqlite || use sqlite3 ) ; then
+		# When only one storage driver is compiled, it is linked statically with dspam
+		# thus you should not set the StorageDriver at all
+		# Also, hash_drv requires certain tokenizer and PValue (see bug #185718)
+		sed -e "s:^\(StorageDriver .*\)$:#\1:" \
+			-e "s:^Tokenizer .*$:Tokenizer sbph:" \
+			-e "/^#PValue/d" \
+			-e "s:^PValue .*$:PValue markov:" \
+		-i "${D}"/${CONFDIR}/dspam.conf
+	fi
 
 	# installs the notification messages
 	# -> The documentation is wrong! The files need to be in ./txt
@@ -310,6 +304,11 @@ pkg_postinst() {
 	# need enewgroup/enewuser in this function for binary install.
 	create_dspam_usergroup
 
+	ewarn "The hash_drv storage backend has the following requirements:"
+	ewarn "  - PValue must be set to 'markov'; Do not use this pvalue with any other storage backend!"
+	ewarn "  - Tokenizer must be either 'sbph' or 'osb'"
+	ewarn "See markov.txt for more info."
+
 	if use mysql || use postgres; then
 		elog
 		elog "To setup DSPAM to run out-of-the-box on your system with a MySQL"
diff --git a/mail-filter/dspam/files/digest-dspam-3.8.0-r2 b/mail-filter/dspam/files/digest-dspam-3.8.0-r3
index 86dd9ae31fc9..86dd9ae31fc9 100644
--- a/mail-filter/dspam/files/digest-dspam-3.8.0-r2
+++ b/mail-filter/dspam/files/digest-dspam-3.8.0-r3