From: Wulf Krueger Date: Tue, 17 Apr 2007 23:02:29 +0000 (+0000) Subject: Fixed compatibility problems with sys-libs/db-4.4 and 4.5, fixes bug 174680. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2a8564d68aa189f093c691cd39341c750cbf7c9d;p=gentoo.git Fixed compatibility problems with sys-libs/db-4.4 and 4.5, fixes bug 174680. Package-Manager: portage-2.1.2.4 --- 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 + +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 inn-2.4.3.ebuild: Add db location for bug #168519. diff --git a/net-nntp/inn/Manifest b/net-nntp/inn/Manifest index 001e51b0f65a..325635b8cee2 100644 --- a/net-nntp/inn/Manifest +++ b/net-nntp/inn/Manifest @@ -5,6 +5,10 @@ AUX 2.4.1-berkdb.patch 1393 RMD160 7a8a742865f1c2288f6639f529d44d82578c67d4 SHA1 MD5 69e1740d0d4d85a272e0491fa1a7ddb7 files/2.4.1-berkdb.patch 1393 RMD160 7a8a742865f1c2288f6639f529d44d82578c67d4 files/2.4.1-berkdb.patch 1393 SHA256 8fc88519689f06d77180df69286c400b7e15003dc7e998774dee1cf56887f465 files/2.4.1-berkdb.patch 1393 +AUX inn-2.4.3-berkdb45.patch 2389 RMD160 d0580cc8e2f1cdf60feacd597991edbfb412d3f8 SHA1 e3fe46034f4e0061276378a3e0c576b289876612 SHA256 2e762081a319a898135c98ae5a5f5e0fbcc8b25deeb65814c343a0a6683c62e2 +MD5 27562fa14e8edb492f53487c12e0f2f6 files/inn-2.4.3-berkdb45.patch 2389 +RMD160 d0580cc8e2f1cdf60feacd597991edbfb412d3f8 files/inn-2.4.3-berkdb45.patch 2389 +SHA256 2e762081a319a898135c98ae5a5f5e0fbcc8b25deeb65814c343a0a6683c62e2 files/inn-2.4.3-berkdb45.patch 2389 AUX innd 503 RMD160 5631966614d5bb4e1c304195e1e796a1fbc9421e SHA1 85aa86e4fcca7837e32e2e3be31fbd50e96b79c2 SHA256 ab2082ee261d632dafeaaf9ebb459e5afe684597c67b860ca0a7a8ff3bf554ed MD5 c5a9ae6ae97f7cdd4254bf5413fc9e47 files/innd 503 RMD160 5631966614d5bb4e1c304195e1e796a1fbc9421e files/innd 503 @@ -16,14 +20,14 @@ EBUILD inn-2.4.1.ebuild 8144 RMD160 12fbfbe5a8452ecbef20e38b7c74499f31cdcd6e SHA MD5 5dff21aa3eda5b928163bca6b7bde5b0 inn-2.4.1.ebuild 8144 RMD160 12fbfbe5a8452ecbef20e38b7c74499f31cdcd6e inn-2.4.1.ebuild 8144 SHA256 710d2f86ff89ff868c45040044e990b189d3ea85b49ea91ef841ac7f5f86c374 inn-2.4.1.ebuild 8144 -EBUILD inn-2.4.3.ebuild 7885 RMD160 7b45deb76ac6b962b959c9b56c14adc1e5bca321 SHA1 61b17b61fb87b2bf19a9243a1b410b78e44284c6 SHA256 6f4b620edc3e24ab700ac21c91611dee61b2f9ad5684a4809f55315eac0bda42 -MD5 bfde8ba52f9c049d569ab3f3631b50b6 inn-2.4.3.ebuild 7885 -RMD160 7b45deb76ac6b962b959c9b56c14adc1e5bca321 inn-2.4.3.ebuild 7885 -SHA256 6f4b620edc3e24ab700ac21c91611dee61b2f9ad5684a4809f55315eac0bda42 inn-2.4.3.ebuild 7885 -MISC ChangeLog 3877 RMD160 3cd750012684dbddd373e1dd222fa4d28f3663e0 SHA1 4e62f4eb725ff65b966fb4feebe86525ca1d48e6 SHA256 d0bd9c60192c554cb2a90056b86665c0b76d001f9329d5677d7dd0c70a2292f5 -MD5 c7f59710bdda7b8eb99e38c59f962b88 ChangeLog 3877 -RMD160 3cd750012684dbddd373e1dd222fa4d28f3663e0 ChangeLog 3877 -SHA256 d0bd9c60192c554cb2a90056b86665c0b76d001f9329d5677d7dd0c70a2292f5 ChangeLog 3877 +EBUILD inn-2.4.3.ebuild 8005 RMD160 4f51073a5d583e02369b28cd59c0c48008000688 SHA1 391a47beec206aa9dd0602e338a63a1eb6e5cf25 SHA256 c5f39097431d80bb8dddcbb8fad9d878ad28b67ec1f9804999ea0cabe3eb9d11 +MD5 2081b5c9d39c2c47724b421f7e966eb3 inn-2.4.3.ebuild 8005 +RMD160 4f51073a5d583e02369b28cd59c0c48008000688 inn-2.4.3.ebuild 8005 +SHA256 c5f39097431d80bb8dddcbb8fad9d878ad28b67ec1f9804999ea0cabe3eb9d11 inn-2.4.3.ebuild 8005 +MISC ChangeLog 4068 RMD160 4ab864f214ba3a464214ade92ec28d7b1f9fbd64 SHA1 eff71d99ff575d47be6f06b72b3c64ab2f660e95 SHA256 6cb9ad841cd58a0ae8711f0bc5d8cf92c5fa250fbc3112684e3feb89c7694cbd +MD5 b76ee07e5664dddb39eb2cccf6967d10 ChangeLog 4068 +RMD160 4ab864f214ba3a464214ade92ec28d7b1f9fbd64 ChangeLog 4068 +SHA256 6cb9ad841cd58a0ae8711f0bc5d8cf92c5fa250fbc3112684e3feb89c7694cbd ChangeLog 4068 MISC metadata.xml 161 RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 SHA1 5d3eb0725c80eb73d935d7dfbd653a7c1a2103e7 SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153 MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161 RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 metadata.xml 161 @@ -35,9 +39,9 @@ MD5 b2f700070372823c26def2b4b0260144 files/digest-inn-2.4.3 232 RMD160 db230f307dac68998c3c462497ece2808908d8ba files/digest-inn-2.4.3 232 SHA256 e984c0ba5b35e379d2c71f485b898a347dc7225df9b10da1fbaa735e226c5841 files/digest-inn-2.4.3 232 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF6Y+uI1lqEGTUzyQRAjXrAJ4t6NqNYHrl49Jz6XRLgVLyB0/tpQCgor5I -v9g3ZWfxhWJpAUSVMUbGL9Q= -=0PjT +iD8DBQFGJVISCkvF58q80IkRAkf4AJ9UMTxzKuCk8ZRLnCyTI1yChftTbwCgnQpo +z27Yvv6DTD1KBQ2SGY9KQHQ= +=x1JR -----END PGP SIGNATURE----- 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() {