head	1.2;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.2
	OPENPKG_E1_FP:1.2
	OPENPKG_2_STABLE_20061018:1.2
	OPENPKG_2_STABLE:1.2.0.20
	OPENPKG_2_STABLE_BP:1.2
	OPENPKG_2_5_SOLID:1.2.0.18
	OPENPKG_2_5_SOLID_BP:1.2
	OPENPKG_2_4_RELEASE:1.2
	OPENPKG_2_4_SOLID:1.2.0.16
	OPENPKG_2_4_SOLID_BP:1.2
	OPENPKG_2_3_RELEASE:1.2
	OPENPKG_2_3_SOLID:1.2.0.14
	OPENPKG_2_3_SOLID_BP:1.2
	OPENPKG_2_2_RELEASE:1.2
	OPENPKG_2_2_SOLID:1.2.0.12
	OPENPKG_2_2_SOLID_BP:1.2
	OPENPKG_2_1_RELEASE:1.2
	OPENPKG_2_1_SOLID:1.2.0.10
	OPENPKG_2_1_SOLID_BP:1.2
	OPENPKG_2_0_RELEASE:1.2
	OPENPKG_2_0_SOLID:1.2.0.8
	OPENPKG_2_0_SOLID_BP:1.2
	OPENPKG_1_3_RELEASE:1.2
	OPENPKG_1_3_SOLID:1.2.0.6
	OPENPKG_1_3_SOLID_BP:1.2
	OPENPKG_1_2_SOLID:1.2.0.4
	OPENPKG_1_2_SOLID_BP:1.2
	OPENPKG_1_STABLE:1.2.0.2
	OPENPKG_1_STABLE_BP:1.2;
locks; strict;
comment	@# @;


1.2
date	2002.12.09.19.27.30;	author rse;	state dead;
branches;
next	1.1;

1.1
date	2002.10.14.20.08.10;	author ms;	state Exp;
branches;
next	;


desc
@@


1.2
log
@get rid of DSOs; remove patches from CVS
@
text
@diff -Naur cyrus-sasl-2.1.7.orig/sasldb/db_berkeley.c cyrus-sasl-2.1.7/sasldb/db_berkeley.c
--- cyrus-sasl-2.1.7.orig/sasldb/db_berkeley.c	Fri Jul  5 17:45:13 2002
+++ cyrus-sasl-2.1.7/sasldb/db_berkeley.c	Mon Oct 14 22:00:50 2002
@@@@ -85,7 +85,11 @@@@
     ret = db_create(mbdb, NULL, 0);
     if (ret == 0 && *mbdb != NULL)
     {
-	    ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
+        ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+#else
+        ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+#endif
 	    if (ret != 0)
 	    {
 		    (void) (*mbdb)->close(*mbdb, 0);
diff -Naur cyrus-sasl-2.1.7.orig/utils/dbconverter-2.c cyrus-sasl-2.1.7/utils/dbconverter-2.c
--- cyrus-sasl-2.1.7.orig/utils/dbconverter-2.c	Fri Jul  5 17:44:43 2002
+++ cyrus-sasl-2.1.7/utils/dbconverter-2.c	Mon Oct 14 22:04:56 2002
@@@@ -214,7 +214,11 @@@@
     ret = db_create(mbdb, NULL, 0);
     if (ret == 0 && *mbdb != NULL)
     {
+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
+	    ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+#else
 	    ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
+#endif
 	    if (ret != 0)
 	    {
 		    (void) (*mbdb)->close(*mbdb, 0);
@


1.1
log
@Repaired build to conform to new Berkeley db 4.1.24 API.
@
text
@@