Fixed compatibility problems with sys-libs/db-4.4 and 4.5, fixes bug 174680.

(Portage version: 2.1.2.4)

3 files changed, 72 insertions, 2 deletions

diff --git a/net-nntp/inn/ChangeLog b/net-nntp/inn/ChangeLog
index 0cc18ebb70b7..4a8bbc3b200d 100644
--- a/net-nntp/inn/ChangeLog
+++ b/net-nntp/inn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nntp/inn
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.9 2007/03/03 15:09:26 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.10 2007/04/17 23:02:29 philantrop Exp $
+
+  17 Apr 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/inn-2.4.3-berkdb45.patch, inn-2.4.3.ebuild:
+  Fixed compatibility problems with sys-libs/db-4.4 and 4.5, fixes bug 174680.
 
   03 Mar 2007; Sven Wegener <swegener@gentoo.org> inn-2.4.3.ebuild:
   Add db location for bug #168519.
diff --git a/net-nntp/inn/files/inn-2.4.3-berkdb45.patch b/net-nntp/inn/files/inn-2.4.3-berkdb45.patch
new file mode 100644
index 000000000000..6d649931a01e
--- /dev/null
+++ b/net-nntp/inn/files/inn-2.4.3-berkdb45.patch
@@ -0,0 +1,62 @@
+Index: frontends/ovdb_stat.c
+--- frontends/ovdb_stat.c.orig	2006-03-20 05:14:57 +0100
++++ frontends/ovdb_stat.c	2006-09-29 07:17:19 +0200
+@@ -266,13 +266,17 @@
+  { INT32, F(st_nobjects),      -1, -1,           "Current objects" },
+  { INT32, F(st_maxnobjects),   -1, -1,           "Maximum objects" },
+ #endif
++#if !(DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4)
+  { INT32, F(st_nconflicts),    -1, -1,           "Lock conflicts" },
++#endif
+  { INT32, F(st_nrequests),     -1, -1,           "Lock requests" },
+  { INT32, F(st_nreleases),     -1, -1,           "Lock releases" },
+  { DIFF32, F(st_nrequests), F(st_nreleases), F(st_ndeadlocks), "Outstanding locks" },
+ #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 0)
++#if !(DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4)
+  { INT32, F(st_nnowaits),      -1, -1,           "Lock requests that would have waited" },
+ #endif
++#endif
+  { INT32, F(st_ndeadlocks),    -1, -1,           "Deadlocks" },
+ #if DB_VERSION_MAJOR >= 4
+  { INT32, F(st_nlocktimeouts), -1, -1,           "Lock timeouts" },
+Index: scripts/innwatch.in
+--- scripts/innwatch.in.orig	2006-03-20 05:14:57 +0100
++++ scripts/innwatch.in	2006-09-29 07:17:19 +0200
+@@ -126,7 +126,12 @@
+ NEXTSLEEP=1
+ HASEXITED=false
+ 
+-while { sleep ${NEXTSLEEP} & wait; } ; : ; do
++SLEEPTINY=4
++while { sleep ${SLEEPTINY} & wait; } ; : ; do
++    NEXTSLEEP=`expr ${NEXTSLEEP} - ${SLEEPTINY}`
++    if [ $NEXTSLEEP -gt 0 ]; then
++        continue;
++    fi
+     NEXTSLEEP=${INNWATCHSLEEPTIME}
+ 
+     ##  If news.daily is running, idle:  we don't want to change the
+Index: site/Makefile
+--- site/Makefile.orig	2006-03-20 05:14:57 +0100
++++ site/Makefile	2006-09-29 07:17:19 +0200
+@@ -137,7 +137,6 @@
+ 	chmod $(FILEMODE) $@
+ $D$(PATH_HISTORY):
+ 	touch $@
+-	$(PATHBIN)/makedbz -i -o
+ 
+ ##  Remove files that are unchanged from the release version.
+ clean:
+Index: storage/ovdb/ovdb.c
+--- storage/ovdb/ovdb.c.orig	2006-03-20 05:14:57 +0100
++++ storage/ovdb/ovdb.c	2006-09-29 07:55:00 +0200
+@@ -1526,7 +1526,9 @@
+ 
+     OVDBenv->set_errcall(OVDBenv, OVDBerror);
+     OVDBenv->set_cachesize(OVDBenv, 0, ovdb_conf.cachesize, 1);
++#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 5)
+     OVDBenv->set_lk_max(OVDBenv, ovdb_conf.maxlocks);
++#endif
+ 
+ #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR >= 2)
+     if(ovdb_conf.txn_nosync)
diff --git a/net-nntp/inn/inn-2.4.3.ebuild b/net-nntp/inn/inn-2.4.3.ebuild
index 3d8457103d5c..56febd195616 100644
--- a/net-nntp/inn/inn-2.4.3.ebuild
+++ b/net-nntp/inn/inn-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.4.3.ebuild,v 1.3 2007/03/03 15:09:26 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.4.3.ebuild,v 1.4 2007/04/17 23:02:29 philantrop Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -38,6 +38,10 @@ src_unpack() {
 	sed -i \
 		-e "s:@prefix@/lib:/etc/news/cert:" \
 		samples/sasl.conf.in
+
+	# Fixes compatibility problems with sys-libs/db-4.4 and 4.5,
+	# bug 174680.
+	epatch ${FILESDIR}/${P}-berkdb45.patch
 }
 
 src_compile() {