Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14086
Modified Files:
db3.info db4.info db41.info db42.info db43.info db44.info
Added Files:
db47.patch
Log Message:
Added db47 and updated other dbs to Conflict/Replace.
Index: db43.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db43.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- db43.info 4 Mar 2007 16:22:06 -0000 1.5
+++ db43.info 30 Nov 2008 19:16:50 -0000 1.6
@@ -1,14 +1,14 @@
Package: db43
Version: 4.3.29
-Revision: 1002
+Revision: 1003
CustomMirror: <<
nam-US: http://download-east.oracle.com/berkeley-db/
nam-US: http://download-west.oracle.com/berkeley-db/
eur-UK: http://download-uk.oracle.com/berkeley-db/
<<
Source: mirror:custom:db-%v.NC.tar.gz
-Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl,
db42, db43-ssl,db44, db44-aes
-Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl,
db42, db43-ssl, db44, db44-aes
+Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl,
db42, db43-ssl,db44, db44-aes, db47, db47-aes
+Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl,
db42, db43-ssl, db44, db44-aes, db47, db47-aes
Depends: db43-shlibs (= %v-%r) | db43-ssl-shlibs (=%v-%r)
BuildDependsOnly: true
NoSetLDFlags: true
Index: db41.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db41.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- db41.info 21 Apr 2008 03:39:44 -0000 1.6
+++ db41.info 30 Nov 2008 19:16:50 -0000 1.7
@@ -1,14 +1,14 @@
Package: db41
Version: 4.1.25
-Revision: 1024
+Revision: 1025
CustomMirror: <<
nam-US: http://download-east.oracle.com/berkeley-db/
nam-US: http://download-west.oracle.com/berkeley-db/
eur-UK: http://download-uk.oracle.com/berkeley-db/
<<
Source: mirror:custom:db-%v.NC.tar.gz
-Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db42, db42-ssl,
db43-ssl, db43, db44, db44-aes
-Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db42, db42-ssl,
db43-ssl, db43, db44, db44-aes
+Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db42, db42-ssl,
db43-ssl, db43, db44, db44-aes, db47, db47-aes
+Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db42, db42-ssl,
db43-ssl, db43, db44, db44-aes, db47, db47-aes
Depends: db41-shlibs (= %v-%r) | db41-ssl-shlibs (=%v-%r)
BuildDepends: fink (>= 0.24.12-1)
BuildDependsOnly: true
Index: db42.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db42.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- db42.info 21 Apr 2008 03:39:44 -0000 1.6
+++ db42.info 30 Nov 2008 19:16:50 -0000 1.7
@@ -1,14 +1,14 @@
Package: db42
Version: 4.2.52
-Revision: 1018
+Revision: 1019
CustomMirror: <<
nam-US: http://download-east.oracle.com/berkeley-db/
nam-US: http://download-west.oracle.com/berkeley-db/
eur-UK: http://download-uk.oracle.com/berkeley-db/
<<
Source: mirror:custom:db-%v.NC.tar.gz
-Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl,
db43-ssl, db43, db44, db44-aes
-Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl,
db43-ssl, db43, db44, db44-aes
+Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl,
db43-ssl, db43, db44, db44-aes, db47, db47-aes
+Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl,
db43-ssl, db43, db44, db44-aes, db47, db47-aes
Depends: db42-shlibs (= %v-%r) | db42-ssl-shlibs (=%v-%r)
BuildDepends: fink (>= 0.24.12-1)
BuildDependsOnly: true
Index: db44.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db44.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- db44.info 4 Mar 2007 16:22:06 -0000 1.5
+++ db44.info 30 Nov 2008 19:16:50 -0000 1.6
@@ -1,14 +1,14 @@
Package: db44
Version: 4.4.20
-Revision: 1002
+Revision: 1003
CustomMirror: <<
nam-US: http://download-east.oracle.com/berkeley-db/
nam-US: http://download-west.oracle.com/berkeley-db/
eur-UK: http://download-uk.oracle.com/berkeley-db/
<<
Source: mirror:custom:db-%v.NC.tar.gz
-Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl,
db42, db43-ssl, db43, db44-aes
-Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl,
db42, db43-ssl, db43, db44-aes
+Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl,
db42, db43-ssl, db43, db44-aes, db47, db47-aes
+Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db4, db41-ssl, db41, db42-ssl,
db42, db43-ssl, db43, db44-aes, db47, db47-aes
Depends: db44-shlibs (= %v-%r) | db44-aes-shlibs (=%v-%r)
BuildDependsOnly: true
NoSetLDFlags: true
Index: db3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db3.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- db3.info 21 Apr 2008 03:39:44 -0000 1.5
+++ db3.info 30 Nov 2008 19:16:50 -0000 1.6
@@ -1,6 +1,6 @@
Package: db3
Version: 3.3.11
-Revision: 1028
+Revision: 1029
CustomMirror: <<
nam-US: http://download-east.oracle.com/berkeley-db/
nam-US: http://download-west.oracle.com/berkeley-db/
@@ -9,8 +9,8 @@
Source: mirror:custom:db-%v.tar.gz
PatchFile: %n.patch
PatchFile-MD5: b7722b58d6959624bd638198ce487f93
-Conflicts: db, db4, db4-ssl, db31 (<< 3.1.17-8), db41, db41-ssl, db42-ssl,
db42, db43-ssl, db43, db44, db44-aes
-Replaces: db, db4, db4-ssl, db31 (<< 3.1.17-8), db41, db41-ssl, db42-ssl,
db42, db43-ssl, db43, db44, db44-aes
+Conflicts: db, db4, db4-ssl, db31 (<< 3.1.17-8), db41, db41-ssl, db42-ssl,
db42, db43-ssl, db43, db44, db44-aes, db47, db47-aes
+Replaces: db, db4, db4-ssl, db31 (<< 3.1.17-8), db41, db41-ssl, db42-ssl,
db42, db43-ssl, db43, db44, db44-aes, db47, db47-aes
Provides: db
Depends: db3-shlibs (= %v-%r)
BuildDepends: fink (>= 0.24.12-1)
Index: db4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db4.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- db4.info 21 Apr 2008 03:39:44 -0000 1.5
+++ db4.info 30 Nov 2008 19:16:50 -0000 1.6
@@ -1,14 +1,14 @@
Package: db4
Version: 4.0.14
-Revision: 1026
+Revision: 1027
CustomMirror: <<
nam-US: http://download-east.oracle.com/berkeley-db/
nam-US: http://download-west.oracle.com/berkeley-db/
eur-UK: http://download-uk.oracle.com/berkeley-db/
<<
Source: mirror:custom:db-%v.tar.gz
-Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db41, db41-ssl, db42-ssl,
db42, db43-ssl, db43, db44, db44-aes
-Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db41, db41-ssl, db42-ssl, db42,
db43-ssl, db43, db44, db44-aes
+Replaces: db, db3, db31 (<< 3.1.17-8), db4-ssl, db41, db41-ssl, db42-ssl,
db42, db43-ssl, db43, db44, db44-aes, db47, db47-aes
+Conflicts: db3, db31 (<< 3.1.17-8), db4-ssl, db41, db41-ssl, db42-ssl, db42,
db43-ssl, db43, db44, db44-aes, db47, db47-aes
Depends: db4-shlibs (= %v-%r)
BuildDepends: fink (>= 0.24.12-1)
BuildDependsOnly: true
--- NEW FILE: db47.patch ---
diff -ru db-4.7.25.orig/sequence/sequence.c db-4.7.25/sequence/sequence.c
--- db-4.7.25.orig/sequence/sequence.c 2008-05-05 16:25:09.000000000 -0400
+++ db-4.7.25/sequence/sequence.c 2008-11-30 11:58:22.000000000 -0500
@@ -187,7 +187,11 @@
if ((ret = __db_get_flags(dbp, &tflags)) != 0)
goto err;
- if (DB_IS_READONLY(dbp)) {
+ /*
+ * We can let replication clients open sequences, but must
+ * check later that they do not update them.
+ */
+ if (F_ISSET(dbp, DB_AM_RDONLY)) {
ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open");
goto err;
}
@@ -244,6 +248,11 @@
if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) ||
!LF_ISSET(DB_CREATE))
goto err;
+ if (IS_REP_CLIENT(env) &&
+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
+ ret = __db_rdonly(env, "DB_SEQUENCE->open");
+ goto err;
+ }
ret = 0;
rp = &seq->seq_record;
@@ -296,7 +305,12 @@
*/
rp = seq->seq_data.data;
if (rp->seq_version == DB_SEQUENCE_OLDVER) {
-oldver: rp->seq_version = DB_SEQUENCE_VERSION;
+oldver: if (IS_REP_CLIENT(env) &&
+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
+ ret = __db_rdonly(env, "DB_SEQUENCE->open");
+ goto err;
+ }
+ rp->seq_version = DB_SEQUENCE_VERSION;
if (!F_ISSET(env, ENV_LITTLEENDIAN)) {
if (IS_DB_AUTO_COMMIT(dbp, txn)) {
if ((ret =
@@ -707,6 +721,13 @@
MUTEX_LOCK(env, seq->mtx_seq);
+ if (handle_check && IS_REP_CLIENT(env) &&
+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
+ ret = __db_rdonly(env, "DB_SEQUENCE->get");
+ goto err;
+ }
+
+
if (rp->seq_min + delta > rp->seq_max) {
__db_errx(env, "Sequence overflow");
ret = EINVAL;
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
