upgrade to 2.1.10 fix now includes DB 4.1 patch

imapd/imapd-db4.patch

@@ -1,39 +0,0 @@
-diff -Naur cyrus-imapd-2.1.9.orig/lib/cyrusdb_db3.c cyrus-imapd-2.1.9/lib/cyrusdb_db3.c
---- cyrus-imapd-2.1.9.orig/lib/cyrusdb_db3.c	Tue Aug  6 18:55:03 2002
-+++ cyrus-imapd-2.1.9/lib/cyrusdb_db3.c	Wed Oct 16 18:11:24 2002
-@@ -228,10 +228,15 @@
- 
- static int mysync(void)
- {
-+#if (DB_VERSION_MAJOR <= 4 && DB_VERSION_MINOR < 1)
-     int r;
-+#endif
- 
-     assert(dbinit);
- 
-+#if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1)
-+	txn_checkpoint(dbenv, 0, 0, 0);
-+#else
-     do {
- #if (DB_VERSION_MAJOR > 3) || ((DB_VERSION_MAJOR == 3) && (DB_VERSION_MINOR > 0))
- 	r = txn_checkpoint(dbenv, 0, 0, 0);
-@@ -244,6 +249,7 @@
- 	       db_strerror(r));
- 	return CYRUSDB_IOERROR;
-     }
-+#endif
- 
-     return 0;
- }
-@@ -347,7 +353,11 @@
-     }
-     /* xxx set comparator! */
- 
-+#if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1)
-+    r = db->open(db, NULL, fname, NULL, DB_BTREE, DB_CREATE, 0664);
-+#else
-     r = db->open(db, fname, NULL, DB_BTREE, DB_CREATE, 0664);
-+#endif
-     if (r != 0) {
- 	syslog(LOG_ERR, "DBERROR: opening %s: %s", fname, db_strerror(r));
- 	return CYRUSDB_IOERROR;

imapd/imapd.spec

@@ -31,15 +31,14 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [EVAL]
 Group:        Mail
 License:      BSD
-Version:      2.1.9
-Release:      20021022
+Version:      2.1.10
+Release:      20021114
 
 #   list of sources
 Source0:      ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
 Source1:      imapd.conf
 Source2:      rc.imapd
 Patch0:       imapd.patch
-Patch1:       imapd-db4.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -62,9 +61,9 @@ Provides:     IMAP
 %prep
     %setup -q -n cyrus-imapd-%{version}
     %patch0 -p0
-    %patch1 -p1
 
 %build
+    %{l_shtool} subst -e 's;db-4.1;db;g' configure
     cflags="-I%{l_prefix}/include"
     ldflags="-L%{l_prefix}/lib"
     case "%{l_target}" in