head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.36 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.34 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.32 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.30 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.28 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.26 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.24 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.22 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.20 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.18 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.16 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.14 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.12 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.10 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.8 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.6 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.4 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.2 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.4.0.16 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.14 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.12 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.10 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.8 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.6 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.4 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.2 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.1.1.1.0.4 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.2 netbsd-1-6-1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2006.02.07.21.36.37; author drochner; state dead; branches; next 1.5; 1.5 date 2006.01.10.21.06.31; author wiz; state Exp; branches; next 1.4; 1.4 date 2004.03.04.15.55.18; author minskim; state dead; branches; next 1.3; 1.3 date 2004.02.10.17.56.55; author minskim; state Exp; branches; next 1.2; 1.2 date 2003.12.07.00.53.28; author epg; state Exp; branches; next 1.1; 1.1 date 2003.01.17.19.26.04; author gson; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2003.01.17.19.26.04; author gson; state Exp; branches; next ; desc @@ 1.6 log @update to 4.4.2 changes: -Added support for compiling and linking with BerkeleyDB 4.4.20 -bugfixes -Wrap the DBEnv.set_tx_timeout method @ text @$NetBSD: patch-ab,v 1.5 2006/01/10 21:06:31 wiz Exp $ --- extsrc/_bsddb.c.orig 2005-06-06 20:09:39.000000000 +0200 +++ extsrc/_bsddb.c @@@@ -4294,8 +4294,13 @@@@ DBEnv_lock_stat(DBEnvObject* self, PyObj #endif MAKE_ENTRY(nrequests); MAKE_ENTRY(nreleases); +#if (DBVER < 44) MAKE_ENTRY(nnowaits); MAKE_ENTRY(nconflicts); +#else + MAKE_ENTRY(lock_nowait); + MAKE_ENTRY(lock_wait); +#endif MAKE_ENTRY(ndeadlocks); MAKE_ENTRY(regsize); MAKE_ENTRY(region_wait); @@@@ -5133,7 +5138,11 @@@@ DL_EXPORT(void) init_bsddb(void) ADD_INT(d, DB_LOCK_IREAD); ADD_INT(d, DB_LOCK_IWR); #if (DBVER >= 33) +#if (DBVER < 44) ADD_INT(d, DB_LOCK_DIRTY); +#else + ADD_INT(d, DB_LOCK_READ_UNCOMMITTED); +#endif ADD_INT(d, DB_LOCK_WWRITE); #endif @@@@ -5230,7 +5239,11 @@@@ DL_EXPORT(void) init_bsddb(void) ADD_INT(d, DB_OPFLAGS_MASK); ADD_INT(d, DB_RMW); #if (DBVER >= 33) +#if (DBVER < 44) ADD_INT(d, DB_DIRTY_READ); +#else + ADD_INT(d, DB_READ_UNCOMMITTED); +#endif ADD_INT(d, DB_MULTIPLE); ADD_INT(d, DB_MULTIPLE_KEY); #endif @ 1.5 log @Make compile with db4-4.4.x. Remove BROKEN. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update py-bsddb3 to 4.2.4. Changes: * changed DB and DBEnv set_get_returns_none() default from 1 to 2. * cleaned up compatibility iterator interface. * the legacy compatibility dict-like interface now support iterators and generators and allows multithreaded access to the database. * fixed a tuple memory leak when raising "object has been closed" exceptions for DB, DBEnv and DBCursor objects. I doubt much previous code triggered this. * use of a closed DBCursor now raises a DBCursorClosedError exception subclass of DBError rather than a boring old DBError. * added DBCursor.get_current_size() method to return the length in bytes of the value pointed to by the cursor without reading the actual data. * Standalone pybsddb builds now use a _pybsddb dynamic/shared library rather than _bsddb. This allows for pybsddb to be built, installed and used on python >= 2.3 which includes an older version of pybsddb as its bsddb library. * Can now compile and link with BerkeleyDB 4.2.x (when its released). * the legacy bsddb module supports the iterator interface on python 2.3. * Support the DBEnv.set_shm_key() method. * Fixed setup.py include/{db4,db3} header file searching (SF bug #789740). @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2004/02/10 17:56:55 minskim Exp $ d3 1 a3 1 --- extsrc/_bsddb.c.orig 2004-01-14 02:50:28.000000000 -0600 d5 25 a29 3 @@@@ -4363,7 +4363,11 @@@@ DL_EXPORT(void) init_bsddb(void) ADD_INT(d, DB_MAX_PAGES); ADD_INT(d, DB_MAX_RECORDS); d31 6 a36 2 +#if (DBVER >= 42) + ADD_INT(d, DB_RPCCLIENT); d38 1 a38 1 ADD_INT(d, DB_CLIENT); d40 2 a41 10 ADD_INT(d, DB_XA_CREATE); ADD_INT(d, DB_CREATE); @@@@ -4512,7 +4516,7 @@@@ DL_EXPORT(void) init_bsddb(void) ADD_INT(d, DB_CHECKPOINT); ADD_INT(d, DB_CURLSN); #endif -#if (DBVER >= 33) +#if (DBVER >= 33 && DBVER < 42) ADD_INT(d, DB_COMMIT); a42 1 ADD_INT(d, DB_CONSUME); @ 1.3 log @Update py-bsddb3 to 4.1.6. Changes sinec 4.1.1: * Extended DB & DBEnv set_get_returns_none functionality to take a "level" instead of a boolean flag. The boolean 0 and 1 values still have the same effect. A value of 2 extends the "return None instead of raising an exception" behaviour to the DBCursor set methods. This will become the default behaviour in pybsddb 4.2. * Updated documentation for set_get_returns_none. Regenerated the stale html docs from the text documentation. * Fixed a typo in DBCursor.join_item method that made it crash instead of returning a value. Obviously nobody uses it. Wrote a test case for join and join_item. * Added the dbobj wrapper for DBEnv set_timeout method. * Updated README.txt * Added the DBEnv.set_timeout method. * code cleanup to use python 2.x features in .py files * the standalone pybsddb distribution will install a module called bsddb3 while the module included with python >= 2.3 will be known as bsddb. * Shared all .py and .c source with the Python project. * Fixed DBTxn objects to raise an exception if they are used after the underlying DB_TXN handle becomes invalid. (rather than potentially causing a segfault) * Fixed module to work when compiled against a python without thread support. * Do not attempt to double-close DB cursor's whos underlying DB has already been closed (fixes a segfault). * Close DB objects when DB.open fails to prevent an exception about databases still being open when calling DBEnv.close. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Make this work with DB 4.2 and bump PKGREVISION. @ text @d3 3 a5 31 --- src/_db.c.orig Sun Dec 22 03:44:32 2002 +++ src/_db.c @@@@ -745,7 +745,8 @@@@ DBCursor_dealloc(DBCursorObject* self) int err; if (self->dbc != NULL) { MYDB_BEGIN_ALLOW_THREADS; - err = self->dbc->c_close(self->dbc); + if (self->mydb->db != NULL) + err = self->dbc->c_close(self->dbc); self->dbc = NULL; MYDB_END_ALLOW_THREADS; } @@@@ -1071,7 +1072,9 @@@@ DB_associate(DBObject* self, PyObject* a * threads have already been initialized. * (see pybsddb-users mailing list post on 2002-08-07) */ +#ifdef WITH_THREAD PyEval_InitThreads(); +#endif MYDB_BEGIN_ALLOW_THREADS; #if (DBVER >= 41) err = self->db->associate(self->db, @@@@ -1620,6 +1623,7 @@@@ DB_open(DBObject* self, PyObject* args, #endif MYDB_END_ALLOW_THREADS; if (makeDBError(err)) { + self->db->close(self->db, 0); self->db = NULL; return NULL; } @@@@ -4214,7 +4218,11 @@@@ DL_EXPORT(void) init_db(void) d17 1 a17 1 @@@@ -4363,7 +4371,7 @@@@ DL_EXPORT(void) init_db(void) @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- src/_db.c.orig Sun Dec 22 00:44:32 2002 d5 1 a5 1 @@@@ -745,7 +745,8 @@@@ d15 1 a15 1 @@@@ -1071,7 +1072,9 @@@@ d25 1 a25 1 @@@@ -1620,6 +1623,7 @@@@ d33 21 @ 1.1.1.1 log @PyBSDDB 4.1.1, a Python extension module for Berkeley DB 3 and 4. This NetBSD package includes the patches from bug reports #667340, #667343, and #669533, which are in the SourceForge pybsddb3 CVS but not yet in the 4.1.1 release; hence PKGREVISION=1. @ text @@