rpms/db4/FC-5 db-4.3.29-sparc64.patch, NONE, 1.1 db-4.3.29-xa_leak.patch, NONE, 1.1 db4.spec, 1.33, 1.34

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/db4/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2273

Modified Files:
	db4.spec 
Added Files:
	db-4.3.29-sparc64.patch db-4.3.29-xa_leak.patch 
Log Message:
- fix memleak caused by SET_TXN macro in xa_db.c, when opening
  database created with DB_XA_CREATE flag (#204920)
- fix sparc64 build (#199358)


db-4.3.29-sparc64.patch:
 configure.ac |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE db-4.3.29-sparc64.patch ---
--- db-4.3.29/dist/configure.ac.BAD	2006-07-13 17:59:04.000000000 -0400
+++ db-4.3.29/dist/configure.ac	2006-07-13 17:59:32.000000000 -0400
@@ -291,11 +291,11 @@
 INSTALLER="\$(LIBTOOL) --mode=install cp -p"
 
 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
-MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} ${CFLAGS} -avoid-version"
+MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} ${CFLAGS}"
 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
-MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
-MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} ${CFLAGS} -avoid-version"
+MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} ${CFLAGS}"
 
 LIBTOOL="\$(SHELL) ./libtool"
 

db-4.3.29-xa_leak.patch:
 xa_db.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE db-4.3.29-xa_leak.patch ---
--- db-4.3.29/xa/xa_db.c.xa_leak	2004-01-28 04:36:40.000000000 +0100
+++ db-4.3.29/xa/xa_db.c	2006-09-03 11:09:00.000000000 +0200
@@ -41,8 +41,10 @@
 			(LOCAL) = (PARAM);				\
 		else if (__xa_get_txn(dbp->dbenv, &(LOCAL), 0) != 0)	\
 			(LOCAL) = NULL;					\
-		else if ((LOCAL) != NULL && (LOCAL)->txnid == TXN_INVALID) \
+		else if ((LOCAL) != NULL && (LOCAL)->txnid == TXN_INVALID) { \
+			__os_free(dbp->dbenv, (LOCAL));			\
 			(LOCAL) = NULL;					\
+		}							\
 	}								\
 }
 


Index: db4.spec
===================================================================
RCS file: /cvs/dist/rpms/db4/FC-5/db4.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- db4.spec	24 Mar 2006 11:33:11 -0000	1.33
+++ db4.spec	3 Sep 2006 10:12:34 -0000	1.34
@@ -11,12 +11,14 @@
 Summary: The Berkeley DB database library (version 4) for C.
 Name: db4
 Version: 4.3.29
-Release: 3.fc5
+Release: 7.fc5
 Source: http://www.sleepycat.com/update/%{version}/db-%{version}.tar.gz
 Source1: http://www.sleepycat.com/update/1.85/db.1.85.tar.gz
 Source2: nptl-abi-note.S
 Patch1: db-4.3.29-64bit.patch
 Patch2: db-4.2.52-gcj.patch
+Patch3: db-4.3.29-sparc64.patch
+Patch4: db-4.3.29-xa_leak.patch
 Patch10: http://www.sleepycat.com/update/1.85/patch.1.1
 Patch11: http://www.sleepycat.com/update/1.85/patch.1.2
 Patch12: http://www.sleepycat.com/update/1.85/patch.1.3
@@ -100,6 +102,8 @@
 %setup -q -n db-%{version} -a 1
 %patch1 -p1 -b .64bit
 %patch2 -p1 -b .gcj
+%patch3 -p1 -b .sparc64
+%patch4 -p1 -b .xa_leak
 
 pushd dist
 libtoolize --copy --force
@@ -351,6 +355,11 @@
 %endif
 
 %changelog
+* Sun Sep  3 2006 Jindrich Novy <jnovy at redhat.com> 4.3.29-7.fc5
+- fix memleak caused by SET_TXN macro in xa_db.c, when opening
+  database created with DB_XA_CREATE flag (#204920)
+- fix sparc64 build (#199358)
+
 * Fri Mar 24 2006 Jindrich Novy <jnovy at redhat.com> 4.3.29-3.fc5
 - release FC5 update
 - drop useless java, lfs patches