diff options
| author | gson <gson@pkgsrc.org> | 2003-01-17 19:26:04 +0000 |
|---|---|---|
| committer | gson <gson@pkgsrc.org> | 2003-01-17 19:26:04 +0000 |
| commit | 5963b4e9a2d34b3dde5ef5c93e02bb3c4155b8ba (patch) | |
| tree | 7dea0c1f53cbc0d47d3e420c407426dcc2235e8e /databases/py-bsddb3/patches | |
| parent | 90c0cd534f4d719a8872049e86e5acedf721f204 (diff) | |
| download | pkgsrc-5963b4e9a2d34b3dde5ef5c93e02bb3c4155b8ba.tar.gz | |
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.
Diffstat (limited to 'databases/py-bsddb3/patches')
| -rw-r--r-- | databases/py-bsddb3/patches/patch-aa | 18 | ||||
| -rw-r--r-- | databases/py-bsddb3/patches/patch-ab | 32 |
2 files changed, 50 insertions, 0 deletions
diff --git a/databases/py-bsddb3/patches/patch-aa b/databases/py-bsddb3/patches/patch-aa new file mode 100644 index 00000000000..a95a920d21a --- /dev/null +++ b/databases/py-bsddb3/patches/patch-aa @@ -0,0 +1,18 @@ +$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 19:26:04 gson Exp $ + +--- setup.py.orig Sun Dec 22 00:44:30 2002 ++++ setup.py +@@ -70,10 +70,10 @@ + sys.exit(1) + + # figure out from the base setting where the lib and .h are +- if not incdir: incdir = os.path.join(BERKELEYDB_DIR, 'include') ++ if not incdir: incdir = os.path.join(BERKELEYDB_DIR, 'include/db4') + if not libdir: libdir = os.path.join(BERKELEYDB_DIR, 'lib') +- if not '-ldb' in LIBS: +- libname = ['db'] ++ if not '-ldb4' in LIBS: ++ libname = ['db4'] + else: + libname = [] + utils = [] diff --git a/databases/py-bsddb3/patches/patch-ab b/databases/py-bsddb3/patches/patch-ab new file mode 100644 index 00000000000..d86796816cf --- /dev/null +++ b/databases/py-bsddb3/patches/patch-ab @@ -0,0 +1,32 @@ +$NetBSD: patch-ab,v 1.1.1.1 2003/01/17 19:26:04 gson Exp $ + +--- src/_db.c.orig Sun Dec 22 00:44:32 2002 ++++ src/_db.c +@@ -745,7 +745,8 @@ + 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 @@ + * 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 @@ + #endif + MYDB_END_ALLOW_THREADS; + if (makeDBError(err)) { ++ self->db->close(self->db, 0); + self->db = NULL; + return NULL; + } |