apply Brandy's patch for bug #27517

4 files changed, 76 insertions, 32 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 9800417d5c0a..cde6c133b72c 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.40 2003/08/28 22:32:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.41 2003/09/03 09:49:34 robbat2 Exp $
+
+  03 Sep 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.1.ebuild, files/courier-imap-2.1.1-db40vs41.patch:
+  apply Brandy's patch for bug #27517
 
 *courier-imap-2.1.1 (28 Aug 2003)
 
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index c9ea01ed6700..d01201dede77 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,38 +1,39 @@
-MD5 e2b026fe60176521e97df76389366955 files/authdaemond.conf 457
-MD5 9249739b006f7f0daa345dd8ac6e6b5b files/authdaemond.rc6 977
-MD5 c5993255c6be57914cb943789f59931e files/courier-imapd-ssl.rc6 1208
-MD5 fc75e6af35eeaecec10d7276e9b61747 files/courier-imapd.rc6 953
-MD5 32bc690ac270adbfe95dbbeaab37904b files/courier-pop3d-ssl.rc6 1216
-MD5 572530bc373ee70a6f524d554b1d139c files/courier-pop3d.rc6 961
+MD5 bb9fc1d0628d1a719bbf4f52bbe59fcd courier-imap-1.7.1.ebuild 5262
+MD5 fb165fc2d4178bc45ab1c41600196098 courier-imap-1.7.3-r1.ebuild 6869
+MD5 c6bc519510721ac4af838457798367e3 courier-imap-1.6.2-r1.ebuild 4813
+MD5 e399aedb51a23ab288d5f2d2d2be868c courier-imap-1.7.3.ebuild 6856
+MD5 7a974af8a51e0f760d3fcb108f349fdb courier-imap-1.7.0.ebuild 4954
+MD5 3ceeec6646001e4da5a2e32051f19267 courier-imap-1.7.2.ebuild 6696
+MD5 ddbe48bb03f1434f3c65d0e7e0d2d03f courier-imap-2.1.1.ebuild 6670
+MD5 6d23b67c64d033f550ccdd0578cfe5ed ChangeLog 7279
+MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
+MD5 fba567e34491b014536e1ee20da7bdc9 courier-imap-2.0.0.ebuild 6598
+MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
+MD5 ff6234859377e6e830592de36bc84797 files/courier-imap-2.1.1-db40vs41.patch 559
+MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
+MD5 6eabb1afe28900b3ed92bc9889116303 files/courier-imapd-ssl.rc6 1207
+MD5 420424625a31fa7dc9378e7877faba7a files/courier-imapd.rc6 952
+MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
+MD5 8ec16f9f2d26e30684d8ddbd327e9556 files/gentoo-imapd-1.6.1.rc 1007
+MD5 3dd72120d20476368b64811318e0b721 files/gentoo-pop3d-ssl-1.7.3-r1.rc 1010
+MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
+MD5 4f24c08767f06ab12e572bb0236064bb files/digest-courier-imap-1.6.2-r1 72
+MD5 7f82274e3a25ba7ff6852f78d9eb2f69 files/digest-courier-imap-1.7.3-r1 72
+MD5 8df275b074ff61602d3c0e0bbfcc9750 files/authdaemond.conf 456
+MD5 58631496675a58dbb19ccd058088c6e1 files/gentoo-imapd-ssl-1.7.3-r1.rc 1034
+MD5 c13a4bcb06660f1e589e95709b7a3f01 files/gentoo-pop3d-ssl-1.6.1.rc 990
+MD5 24ac993caf8157415fbe8eff04bf7c68 files/gentoo-pop3d-1.6.1.rc 998
+MD5 8f8fe760e10ffe35689d791e1d7b8d16 files/courier-pop3d-ssl.rc6 1215
+MD5 20598de15b5368fd70065b36e8b4b4d6 files/gentoo-imapd-ssl-1.6.1.rc 1014
+MD5 f287a12e157d9a3280951ab876b5159b files/digest-courier-imap-1.7.0 72
 MD5 f8379da2c3af9757896cf51719923edd files/digest-courier-imap-1.7.1 72
 MD5 517c7b900eb23152a59d3054f98431e8 files/digest-courier-imap-1.7.2 72
 MD5 7f82274e3a25ba7ff6852f78d9eb2f69 files/digest-courier-imap-1.7.3 72
-MD5 7f82274e3a25ba7ff6852f78d9eb2f69 files/digest-courier-imap-1.7.3-r1 72
 MD5 2c48420faba16395e99faa48d098414a files/digest-courier-imap-2.0.0 72
+MD5 c7fcdd240762eddd559da4a56028d167 files/digest-courier-imap-2.1.1 72
 MD5 a949b3b821df42c3cfee300c25a53750 files/gentoo-imapd-1.7.3-r1.rc 1027
-MD5 4f24c08767f06ab12e572bb0236064bb files/digest-courier-imap-1.6.2-r1 72
-MD5 f287a12e157d9a3280951ab876b5159b files/digest-courier-imap-1.7.0 72
-MD5 8ec16f9f2d26e30684d8ddbd327e9556 files/gentoo-imapd-1.6.1.rc 1007
-MD5 20598de15b5368fd70065b36e8b4b4d6 files/gentoo-imapd-ssl-1.6.1.rc 1014
 MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
-MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
-MD5 24ac993caf8157415fbe8eff04bf7c68 files/gentoo-pop3d-1.6.1.rc 998
-MD5 c13a4bcb06660f1e589e95709b7a3f01 files/gentoo-pop3d-ssl-1.6.1.rc 990
-MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
 MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
-MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
+MD5 12b60a6d075d607adf99f90af1a300e3 files/authdaemond.rc6 976
+MD5 70a104ae9721e2f5d86a8f7c326d9f1d files/courier-pop3d.rc6 960
 MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
-MD5 58631496675a58dbb19ccd058088c6e1 files/gentoo-imapd-ssl-1.7.3-r1.rc 1034
-MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
-MD5 3dd72120d20476368b64811318e0b721 files/gentoo-pop3d-ssl-1.7.3-r1.rc 1010
-MD5 c7fcdd240762eddd559da4a56028d167 files/digest-courier-imap-2.1.1 72
-MD5 a43b1966aff2afb6064c5caaa4c3eda3 courier-imap-1.7.1.ebuild 5263
-MD5 e37a21b791d0d26ab585fff50650f3c7 courier-imap-1.7.2.ebuild 6697
-MD5 59992758e443a40e74f6085b01a723eb courier-imap-1.7.3.ebuild 6857
-MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
-MD5 b24add8b7bb383cead117a3096071183 courier-imap-1.7.3-r1.ebuild 6870
-MD5 ff694f5f5f5e185eaec3a88f3a22354b courier-imap-1.6.2-r1.ebuild 4814
-MD5 3d2ece33ecb48cec61e155810fe6e01a courier-imap-2.0.0.ebuild 6599
-MD5 b64e4760ae2f4c7baacd233614e4f55c courier-imap-1.7.0.ebuild 4955
-MD5 d466791805ef37bd0e9d401e76b84907 ChangeLog 7118
-MD5 4699f12a8a7ba054491ab9cb594347a0 courier-imap-2.1.1.ebuild 6572
diff --git a/net-mail/courier-imap/courier-imap-2.1.1.ebuild b/net-mail/courier-imap/courier-imap-2.1.1.ebuild
index 6e5a5b488494..3ce65c429b18 100644
--- a/net-mail/courier-imap/courier-imap-2.1.1.ebuild
+++ b/net-mail/courier-imap/courier-imap-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-2.1.1.ebuild,v 1.1 2003/08/28 22:32:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-2.1.1.ebuild,v 1.2 2003/09/03 09:49:34 robbat2 Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -33,8 +33,13 @@ VPOPMAIL_INSTALLED=
 
 src_unpack() {
 	unpack ${A}
+
+	# patch to fix db4.0 detection as db4.1
+	epatch ${FILESDIR}/courier-imap-2.1.1-db40vs41.patch
+	
 	cd ${S}
 
+
 	# explicitly use db3 over db4
 	if use berkdb; then
 		sed -i -e 's,-ldb,-ldb-3.2,g' configure
diff --git a/net-mail/courier-imap/files/courier-imap-2.1.1-db40vs41.patch b/net-mail/courier-imap/files/courier-imap-2.1.1-db40vs41.patch
new file mode 100644
index 000000000000..c9275949df2a
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-2.1.1-db40vs41.patch
@@ -0,0 +1,34 @@
+--- courier-imap-2.1.1/bdbobj/bdbobj.c	2003-08-30 00:20:54.000000000 +1200
++++ courier-imap-2.1.1_hack/bdbobj/bdbobj.c	2003-08-30 15:49:47.000000000 +1200
+@@ -112,13 +112,13 @@
+ #else
+ 	obj->dbf=0;
+ 
+-#define DB_40 0
++#define DB_41 0
+ 
+ #if DB_VERSION_MAJOR == 4
+-#if DB_VERSION_MINOR == 0
++#if DB_VERSION_MINOR == 1
+ 
+-#undef DB_40
+-#define DB_40 1
++#undef DB_41
++#define DB_41 1
+ 
+ #endif
+ #endif
+@@ -127,10 +127,10 @@
+ 	{
+ 		if ( (*obj->dbf->open)(obj->dbf,
+ 
+-#if DB_40
+-
+-#else
++#if DB_41
+ 				       NULL,
++#else
++
+ #endif
+ 
+ 				       filename, NULL,