From 21c46b38a2c20b9ead6f8f2485b76077f06186f0 Mon Sep 17 00:00:00 2001
From: jakob <jakob@openbsd.org>
Date: Sun, 30 Sep 2001 11:41:23 +0000
Subject: [PATCH] add db flavour

---
 security/cyrus-sasl/Makefile                  | 36 +++++++++++++------
 .../patches/patch-lib_db_berkeley_c           | 11 ++++++
 .../patches/patch-utils_sasldblistusers_c     | 11 ++++++
 security/cyrus-sasl/pkg/DESCR                 | 30 ++++++----------
 4 files changed, 58 insertions(+), 30 deletions(-)
 create mode 100644 security/cyrus-sasl/patches/patch-lib_db_berkeley_c
 create mode 100644 security/cyrus-sasl/patches/patch-utils_sasldblistusers_c

diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 65cefafb74d..3722d52d02f 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2001/09/28 06:02:14 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.12 2001/09/30 11:41:23 jakob Exp $
 
 COMMENT=	"RFC 2222 SASL (Simple Authentication and Security Layer)"
 
 DISTNAME=	cyrus-sasl-1.5.24
 CATEGORIES=     security
-NEED_VERSION=	1.363
+NEED_VERSION=	1.454
 
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
@@ -18,15 +18,29 @@ PERMIT_PACKAGE_FTP=	yes
 PERMIT_DISTFILES_CDROM=	yes
 PERMIT_DISTFILES_FTP=	yes
 
-SEPARATE_BUILD=	concurrent
-CONFIGURE_STYLE= gnu
-MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/config
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --enable-static \
-		 --enable-login \
-		 --enable-krb4="/usr" \
-		 --includedir="${PREFIX}/include/sasl" \
-		 --with-pwcheck="/var/pwcheck"
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ENV+=		LDFLAGS='${LDFLAGS}'
+CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
+CONFIGURE_ARGS+=	--enable-static \
+			--enable-login \
+			--enable-krb4="/usr" \
+			--disable-gssapi \
+			--includedir="${PREFIX}/include/sasl" \
+			--with-pwcheck="/var/pwcheck"
+
+MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/config
+
+FLAVORS=	db
+FLAVOR?=
+
+.if ${FLAVOR:L:Mdb}
+LIB_DEPENDS+=		db::databases/db
+CFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-dblib=berkeley
+.else
+CONFIGURE_ARGS+=	--with-dblib=ndbm
+.endif
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sasl
diff --git a/security/cyrus-sasl/patches/patch-lib_db_berkeley_c b/security/cyrus-sasl/patches/patch-lib_db_berkeley_c
new file mode 100644
index 00000000000..1ab3de28e4b
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-lib_db_berkeley_c
@@ -0,0 +1,11 @@
+--- lib/db_berkeley.c.orig	Thu Sep 13 00:45:05 2001
++++ lib/db_berkeley.c	Thu Sep 13 00:45:15 2001
+@@ -44,7 +44,7 @@
+  */
+ 
+ #include <config.h>
+-#include <db.h>
++#include <db3.h>
+ #include <sys/stat.h>
+ #include <stdlib.h>
+ #include <assert.h>
diff --git a/security/cyrus-sasl/patches/patch-utils_sasldblistusers_c b/security/cyrus-sasl/patches/patch-utils_sasldblistusers_c
new file mode 100644
index 00000000000..c72c66aa4eb
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-utils_sasldblistusers_c
@@ -0,0 +1,11 @@
+--- utils/sasldblistusers.c.orig	Thu Sep 13 00:48:36 2001
++++ utils/sasldblistusers.c	Thu Sep 13 00:48:47 2001
+@@ -163,7 +163,7 @@
+ #else /* SASL_NDBM */
+ #ifdef SASL_BERKELEYDB
+ 
+-#include <db.h>
++#include <db3.h>
+ /*
+  * Open the database
+  *
diff --git a/security/cyrus-sasl/pkg/DESCR b/security/cyrus-sasl/pkg/DESCR
index acb3b7fe33e..282153d4c19 100644
--- a/security/cyrus-sasl/pkg/DESCR
+++ b/security/cyrus-sasl/pkg/DESCR
@@ -1,23 +1,15 @@
 The Cyrus SASL (Simple Authentication and Security Layer)
 
-SASL is the Simple Authentication and Security Layer, a method for adding
-authentication support to connection-based protocols. To use SASL, a
-protocol includes a command for identifying and authenticating a user to a
-server and for optionally negotiating protection of subsequent protocol
-interactions. If its use is negotiated, a security layer is inserted
-between the protocol and the connection.
-
-The following mechanisms are included in this distribution:
-
-	ANONYMOUS
-	CRAM-MD5
-	DIGEST-MD5
-	GSSAPI (MIT Kerberos 5 or Heimdal Kerberos 5)
-	KERBEROS_V4
-	PLAIN
-
-The library can use a Berkeley DB, gdbm or ndbm file on the server side to
-store per-user authentication secrets.  The utility saslpasswd has been
-included for adding authentication secrets to the file.
+SASL is the Simple Authentication and Security Layer, a method for
+adding authentication support to connection-based protocols. To use
+SASL, a protocol includes a command for identifying and authenticating
+a user to a server and for optionally negotiating protection of
+subsequent protocol interactions. If its use is negotiated, a security
+layer is inserted between the protocol and the connection.
 
 WWW: ${HOMEPAGE}
+
+
+Availible flavors:
+
+  db - use the the berkeley db library from databases/db