1 --- Python-2.5.2/setup.py.orig 2008-02-04 23:41:02.000000000 +0000
2 +++ Python-2.5.2/setup.py 2008-02-26 21:04:48.000000000 +0000
4 # a release. Most open source OSes come with one or more
5 # versions of BerkeleyDB already installed.
9 # NOTE: while the _bsddb.c code links against BerkeleyDB 4.6.x
10 # we leave that version disabled by default as it has proven to be
11 # quite a buggy library release on many platforms.
12 --- Python-2.5.2/Modules/_bsddb.c 2008-02-03 08:26:23.000000000 +0100
13 +++ Python-2.5.2/Modules/_bsddb.c 2008-06-12 22:46:09.099634000 +0200
14 @@ -4542,22 +4542,26 @@
20 + MAKE_ENTRY(cur_maxid);
25 MAKE_ENTRY(maxlockers);
26 MAKE_ENTRY(maxobjects);
28 MAKE_ENTRY(maxnlocks);
31 MAKE_ENTRY(maxnlockers);
34 MAKE_ENTRY(maxnobjects);
36 MAKE_ENTRY(nrequests);
37 MAKE_ENTRY(nreleases);
39 + MAKE_ENTRY(nupgrade);
40 + MAKE_ENTRY(ndowngrade);
43 MAKE_ENTRY(nnowaits); /* these were renamed in 4.4 */
44 MAKE_ENTRY(nconflicts);
45 @@ -4566,6 +4570,28 @@
46 MAKE_ENTRY(lock_wait);
48 MAKE_ENTRY(ndeadlocks);
50 + MAKE_ENTRY(locktimeout);
51 + MAKE_ENTRY(txntimeout);
54 + MAKE_ENTRY(nlocktimeouts);
55 + MAKE_ENTRY(ntxntimeouts);
58 + MAKE_ENTRY(objs_wait);
59 + MAKE_ENTRY(objs_nowait);
60 + MAKE_ENTRY(lockers_wait);
61 + MAKE_ENTRY(lockers_nowait);
63 + MAKE_ENTRY(lock_wait);
64 + MAKE_ENTRY(lock_nowait);
66 + MAKE_ENTRY(locks_wait);
67 + MAKE_ENTRY(locks_nowait);
69 + MAKE_ENTRY(hash_len);
72 MAKE_ENTRY(region_wait);
73 MAKE_ENTRY(region_nowait);
74 @@ -5335,11 +5361,17 @@
75 DBEnv_getattr(DBEnvObject* self, char *name)
77 if (!strcmp(name, "db_home")) {
78 + const char *home = NULL;
79 CHECK_ENV_NOT_CLOSED(self);
80 - if (self->db_env->db_home == NULL) {
82 + self->db_env->get_home(self->db_env, &home);
84 + home=self->db_env->db_home;
89 - return PyString_FromString(self->db_env->db_home);
90 + return PyString_FromString(home);
93 return Py_FindMethod(DBEnv_methods, (PyObject* )self, name);
94 @@ -5961,22 +5993,37 @@
95 ADD_INT(d, DB_TIME_NOTGRANTED);
96 ADD_INT(d, DB_TXN_NOT_DURABLE);
97 ADD_INT(d, DB_TXN_WRITE_NOSYNC);
98 - ADD_INT(d, DB_LOG_AUTOREMOVE);
99 - ADD_INT(d, DB_DIRECT_LOG);
100 ADD_INT(d, DB_DIRECT_DB);
101 ADD_INT(d, DB_INIT_REP);
102 ADD_INT(d, DB_ENCRYPT);
103 ADD_INT(d, DB_CHKSUM);
106 +#if (DBVER >= 42) && (DBVER < 47)
107 + ADD_INT(d, DB_LOG_AUTOREMOVE);
108 + ADD_INT(d, DB_DIRECT_LOG);
112 + ADD_INT(d, DB_LOG_DIRECT);
113 + ADD_INT(d, DB_LOG_DSYNC);
114 + ADD_INT(d, DB_LOG_IN_MEMORY);
115 + ADD_INT(d, DB_LOG_AUTO_REMOVE);
116 + ADD_INT(d, DB_LOG_ZERO);
120 - ADD_INT(d, DB_LOG_INMEMORY);
121 ADD_INT(d, DB_BUFFER_SMALL);
122 ADD_INT(d, DB_SEQ_DEC);
123 ADD_INT(d, DB_SEQ_INC);
124 ADD_INT(d, DB_SEQ_WRAP);
127 +#if (DBVER >= 43) && (DBVER < 47)
128 + ADD_INT(d, DB_LOG_INMEMORY);
129 + ADD_INT(d, DB_DSYNC_LOG);
133 ADD_INT(d, DB_ENCRYPT_AES);
134 ADD_INT(d, DB_AUTO_COMMIT);