[csw-devel] SF.net SVN: gar:[6620] csw/mgar/pkg

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Sep 30 15:42:33 CEST 2009


Revision: 6620
          http://gar.svn.sourceforge.net/gar/?rev=6620&view=rev
Author:   dmichelsen
Date:     2009-09-30 13:42:33 +0000 (Wed, 30 Sep 2009)

Log Message:
-----------
bdb42: Vastly upgrade manifest

Modified Paths:
--------------
    csw/mgar/pkg/bdb42/trunk/Makefile
    csw/mgar/pkg/bdb42/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/bdb42/
    csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff
    csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff
    csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff
    csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff
    csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff
    csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff

Removed Paths:
-------------
    csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.1.diff
    csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.2.diff
    csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.3.diff
    csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.4.diff
    csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.5.diff

Modified: csw/mgar/pkg/bdb42/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb44/trunk/Makefile	2009-09-27 22:55:14 UTC (rev 6593)
+++ csw/mgar/pkg/bdb42/trunk/Makefile	2009-09-30 13:42:33 UTC (rev 6620)
@@ -1,5 +1,5 @@
 GARNAME = db
-GARVERSION = 4.4.20
+GARVERSION = 4.2.52
 CATEGORIES = lib
 
 DESCRIPTION = embedded database libraries and utilities
@@ -16,7 +16,7 @@
 MASTER_SITES = http://download.oracle.com/berkeley-db/
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz 
 
-PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc
+PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -33,7 +33,7 @@
 
 CONFIGURE_SCRIPTS = dist
 
-prefix = $(BUILD_PREFIX)/bdb44
+prefix = $(BUILD_PREFIX)/bdb42
 docdir = $(BUILD_PREFIX)/share/doc
 
 CONFIGURE_ARGS  = $(DIRPATHS)
@@ -50,38 +50,38 @@
 CONFIGURE_ARGS += --with-tcl=$(libdir)
 endif
 
-FIXCONFIG_DIRS  = $(DESTDIR)$(prefix)/bdb44/lib
+FIXCONFIG_DIRS  = $(DESTDIR)$(prefix)/bdb42/lib
 
 # bdb tests are *very* time consuming
 TEST_SCRIPTS =
 
 NO_ISAEXEC = 1
 
-PACKAGES = CSWbdb44 CSWbdb44-devel CSWbdb44-doc
+PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc
 
-CATALOGNAME_CSWbdb44       = berkeleydb44
-CATALOGNAME_CSWbdb44-devel = berkeleydb44_devel
-CATALOGNAME_CSWbdb44-doc   = berkeleydb44_doc
+CATALOGNAME_CSWbdb42       = berkeleydb42
+CATALOGNAME_CSWbdb42-devel = berkeleydb42_devel
+CATALOGNAME_CSWbdb42-doc   = berkeleydb42_doc
 
-ARCHALL_CSWbdb44-doc = 1
+ARCHALL_CSWbdb42-doc = 1
 
-SPKG_DESC_CSWbdb44       = BerkeleyDB 4.4 embedded database libraries and utilities
-SPKG_DESC_CSWbdb44-devel = BerkeleyDB 4.4 development support
-SPKG_DESC_CSWbdb44-doc   = BerkeleyDB 4.4 documentation
+SPKG_DESC_CSWbdb42       = BerkeleyDB 4.2 embedded database libraries and utilities
+SPKG_DESC_CSWbdb42-devel = BerkeleyDB 4.2 development support
+SPKG_DESC_CSWbdb42-doc   = BerkeleyDB 4.2 documentation
 
-REQUIRED_PKGS_CSWbdb44-devel = CSWbdb44
-INCOMPATIBLE_PKGS_CSWbdb44-doc = CSWbdb44doc
+REQUIRED_PKGS_CSWbdb42-devel = CSWbdb42
+INCOMPATIBLE_PKGS_CSWbdb42-doc = CSWbdb42doc
 
 LICENSE = LICENSE
 
 # Leave the docs where they are for now
-#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p"
-#EXTRA_PAX_ARGS_isa-i386    = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p"
+#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p"
+#EXTRA_PAX_ARGS_isa-i386    = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p"
 
-#PKGFILES_CSWbdb44-doc = $(PKGFILES_DOC)
-PKGFILES_CSWbdb44-doc = $(prefix)/docs/.*
+#PKGFILES_CSWbdb42-doc = $(PKGFILES_DOC)
+PKGFILES_CSWbdb42-doc = $(prefix)/docs/.*
 
-PKGFILES_CSWbdb44-devel = $(PKGFILES_DEVEL)
+PKGFILES_CSWbdb42-devel = $(PKGFILES_DEVEL)
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/bdb42/trunk/checksums
===================================================================
--- csw/mgar/pkg/bdb44/trunk/checksums	2009-09-27 22:55:14 UTC (rev 6593)
+++ csw/mgar/pkg/bdb42/trunk/checksums	2009-09-30 13:42:33 UTC (rev 6620)
@@ -1,6 +1,7 @@
-d84dff288a19186b136b0daf7067ade3  download/db-4.4.20.tar.gz
-66584d621355df055b6e05b4a02e9c3e  download/patch.4.4.20.1.diff
-85df93a0867f6cace3501671cdeb6ed1  download/patch.4.4.20.2.diff
-88ee91889ebf5498b22b2e7bed945d41  download/patch.4.4.20.3.diff
-c2ef7b3e59460c35950fab5f2faa3fc0  download/patch.4.4.20.4.diff
-099621e0dad419188acd42c588242131  download/patch.4.4.20.5.diff
+8b5cff6eb83972afdd8e0b821703c33c  download/db-4.2.52.tar.gz
+1227f5f9ff43d48b5b1759e113a1c2d7  download/patch.4.2.52.1.diff
+3da7efd8d29919a9113e2f6f5166f5b7  download/patch.4.2.52.2.diff
+0bf9ebbe852652bed433e522928d40ec  download/patch.4.2.52.3.diff
+9cfeff4dce0c11372c0b04b134f8faef  download/patch.4.2.52.4.diff
+99836f962361da8936219cc193edc7ed  download/patch.4.2.52.5.diff
+d49545b2691c511276b73bb6c3ec64c3  download/patch.64bit-libtool.diff

Added: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff
===================================================================
--- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff	                        (rev 0)
+++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff	2009-09-30 13:42:33 UTC (rev 6620)
@@ -0,0 +1,36 @@
+*** mp/mp_fget.c.orig	25 Sep 2003 02:15:16 -0000	11.81
+--- mp/mp_fget.c	9 Dec 2003 19:06:28 -0000	11.82
+***************
+*** 440,446 ****
+  		c_mp->stat.st_pages--;
+  		alloc_bhp = NULL;
+  		R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]);
+- 		MUTEX_LOCK(dbenv, &hp->hash_mutex);
+  
+  		/*
+  		 * We can't use the page we found in the pool if DB_MPOOL_NEW
+--- 440,445 ----
+***************
+*** 455,460 ****
+--- 454,462 ----
+  			b_incr = 0;
+  			goto alloc;
+  		}
++ 
++ 		/* We can use the page -- get the bucket lock. */
++ 		MUTEX_LOCK(dbenv, &hp->hash_mutex);
+  		break;
+  	case SECOND_MISS:
+  		/*
+*** mp/mp_fput.c.orig	30 Sep 2003 17:12:00 -0000	11.48
+--- mp/mp_fput.c	13 Dec 2003 00:08:29 -0000	11.49
+***************
+*** 285,290 ****
+--- 285,291 ----
+  		    bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh))
+  			if (bhp->priority != UINT32_T_MAX &&
+  			    bhp->priority > MPOOL_BASE_DECREMENT)
++ 				bhp->priority -= MPOOL_BASE_DECREMENT;
+  		MUTEX_UNLOCK(dbenv, &hp->hash_mutex);
+  	}
+  }

Added: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff
===================================================================
--- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff	                        (rev 0)
+++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff	2009-09-30 13:42:33 UTC (rev 6620)
@@ -0,0 +1,45 @@
+*** lock/lock.c.save	2004-01-30 10:48:33.000000000 -0800
+--- lock/lock.c	2004-01-30 10:55:58.000000000 -0800
+***************
+*** 2216,2226 ****
+  					dp = (u_int8_t *)dp +		\
+  					    sizeof(db_pgno_t);		\
+  				} while (0)
+! #define COPY_OBJ(dp, obj)	do {					   \
+! 					memcpy(dp, obj->data, obj->size);  \
+! 					dp = (u_int8_t *)dp +		   \
+! 					     ALIGN(obj->size,		   \
+! 					     sizeof(u_int32_t)); 	   \
+  				} while (0)
+  
+  #define GET_COUNT(dp, count)	do {					\
+--- 2216,2227 ----
+  					dp = (u_int8_t *)dp +		\
+  					    sizeof(db_pgno_t);		\
+  				} while (0)
+! #define COPY_OBJ(dp, obj)	do {					\
+! 					memcpy(dp,			\
+! 					    (obj)->data, (obj)->size);  \
+! 					dp = (u_int8_t *)dp +		\
+! 					     ALIGN((obj)->size,		\
+! 					    sizeof(u_int32_t)); 	\
+  				} while (0)
+  
+  #define GET_COUNT(dp, count)	do {					\
+***************
+*** 2339,2345 ****
+  		for (i = 0; i < nlocks; i = j) {
+  			PUT_PCOUNT(dp, obj[i].ulen);
+  			PUT_SIZE(dp, obj[i].size);
+! 			COPY_OBJ(dp, obj);
+  			lock = (DB_LOCK_ILOCK *)obj[i].data;
+  			for (j = i + 1; j <= i + obj[i].ulen; j++) {
+  				lock = (DB_LOCK_ILOCK *)obj[j].data;
+--- 2340,2346 ----
+  		for (i = 0; i < nlocks; i = j) {
+  			PUT_PCOUNT(dp, obj[i].ulen);
+  			PUT_SIZE(dp, obj[i].size);
+! 			COPY_OBJ(dp, &obj[i]);
+  			lock = (DB_LOCK_ILOCK *)obj[i].data;
+  			for (j = i + 1; j <= i + obj[i].ulen; j++) {
+  				lock = (DB_LOCK_ILOCK *)obj[j].data;

Added: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff
===================================================================
--- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff	                        (rev 0)
+++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff	2009-09-30 13:42:33 UTC (rev 6620)
@@ -0,0 +1,247 @@
+--- java/src/com/sleepycat/db/DbEnv.java	2003-12-03 16:26:27.000000000 -0500
++++ java/src/com/sleepycat/db/DbEnv.java	2004-03-18 15:15:42.000000000 -0500
+@@ -61,7 +61,7 @@
+     // Internally, the JNI layer creates a global reference to each DbEnv,
+     // which can potentially be different to this.  We keep a copy here so
+     // we can clean up after destructors.
+-    private Object dbenv_ref;
++    private long dbenv_ref;
+     private DbAppDispatch app_dispatch_handler;
+     private DbEnvFeedbackHandler env_feedback_handler;
+     private DbErrorHandler error_handler;
+@@ -94,7 +94,7 @@
+     void cleanup() {
+         swigCPtr = 0;
+         db_java.deleteRef0(dbenv_ref);
+-        dbenv_ref = null;
++        dbenv_ref = 0L;
+     }
+ 
+ 
+--- java/src/com/sleepycat/db/Db.java	2003-12-03 16:26:25.000000000 -0500
++++ java/src/com/sleepycat/db/Db.java	2004-03-18 15:15:55.000000000 -0500
+@@ -57,7 +57,7 @@
+     // Internally, the JNI layer creates a global reference to each Db,
+     // which can potentially be different to this.  We keep a copy here so
+     // we can clean up after destructors.
+-    private Object db_ref;
++    private long db_ref;
+     private DbEnv dbenv;
+     private boolean private_dbenv;
+     private DbAppendRecno append_recno_handler;
+@@ -84,7 +84,7 @@
+     private void cleanup() {
+         swigCPtr = 0;
+         db_java.deleteRef0(db_ref);
+-        db_ref = null;
++        db_ref = 0L;
+         if (private_dbenv) {
+             dbenv.cleanup();
+         }
+--- java/src/com/sleepycat/db/db_java.java	2003-12-03 16:10:54.000000000 -0500
++++ java/src/com/sleepycat/db/db_java.java	2004-03-18 15:17:24.000000000 -0500
+@@ -14,15 +14,15 @@
+     db_javaJNI.DbEnv_lock_vec(DbEnv.getCPtr(dbenv), locker, flags, list, offset, nlist);
+   }
+ 
+-   static Object initDbEnvRef0(DbEnv self, Object handle) {
++   static long initDbEnvRef0(DbEnv self, Object handle) {
+     return db_javaJNI.initDbEnvRef0(DbEnv.getCPtr(self), handle);
+   }
+ 
+-   static Object initDbRef0(Db self, Object handle) {
++   static long initDbRef0(Db self, Object handle) {
+     return db_javaJNI.initDbRef0(Db.getCPtr(self), handle);
+   }
+ 
+-   static void deleteRef0(Object ref) {
++   static void deleteRef0(long ref) {
+     db_javaJNI.deleteRef0(ref);
+   }
+ 
+--- java/src/com/sleepycat/db/db_javaJNI.java	2003-12-03 16:10:55.000000000 -0500
++++ java/src/com/sleepycat/db/db_javaJNI.java	2004-03-18 15:16:18.000000000 -0500
+@@ -45,9 +45,9 @@
+ 	static native final void initialize();
+ 
+   public final static native void DbEnv_lock_vec(long jarg1, int jarg2, int jarg3, DbLockRequest[] jarg4, int jarg5, int jarg6) throws DbException;
+-   final static native Object initDbEnvRef0(long jarg1, Object jarg2);
+-   final static native Object initDbRef0(long jarg1, Object jarg2);
+-   final static native void deleteRef0(Object jarg1);
++   final static native long initDbEnvRef0(long jarg1, Object jarg2);
++   final static native long initDbRef0(long jarg1, Object jarg2);
++   final static native void deleteRef0(long jarg1);
+    final static native long getDbEnv0(long jarg1);
+   public final static native long new_Db(long jarg1, int jarg2) throws DbException;
+   public final static native void Db_associate(long jarg1, long jarg2, long jarg3, DbSecondaryKeyCreate jarg4, int jarg5) throws DbException;
+--- libdb_java/db_java.i	2003-11-17 15:00:52.000000000 -0500
++++ libdb_java/db_java.i	2004-03-18 09:21:14.000000000 -0500
+@@ -53,7 +53,7 @@
+ 	// Internally, the JNI layer creates a global reference to each DbEnv,
+ 	// which can potentially be different to this.  We keep a copy here so
+ 	// we can clean up after destructors.
+-	private Object dbenv_ref;
++	private long dbenv_ref;
+ 	private DbAppDispatch app_dispatch_handler;
+ 	private DbEnvFeedbackHandler env_feedback_handler;
+ 	private DbErrorHandler error_handler;
+@@ -76,7 +76,7 @@
+ 	void cleanup() {
+ 		swigCPtr = 0;
+ 		db_java.deleteRef0(dbenv_ref);
+-		dbenv_ref = null;
++		dbenv_ref = 0L;
+ 	}
+ 
+ 	public synchronized void close(int flags) throws DbException {
+@@ -220,7 +220,7 @@
+ 	// Internally, the JNI layer creates a global reference to each Db,
+ 	// which can potentially be different to this.  We keep a copy here so
+ 	// we can clean up after destructors.
+-	private Object db_ref;
++	private long db_ref;
+ 	private DbEnv dbenv;
+ 	private boolean private_dbenv;
+ 	private DbAppendRecno append_recno_handler;
+@@ -245,7 +245,7 @@
+ 	private void cleanup() {
+ 		swigCPtr = 0;
+ 		db_java.deleteRef0(db_ref);
+-		db_ref = null;
++		db_ref = 0L;
+ 		if (private_dbenv)
+ 			dbenv.cleanup();
+ 		dbenv = null;
+@@ -503,46 +503,42 @@
+ 	}
+ %}
+ 
+-%native(initDbEnvRef0) jobject initDbEnvRef0(DB_ENV *self, void *handle);
+-%native(initDbRef0) jobject initDbRef0(DB *self, void *handle);
+-%native(deleteRef0) void deleteRef0(jobject ref);
++%native(initDbEnvRef0) jlong initDbEnvRef0(DB_ENV *self, void *handle);
++%native(initDbRef0) jlong initDbRef0(DB *self, void *handle);
++%native(deleteRef0) void deleteRef0(jlong ref);
+ %native(getDbEnv0) DB_ENV *getDbEnv0(DB *self);
+ 
+ %{
+-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0(
++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0(
+     JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) {
+ 	DB_ENV *self = *(DB_ENV **)&jarg1;
++	jlong ret;
+ 	COMPQUIET(jcls, NULL);
+ 
+ 	DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2);
+ 	self->set_errpfx(self, (const char*)self);
+-	return (jobject)DB_ENV_INTERNAL(self);
++	*(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self);
++	return (ret);
+ }
+ 
+-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0(
++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0(
+     JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) {
+ 	DB *self = *(DB **)&jarg1;
++	jlong ret;
+ 	COMPQUIET(jcls, NULL);
+ 
+ 	DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2);
+-	return (jobject)DB_INTERNAL(self);
++	*(jobject *)&ret = (jobject)DB_INTERNAL(self);
++	return (ret);
+ }
+ 
+ JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0(
+-    JNIEnv *jenv, jclass jcls, jobject jref) {
+-	COMPQUIET(jcls, NULL);
+-
+-	if (jref != NULL)
+-		(*jenv)->DeleteGlobalRef(jenv, jref);
+-}
+-
+-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0(
+     JNIEnv *jenv, jclass jcls, jlong jarg1) {
+-	DB *self = *(DB **)&jarg1;
++	jobject jref = *(jobject *)&jarg1;
+ 	COMPQUIET(jcls, NULL);
+-	COMPQUIET(jenv, NULL);
+ 
+-	return (jobject)DB_INTERNAL(self);
++	if (jref != 0L)
++		(*jenv)->DeleteGlobalRef(jenv, jref);
+ }
+ 
+ JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0(
+@@ -554,7 +550,7 @@
+ 	COMPQUIET(jcls, NULL);
+ 
+ 	*(DB_ENV **)&env_cptr = self->dbenv;
+-	return env_cptr;
++	return (env_cptr);
+ }
+ 
+ JNIEXPORT jboolean JNICALL
+--- libdb_java/db_java_wrap.c	2003-12-03 16:10:36.000000000 -0500
++++ libdb_java/db_java_wrap.c	2004-03-18 12:18:58.000000000 -0500
+@@ -1192,40 +1192,36 @@
+ }
+ 
+ 
+-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0(
++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0(
+     JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) {
+ 	DB_ENV *self = *(DB_ENV **)&jarg1;
++	jlong ret;
+ 	COMPQUIET(jcls, NULL);
+ 
+ 	DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2);
+ 	self->set_errpfx(self, (const char*)self);
+-	return (jobject)DB_ENV_INTERNAL(self);
++	*(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self);
++	return (ret);
+ }
+ 
+-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0(
++JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0(
+     JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) {
+ 	DB *self = *(DB **)&jarg1;
++	jlong ret;
+ 	COMPQUIET(jcls, NULL);
+ 
+ 	DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2);
+-	return (jobject)DB_INTERNAL(self);
++	*(jobject *)&ret = (jobject)DB_INTERNAL(self);
++	return (ret);
+ }
+ 
+ JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0(
+-    JNIEnv *jenv, jclass jcls, jobject jref) {
+-	COMPQUIET(jcls, NULL);
+-
+-	if (jref != NULL)
+-		(*jenv)->DeleteGlobalRef(jenv, jref);
+-}
+-
+-JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0(
+     JNIEnv *jenv, jclass jcls, jlong jarg1) {
+-	DB *self = *(DB **)&jarg1;
++	jobject jref = *(jobject *)&jarg1;
+ 	COMPQUIET(jcls, NULL);
+-	COMPQUIET(jenv, NULL);
+ 
+-	return (jobject)DB_INTERNAL(self);
++	if (jref != 0L)
++		(*jenv)->DeleteGlobalRef(jenv, jref);
+ }
+ 
+ JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0(
+@@ -1237,7 +1233,7 @@
+ 	COMPQUIET(jcls, NULL);
+ 
+ 	*(DB_ENV **)&env_cptr = self->dbenv;
+-	return env_cptr;
++	return (env_cptr);
+ }
+ 
+ JNIEXPORT jboolean JNICALL

Added: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff
===================================================================
--- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff	                        (rev 0)
+++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff	2009-09-30 13:42:33 UTC (rev 6620)
@@ -0,0 +1,36 @@
+*** btree/bt_rec.c.orig	Tue Mar 22 09:41:49 2005
+--- btree/bt_rec.c	Tue Mar 22 09:42:11 2005
+***************
+*** 222,228 ****
+  		 * previous-page pointer updated to our new page.  The next
+  		 * page must exist because we're redoing the operation.
+  		 */
+! 		if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) {
+  			if ((ret =
+  			    __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) {
+  				ret = __db_pgerr(file_dbp, argp->npgno, ret);
+--- 222,228 ----
+  		 * previous-page pointer updated to our new page.  The next
+  		 * page must exist because we're redoing the operation.
+  		 */
+! 		if (!rootsplit && argp->npgno != PGNO_INVALID) {
+  			if ((ret =
+  			    __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) {
+  				ret = __db_pgerr(file_dbp, argp->npgno, ret);
+***************
+*** 294,300 ****
+  		 * possible that the next-page never existed, we ignore it as
+  		 * if there's nothing to undo.
+  		 */
+! 		if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) {
+  			if ((ret =
+  			    __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) {
+  				np = NULL;
+--- 294,300 ----
+  		 * possible that the next-page never existed, we ignore it as
+  		 * if there's nothing to undo.
+  		 */
+! 		if (!rootsplit && argp->npgno != PGNO_INVALID) {
+  			if ((ret =
+  			    __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) {
+  				np = NULL;

Added: csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff
===================================================================
--- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff	                        (rev 0)
+++ csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff	2009-09-30 13:42:33 UTC (rev 6620)
@@ -0,0 +1,24 @@
+*** mp/mp_fget.c.orig	2003-09-25 08:29:02.000000000 -0700
+--- mp/mp_fget.c	2006-05-26 14:58:02.246963204 -0700
+***************
+*** 553,560 ****
+  	 */
+  	if (state != SECOND_MISS && bhp->ref == 1) {
+  		bhp->priority = UINT32_T_MAX;
+! 		SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
+! 		SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
+  		hp->hash_priority =
+  		    SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
+  	}
+--- 553,563 ----
+  	 */
+  	if (state != SECOND_MISS && bhp->ref == 1) {
+  		bhp->priority = UINT32_T_MAX;
+! 		if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) !=
+! 		     SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) {
+! 			SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
+! 			SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
+! 		}
+  		hp->hash_priority =
+  		    SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
+  	}

Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.1.diff
===================================================================
--- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.1.diff	2009-09-27 22:55:14 UTC (rev 6593)
+++ csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.1.diff	2009-09-30 13:42:33 UTC (rev 6620)
@@ -1,27 +0,0 @@
-*** qam/qam_files.c.orig	2005-10-20 11:57:12.000000000 -0700
---- qam/qam_files.c	2006-01-27 13:38:38.000000000 -0800
-***************
-*** 411,416 ****
---- 411,422 ----
-  	    DB_APP_DATA, buf, 0, NULL, &real_name)) != 0)
-  		goto err;
-  #endif
-+ 
-+ 	mpf = array->mpfarray[offset].mpf;
-+ 	/* This extent my already be marked for delete and closed. */
-+ 	if (mpf == NULL)
-+ 		goto err;
-+ 
-  	/*
-  	 * The log must be flushed before the file is deleted.  We depend on
-  	 * the log record of the last delete to recreate the file if we crash.
-***************
-*** 418,424 ****
-  	if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0)
-  		goto err;
-  
-- 	mpf = array->mpfarray[offset].mpf;
-  	(void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1);
-  	/* Someone could be real slow, let them close it down. */
-  	if (array->mpfarray[offset].pinref != 0)
---- 424,429 ----

Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.2.diff
===================================================================
--- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.2.diff	2009-09-27 22:55:14 UTC (rev 6593)
+++ csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.2.diff	2009-09-30 13:42:33 UTC (rev 6620)
@@ -1,29 +0,0 @@
-*** txn/txn.c.orig	Tue Nov  1 06:50:03 2005
---- txn/txn.c	Tue Jan 31 15:05:13 2006
-***************
-*** 1049,1060 ****
---- 1049,1062 ----
-  		return (ret);
-  	memcpy(txn->name, name, len);
-  
-+ 	TXN_SYSTEM_LOCK(dbenv);
-  	if (td->name != INVALID_ROFF) {
-  		__db_shalloc_free(
-  		    &mgr->reginfo, R_ADDR(&mgr->reginfo, td->name));
-  		td->name = INVALID_ROFF;
-  	}
-  	if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) {
-+ 		TXN_SYSTEM_UNLOCK(dbenv);
-  		__db_err(dbenv,
-  		    "Unable to allocate memory for transaction name");
-  
-***************
-*** 1063,1068 ****
---- 1065,1071 ----
-  
-  		return (ret);
-  	}
-+ 	TXN_SYSTEM_UNLOCK(dbenv);
-  	td->name = R_OFFSET(&mgr->reginfo, p);
-  	memcpy(p, name, len);
-  

Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.3.diff
===================================================================
--- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.3.diff	2009-09-27 22:55:14 UTC (rev 6593)
+++ csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.3.diff	2009-09-30 13:42:33 UTC (rev 6620)
@@ -1,49 +0,0 @@
-*** db/db_cam.c.orig	2006-01-11 03:19:21.000000000 +1100
---- db/db_cam.c	2006-03-01 13:59:01.000000000 +1100
-***************
-*** 579,589 ****
-  	    flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) {
-  		if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0)
-  			return (ret);
-! 		if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0)
-  			return (ret);
-  
-! 		switch (ret =
-! 		    opd->c_am_get(opd, key, data, flags, NULL)) {
-  		case 0:
-  			goto done;
-  		case DB_NOTFOUND:
---- 579,590 ----
-  	    flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) {
-  		if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0)
-  			return (ret);
-! 		if (F_ISSET(dbc_arg, DBC_TRANSIENT))
-! 			opd = cp->opd;
-! 		else if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0)
-  			return (ret);
-  
-! 		switch (ret = opd->c_am_get(opd, key, data, flags, NULL)) {
-  		case 0:
-  			goto done;
-  		case DB_NOTFOUND:
-***************
-*** 596,607 ****
---- 597,614 ----
-  				if ((ret = __db_c_close(opd)) != 0)
-  					goto err;
-  				opd = NULL;
-+ 				if (F_ISSET(dbc_arg, DBC_TRANSIENT))
-+ 					cp->opd = NULL;
-  				break;
-  			}
-  			goto err;
-  		default:
-  			goto err;
-  		}
-+ 	} else if (cp->opd != NULL && F_ISSET(dbc_arg, DBC_TRANSIENT)) {
-+ 		if ((ret = __db_c_close(cp->opd)) != 0)
-+ 			goto err;
-+ 		cp->opd = NULL;
-  	}
-  
-  	/*

Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.4.diff
===================================================================
--- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.4.diff	2009-09-27 22:55:14 UTC (rev 6593)
+++ csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.4.diff	2009-09-30 13:42:33 UTC (rev 6620)
@@ -1,24 +0,0 @@
-*** mp/mp_fget.c.orig	2005-10-12 10:53:36.000000000 -0700
---- mp/mp_fget.c	2006-05-30 20:48:10.000000000 -0700
-***************
-*** 587,594 ****
-  	 */
-  	if (state != SECOND_MISS && bhp->ref == 1) {
-  		bhp->priority = UINT32_MAX;
-! 		SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
-! 		SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
-  		hp->hash_priority =
-  		    SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority;
-  	}
---- 587,597 ----
-  	 */
-  	if (state != SECOND_MISS && bhp->ref == 1) {
-  		bhp->priority = UINT32_MAX;
-! 		if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) !=
-! 		     SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) {
-! 			SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
-! 			SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
-! 		}
-  		hp->hash_priority =
-  		    SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority;
-  	}

Deleted: csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.5.diff
===================================================================
--- csw/mgar/pkg/bdb44/trunk/files/patch.4.4.20.5.diff	2009-09-27 22:55:14 UTC (rev 6593)
+++ csw/mgar/pkg/bdb42/trunk/files/patch.4.4.20.5.diff	2009-09-30 13:42:33 UTC (rev 6620)
@@ -1,13 +0,0 @@
-diff -Naur db-4.4.20.orig/dist/ltmain.sh db-4.4.20/dist/ltmain.sh
---- dist/ltmain.sh	2005-10-17 16:35:53.000000000 +0200
-+++ dist/ltmain.sh	2008-05-14 08:30:26.766534000 +0200
-@@ -1552,9 +1552,7 @@
- 	esac
-         compile_command="$compile_command $arg"
-         finalize_command="$finalize_command $arg"
--        if test "$with_gcc" = "yes" ; then
-           compiler_flags="$compiler_flags $arg"
--        fi
-         continue
-         ;;
- 

Added: csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff
===================================================================
--- csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff	                        (rev 0)
+++ csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff	2009-09-30 13:42:33 UTC (rev 6620)
@@ -0,0 +1,22 @@
+diff -Naur db-4.2.52.orig/dist/ltmain.sh db-4.2.52.patched/dist/ltmain.sh
+--- dist/ltmain.sh	2003-04-26 19:45:37.000000000 +0200
++++ dist/ltmain.sh	2009-09-30 15:15:43.792423773 +0200
+@@ -1298,7 +1298,7 @@
+       # but this is not reliable with gcc because gcc may use -mfoo to
+       # select a different linker, different libraries, etc, while
+       # -Wl,-mfoo simply passes -mfoo to the linker.
+-      -m*)
++      -m*|-xarch=*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+ 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+@@ -1309,9 +1309,7 @@
+ 	esac
+         compile_command="$compile_command $arg"
+         finalize_command="$finalize_command $arg"
+-        if test "$with_gcc" = "yes" ; then
+           compiler_flags="$compiler_flags $arg"
+-        fi
+         continue
+         ;;
+ 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list