rpms/compat-db/devel db-4.3.29-64bit.patch, NONE, 1.1 db-4.3.29-sparc64.patch, NONE, 1.1 patch.4.2.52.3, NONE, 1.1 patch.4.2.52.4, NONE, 1.1 patch.4.2.52.5, NONE, 1.1 patch.4.3.29.1, NONE, 1.1 .cvsignore, 1.10, 1.11 compat-db.spec, 1.20, 1.21 db4-db_load.patch, 1.1, 1.2 sources, 1.10, 1.11 db-3.1.17-tcl.patch, 1.1, NONE db.1.85.nodebug.patch, 1.1, NONE db.1.85.patch, 1.1, NONE db.1.85.s390.patch, 1.1, NONE db2-2.4.14-db2.patch, 1.1, NONE db2-2.4.14-fileid_64bit_fix.patch, 1.1, NONE db2-2.4.14-nodebug.patch, 1.1, NONE db2-2.4.14-s390.patch, 1.1, NONE db2-build.patch, 1.1, NONE db2-glibc-2.1.3.patch, 1.1, NONE db4-4.0.14-configure.patch, 1.1, NONE db4-4.0.14-recover.patch, 1.1, NONE patch.3.2.9.1, 1.1, NONE patch.3.2.9.2, 1.1, NONE patch.3.3.11.1, 1.1, NONE patch.3.3.11.2, 1.1, NONE patch.4.1.25.1, 1.1, NONE patch.4.1.25.2, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Nov 10 18:17:07 UTC 2006
Author: jnovy
Update of /cvs/dist/rpms/compat-db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3122
Modified Files:
.cvsignore compat-db.spec db4-db_load.patch sources
Added Files:
db-4.3.29-64bit.patch db-4.3.29-sparc64.patch patch.4.2.52.3
patch.4.2.52.4 patch.4.2.52.5 patch.4.3.29.1
Removed Files:
db-3.1.17-tcl.patch db.1.85.nodebug.patch db.1.85.patch
db.1.85.s390.patch db2-2.4.14-db2.patch
db2-2.4.14-fileid_64bit_fix.patch db2-2.4.14-nodebug.patch
db2-2.4.14-s390.patch db2-build.patch db2-glibc-2.1.3.patch
db4-4.0.14-configure.patch db4-4.0.14-recover.patch
patch.3.2.9.1 patch.3.2.9.2 patch.3.3.11.1 patch.3.3.11.2
patch.4.1.25.1 patch.4.1.25.2
Log Message:
- add 4.3.29 and remove 4.1.25
- spec reduction diet, remove old unapplied patches
- apply patches 3-5 with upstream fixes for 4.2.52
- apply first upstream fix patch for 4.3.29
- all patches/sources now point to correct URLs
- ship headers for db-4.3.29
db-4.3.29-64bit.patch:
db185.c | 16 ++++++++++++++--
db185_int.in | 8 ++++----
2 files changed, 18 insertions(+), 6 deletions(-)
--- NEW FILE db-4.3.29-64bit.patch ---
diff -ruN db-4.3.29-orig/db185/db185.c db-4.3.29/db185/db185.c
--- db-4.3.29-orig/db185/db185.c 2004-03-24 22:00:24.000000000 +0100
+++ db-4.3.29/db185/db185.c 2006-03-13 17:17:47.000000000 +0100
@@ -546,7 +546,13 @@
DB *dbp;
const DBT *a, *b;
{
- return (((DB185 *)dbp->api_internal)->compare(a, b));
+ DBT185 a185, b185;
+ a185.data = a->data;
+ a185.size = a->size;
+ b185.data = b->data;
+ b185.size = b->size;
+
+ return (((DB185 *)dbp->api_internal)->compare(&a185, &b185));
}
/*
@@ -558,7 +564,13 @@
DB *dbp;
const DBT *a, *b;
{
- return (((DB185 *)dbp->api_internal)->prefix(a, b));
+ DBT185 a185, b185;
+ a185.data = a->data;
+ a185.size = a->size;
+ b185.data = b->data;
+ b185.size = b->size;
+
+ return (((DB185 *)dbp->api_internal)->prefix(&a185, &b185));
}
/*
diff -ruN db-4.3.29-orig/db185/db185_int.in db-4.3.29/db185/db185_int.in
--- db-4.3.29-orig/db185/db185_int.in 2004-01-28 04:35:59.000000000 +0100
+++ db-4.3.29/db185/db185_int.in 2006-03-13 17:17:47.000000000 +0100
@@ -82,8 +82,8 @@
*/
DBC *dbc; /* DB cursor. */
/* Various callback functions. */
- int (*compare) __P((const DBT *, const DBT *));
- size_t (*prefix) __P((const DBT *, const DBT *));
+ int (*compare) __P((const DBT185 *, const DBT185 *));
+ size_t (*prefix) __P((const DBT185 *, const DBT185 *));
u_int32_t (*hash) __P((const void *, size_t));
} DB185;
@@ -96,9 +96,9 @@
u_int32_t minkeypage; /* minimum keys per page */
u_int32_t psize; /* page size */
int (*compare) /* comparison function */
- __P((const DBT *, const DBT *));
+ __P((const DBT185 *, const DBT185 *));
size_t (*prefix) /* prefix function */
- __P((const DBT *, const DBT *));
+ __P((const DBT185 *, const DBT185 *));
int lorder; /* byte order */
} BTREEINFO;
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"
--- NEW FILE patch.4.2.52.3 ---
--- 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
--- NEW FILE patch.4.2.52.4 ---
*** 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;
--- NEW FILE patch.4.2.52.5 ---
*** 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;
}
--- NEW FILE patch.4.3.29.1 ---
*** mp/mp_fget.c.orig 2006-05-30 20:44:11.000000000 -0700
--- mp/mp_fget.c 2006-05-30 20:44:22.000000000 -0700
***************
*** 577,584 ****
*/
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_FIRST(&hp->hash_bucket, __bh)->priority;
}
--- 577,587 ----
*/
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_FIRST(&hp->hash_bucket, __bh)->priority;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/compat-db/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 12 Nov 2004 22:31:47 -0000 1.10
+++ .cvsignore 10 Nov 2006 18:17:05 -0000 1.11
@@ -1,2 +1,3 @@
db-4.2.52.tar.gz
db-4.1.25.tar.gz
+db-4.3.29.tar.gz
Index: compat-db.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-db/devel/compat-db.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- compat-db.spec 12 Jul 2006 04:51:15 -0000 1.20
+++ compat-db.spec 10 Nov 2006 18:17:05 -0000 1.21
@@ -1,45 +1,39 @@
-# Compatibility with legacy rpm.
-%{!?_lib:%define _lib lib}
-
-%ifnarch ia64
-Conflicts: glibc < 2.1.90
-%endif
-
-%define db1_versions 1.85
-%define db2_versions 2
-%define db3_versions 3.3.11
-%define db4_versions 4.1.25 4.2.52
+%define db4_versions 4.2.52 4.3.29
%define _libdb_a libdb-${soversion}.a
%define _libcxx_a libdb_cxx-${soversion}.a
Summary: The Berkeley DB database library for Red Hat Linux 7.x compatibility.
Name: compat-db
-Version: 4.2.52
-Release: 5.1
-# Tarball taken from glibc 2.1.3
-#Source0: http://www.sleepycat.com/update/2.7.7/db-2.7.7.tar.gz
-Source0: http://www.sleepycat.com/update/4.1.25/db-4.1.25.tar.gz
-Source1: http://www.sleepycat.com/update/4.2.52/db-4.2.52.tar.gz
+Version: 4.3.29
+Release: 1%{?dist}
+Source0: http://download.oracle.com/berkeley-db/db-4.2.52.tar.gz
+Source1: http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz
Patch1: db4-db_load.patch
+Patch2: db-4.3.29-64bit.patch
+Patch3: db-4.3.29-sparc64.patch
-Patch17: patch.4.1.25.1
-Patch18: patch.4.1.25.2
+# Upstream db-4.2.52 patches
+Patch10: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.1
+Patch11: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.2
+Patch12: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.3
+Patch13: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.4
+Patch14: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.5
-Patch25: patch.4.2.52.1
-Patch26: patch.4.2.52.2
+# Upstream db-4.3.29 patches
+Patch20: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.3.29.1
Obsoletes: db1, db1-devel
Obsoletes: db2, db2-devel, db2-utils
Obsoletes: db3, db3-devel, db3-utils
Obsoletes: db31, db32, db3x
-Obsoletes: db4 < 4.3, db4-devel < 4.3, db4-utils < 4.3, db4-tcl < 4.3, db4-java < 4.3
-URL: http://www.sleepycat.com/
+Obsoletes: db4 < 4.4, db4-devel < 4.4, db4-utils < 4.4, db4-tcl < 4.4, db4-java < 4.4
+URL: http://www.oracle.com/database/berkeley-db/
License: BSDish
Group: System Environment/Libraries
BuildPreReq: findutils, libtool, perl, sed, ed
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
@@ -52,14 +46,18 @@
%patch1 -p1 -b .db-load
-pushd db-4.1.25
-%patch17 -p0
-%patch18 -p0
+pushd db-4.2.52
+%patch10 -p0
+%patch11 -p0
+%patch12 -p0
+%patch13 -p0
+%patch14 -p0
popd
-pushd db-4.2.52
-%patch25 -p0
-%patch26 -p0
+pushd db-4.3.29
+%patch2 -p1 -b .64bit
+%patch3 -p1 -b .sparc64
+%patch20 -p0
popd
mkdir docs
@@ -128,6 +126,12 @@
popd
done
+# Nuke non-versioned symlinks
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/libdb-4.so
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/libdb.so
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/libdb_cxx-4.so
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/libdb_cxx.so
+
# Make sure all shared libraries have the execute bit set.
chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/libdb*.so*
@@ -140,11 +144,13 @@
%endif
# Remove unpackaged files.
-rm -f ${RPM_BUILD_ROOT}%{_includedir}/*
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
rm -fr ${RPM_BUILD_ROOT}%{_libdir}/*.la
rm -fr ${RPM_BUILD_ROOT}%{_prefix}/docs/
+# Move headers for 4.3.29 to special directory to avoid conflicts
+mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/db%{version}
+mv ${RPM_BUILD_ROOT}%{_includedir}/*.h ${RPM_BUILD_ROOT}%{_includedir}/db%{version}
+
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -172,8 +178,17 @@
%{_bindir}/db*_stat
%{_bindir}/db*_upgrade
%{_bindir}/db*_verify
+%{_includedir}/*
%changelog
+* Fri Nov 10 2006 Jindrich Novy <jnovy at redhat.com> 4.3.29-1
+- add 4.3.29 and remove 4.1.25
+- spec reduction diet, remove old unapplied patches
+- apply patches 3-5 with upstream fixes for 4.2.52
+- apply first upstream fix patch for 4.3.29
+- all patches/sources now point to correct URLs
+- ship headers for db-4.3.29
+
* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.2.52-5.1
- rebuild
db4-db_load.patch:
build_vxworks/db_load/db_load.c | 2 +-
db_load/db_load.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: db4-db_load.patch
===================================================================
RCS file: /cvs/dist/rpms/compat-db/devel/db4-db_load.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- db4-db_load.patch 14 Feb 2006 14:09:06 -0000 1.1
+++ db4-db_load.patch 10 Nov 2006 18:17:05 -0000 1.2
@@ -1,14 +1,3 @@
---- compat-db-4.2.52/db-4.1.25/db_load/db_load.c.db_load 2002-08-08 06:26:54.000000000 +0200
-+++ compat-db-4.2.52/db-4.1.25/db_load/db_load.c 2006-02-14 14:53:35.000000000 +0100
-@@ -895,7 +895,7 @@ convprintable(dbenv, instr, outstrp)
- continue;
- }
- c = digitize(dbenv, *instr, &e1) << 4;
-- c |= digitize(dbenv, *++instr, &e2);
-+ c |= digitize(dbenv, *(++instr), &e2);
- if (e1 || e2) {
- badend(dbenv);
- return (EINVAL);
--- compat-db-4.2.52/db-4.2.52/db_load/db_load.c.db_load 2003-10-16 19:51:08.000000000 +0200
+++ compat-db-4.2.52/db-4.2.52/db_load/db_load.c 2006-02-14 14:53:02.000000000 +0100
@@ -939,7 +939,7 @@ convprintable(dbenv, instr, outstrp)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/compat-db/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 12 Nov 2004 22:31:47 -0000 1.10
+++ sources 10 Nov 2006 18:17:05 -0000 1.11
@@ -1,2 +1,2 @@
cbc77517c9278cdb47613ce8cb55779f db-4.2.52.tar.gz
-df71961002b552c0e72c6e4e358f27e1 db-4.1.25.tar.gz
+13585a20ce32f113b8e8cdb57f52e3bb db-4.3.29.tar.gz
--- db-3.1.17-tcl.patch DELETED ---
--- db.1.85.nodebug.patch DELETED ---
--- db.1.85.patch DELETED ---
--- db.1.85.s390.patch DELETED ---
--- db2-2.4.14-db2.patch DELETED ---
--- db2-2.4.14-fileid_64bit_fix.patch DELETED ---
--- db2-2.4.14-nodebug.patch DELETED ---
--- db2-2.4.14-s390.patch DELETED ---
--- db2-build.patch DELETED ---
--- db2-glibc-2.1.3.patch DELETED ---
--- db4-4.0.14-configure.patch DELETED ---
--- db4-4.0.14-recover.patch DELETED ---
--- patch.3.2.9.1 DELETED ---
--- patch.3.2.9.2 DELETED ---
--- patch.3.3.11.1 DELETED ---
--- patch.3.3.11.2 DELETED ---
--- patch.4.1.25.1 DELETED ---
--- patch.4.1.25.2 DELETED ---
More information about the fedora-cvs-commits
mailing list