From a23a39c3e95f419642fb02b29895ef929280ab57 Mon Sep 17 00:00:00 2001
From: todd <todd@openbsd.org>
Date: Thu, 11 Dec 2008 00:46:01 +0000
Subject: [PATCH] o Add 'domainscale' and 'largescale' flavors from   Antti
 Harri iku(at)kameli(dot)openbsd(dot)fi o Fix PostgreSQL escaping from   Jeff
 Ross jross(at)openvistas(dot)net bump PKGNAME

---
 mail/dspam/Makefile                      | 24 ++++++++++++++++++++++--
 mail/dspam/patches/patch-src_pgsql_drv_c | 11 ++++++++++-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 94322e50030..4fe18902908 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2007/12/21 14:42:23 todd Exp $
+# $OpenBSD: Makefile,v 1.24 2008/12/11 00:46:01 todd Exp $
 
 COMMENT=	anti-spam filter
 
 VERSION=	3.8.0
 DISTNAME=	dspam-${VERSION}
+PKGNAME=	${DISTNAME}p0
 SHARED_LIBS=	dspam	8.0
 CATEGORIES=	mail
 
@@ -42,7 +43,8 @@ EXAMPLESDIR=	${PREFIX}/share/examples/dspam
 DRIVER=
 DAEMON_SUPPORT=
 
-FLAVORS=	sqlite3 sqlite mysql pgsql hash clamav ldap preferences
+FLAVORS=	sqlite3 sqlite mysql pgsql hash clamav ldap preferences \
+		domainscale largescale
 FLAVOR?=	sqlite3
 
 .if ${FLAVOR:L:Mmysql}
@@ -128,6 +130,24 @@ WANTLIB+=		pthread
 CONFIGURE_ARGS+=	--enable-preferences-extension
 .endif
 
+.if ${FLAVOR:L:Mdomainscale}
+CONFIGURE_ARGS+=	--enable-domain-scale
+. if ${FLAVOR:L:Mlargescale}
+BROKEN=			choose either domainscale or largescale, not both
+. endif
+.else
+CONFIGURE_ARGS+=	--disable-domain-scale
+.endif
+
+.if ${FLAVOR:L:Mlargescale}
+CONFIGURE_ARGS+=	--enable-large-scale
+. if ${FLAVOR:L:Mdomainscale}
+BROKEN=			choose either domainscale or largescale, not both
+. endif
+.else
+CONFIGURE_ARGS+=	--disable-large-scale
+.endif
+
 post-install:
 	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKBUILD}/src/dspam.conf \
diff --git a/mail/dspam/patches/patch-src_pgsql_drv_c b/mail/dspam/patches/patch-src_pgsql_drv_c
index fca3cfa3500..237e28b12d4 100644
--- a/mail/dspam/patches/patch-src_pgsql_drv_c
+++ b/mail/dspam/patches/patch-src_pgsql_drv_c
@@ -1,4 +1,4 @@
-$OpenBSD: patch-src_pgsql_drv_c,v 1.4 2007/12/21 14:42:23 todd Exp $
+$OpenBSD: patch-src_pgsql_drv_c,v 1.5 2008/12/11 00:46:01 todd Exp $
 --- src/pgsql_drv.c.orig	Sat Jul 29 15:38:48 2006
 +++ src/pgsql_drv.c	Sun Apr 29 17:57:52 2007
 @@ -1146,7 +1146,7 @@ _ds_get_signature (DSPAM_CTX * CTX, struct _ds_spam_si
@@ -10,6 +10,15 @@ $OpenBSD: patch-src_pgsql_drv_c,v 1.4 2007/12/21 14:42:23 todd Exp $
        return EFAILURE;
      }
      username = strdup(p->pw_name);
+@@ -1241,7 +1241,7 @@
+   mem = PQescapeBytea(SIG->data, SIG->length, &length);
+ 
+   snprintf (scratch, sizeof (scratch),
+-            "INSERT INTO dspam_signature_data (uid, signature, length, created_on, data) VALUES (%d, '%s', %ld, CURRENT_DATE, '",
++            "INSERT INTO dspam_signature_data (uid, signature, length, created_on, data) VALUES (%d, '%s', %ld, CURRENT_DATE, E'",
+             (int)p->pw_uid, signature, SIG->length);
+   buffer_cat (query, scratch);
+   buffer_cat (query, (const char *) mem);
 @@ -1405,7 +1405,7 @@ _ds_get_nextuser (DSPAM_CTX * CTX)
          virtual_username,
          virtual_table);