Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5973
Modified Files:
db47.info db47.patch
Log Message:
Incorporate latest upstream patch.
Index: db47.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db47.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- db47.info 8 May 2009 16:50:52 -0000 1.5
+++ db47.info 14 May 2009 01:10:08 -0000 1.6
@@ -1,7 +1,7 @@
Info4: <<
Package: db47%type_pkg[-64bit]
Version: 4.7.25
-Revision: 3
+Revision: 4
Type: -64bit (boolean)
Architecture: ( %type_raw[-64bit] = -64bit ) powerpc, ( %type_raw[-64bit] =
-64bit ) i386
CustomMirror: <<
@@ -36,7 +36,7 @@
SetCFlags: -Os
SetCXXFlags: -Os
PatchFile: %{ni}.patch
-PatchFile-MD5: 8c7011b31f9c71c8f97d09d821aca079
+PatchFile-MD5: 77ba2f8d7161bcd2f6e6e45ab73c174f
ConfigureParams: --enable-compat185 --enable-cxx --enable-dump185
--includedir=%p/include/db4 --libdir='${prefix}/%lib' --disable-static
GCC: 4.0
CompileScript: <<
Index: db47.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/db47.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- db47.patch 28 Jan 2009 16:15:12 -0000 1.2
+++ db47.patch 14 May 2009 01:10:08 -0000 1.3
@@ -1,6 +1,17 @@
+diff -ru db-4.7.25.orig/dbinc/repmgr.h db-4.7.25/dbinc/repmgr.h
+--- db-4.7.25.orig/dbinc/repmgr.h 2008-01-08 15:58:18.000000000 -0500
++++ db-4.7.25/dbinc/repmgr.h 2009-05-13 20:44:47.000000000 -0400
+@@ -374,6 +374,7 @@
+ #define SITE_FROM_EID(eid) (&db_rep->sites[eid])
+ #define EID_FROM_SITE(s) ((int)((s) - (&db_rep->sites[0])))
+ #define IS_VALID_EID(e) ((e) >= 0)
++#define IS_KNOWN_REMOTE_SITE(e) ((e) >= 0 && ((u_int)(e)) <
db_rep->site_cnt)
+ #define SELF_EID INT_MAX
+
+ #define IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS ||
\
diff -ru db-4.7.25.orig/lock/lock.c db-4.7.25/lock/lock.c
--- db-4.7.25.orig/lock/lock.c 2008-05-07 08:27:35.000000000 -0400
-+++ db-4.7.25/lock/lock.c 2009-01-28 10:55:09.000000000 -0500
++++ db-4.7.25/lock/lock.c 2009-05-13 20:43:56.000000000 -0400
@@ -1274,10 +1274,12 @@
SH_TAILQ_REMOVE(
<->obj_tab[obj_ndx], sh_obj, links, __db_lockobj);
@@ -43,7 +54,7 @@
memcpy(p, obj->data, obj->size);
diff -ru db-4.7.25.orig/lock/lock_deadlock.c db-4.7.25/lock/lock_deadlock.c
--- db-4.7.25.orig/lock/lock_deadlock.c 2008-03-10 09:31:33.000000000
-0400
-+++ db-4.7.25/lock/lock_deadlock.c 2009-01-28 10:55:39.000000000 -0500
++++ db-4.7.25/lock/lock_deadlock.c 2009-05-13 20:43:56.000000000 -0400
@@ -121,7 +121,7 @@
DB_LOCKTAB *lt;
db_timespec now;
@@ -253,9 +264,119 @@
return (ret);
}
+diff -ru db-4.7.25.orig/rep/rep_elect.c db-4.7.25/rep/rep_elect.c
+--- db-4.7.25.orig/rep/rep_elect.c 2008-03-13 12:21:04.000000000 -0400
++++ db-4.7.25/rep/rep_elect.c 2009-05-13 20:44:47.000000000 -0400
+@@ -33,7 +33,7 @@
+ static int __rep_fire_elected __P((ENV *, REP *, u_int32_t));
+ static void __rep_elect_master __P((ENV *, REP *));
+ static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t,
roff_t));
+-static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t));
++static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t));
+
+ /*
+ * __rep_elect --
+@@ -55,7 +55,7 @@
+ ENV *env;
+ LOG *lp;
+ REP *rep;
+- int done, eid, elected, full_elect, locked, in_progress, need_req;
++ int done, elected, full_elect, locked, in_progress, need_req;
+ int ret, send_vote, t_ret;
+ u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri;
+ u_int32_t tiebreaker;
+@@ -181,8 +181,7 @@
+ REP_SYSTEM_UNLOCK(env);
+ (void)__rep_send_message(env, DB_EID_BROADCAST,
+ REP_MASTER_REQ, NULL, NULL, 0, 0);
+- ret = __rep_wait(env, &to, &eid,
+- 0, REP_F_EPHASE0);
++ ret = __rep_wait(env, &to, 0, REP_F_EPHASE0);
+ REP_SYSTEM_LOCK(env);
+ F_CLR(rep, REP_F_EPHASE0);
+ switch (ret) {
+@@ -286,11 +285,11 @@
+ REP_SYSTEM_LOCK(env);
+ goto vote;
+ }
+- ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1);
++ ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1);
+ switch (ret) {
+ case 0:
+ /* Check if election complete or phase complete. */
+- if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) {
++ if (!IN_ELECTION(rep)) {
+ RPRINT(env, DB_VERB_REP_ELECT,
+ (env, "Ended election phase 1"));
+ goto edone;
+@@ -398,15 +397,12 @@
+ REP_SYSTEM_LOCK(env);
+ goto i_won;
+ }
+- ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2);
++ ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2);
+ RPRINT(env, DB_VERB_REP_ELECT,
+ (env, "Ended election phase 2 %d", ret));
+ switch (ret) {
+ case 0:
+- if (eid != DB_EID_INVALID)
+- goto edone;
+- ret = DB_REP_UNAVAIL;
+- break;
++ goto edone;
+ case DB_REP_EGENCHG:
+ if (to > timeout)
+ to = timeout;
+@@ -1050,13 +1046,6 @@
+ ENV *env;
+ REP *rep;
+ {
+- /*
+- * We often come through here twice, sometimes even more. We mustn't
+- * let the redundant calls affect stats counting. But rep_elect relies
+- * on this first part for setting eidp.
+- */
+- rep->master_id = rep->eid;
+-
+ if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) {
+ /* We've been through here already; avoid double counting. */
+ return;
+@@ -1093,10 +1082,10 @@
+ (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1);
+
+ static int
+-__rep_wait(env, timeoutp, eidp, full_elect, flags)
++__rep_wait(env, timeoutp, full_elect, flags)
+ ENV *env;
+ db_timeout_t *timeoutp;
+- int *eidp, full_elect;
++ int full_elect;
+ u_int32_t flags;
+ {
+ DB_REP *db_rep;
+@@ -1174,7 +1163,6 @@
+ F_CLR(rep, REP_F_EGENUPDATE);
+ ret = DB_REP_EGENCHG;
+ } else if (phase_over) {
+- *eidp = rep->master_id;
+ done = 1;
+ ret = 0;
+ }
+diff -ru db-4.7.25.orig/repmgr/repmgr_net.c db-4.7.25/repmgr/repmgr_net.c
+--- db-4.7.25.orig/repmgr/repmgr_net.c 2008-03-13 13:31:28.000000000 -0400
++++ db-4.7.25/repmgr/repmgr_net.c 2009-05-13 20:44:47.000000000 -0400
+@@ -100,6 +100,8 @@
+ control, rec, &nsites_sent, &npeers_sent)) != 0)
+ goto out;
+ } else {
++ DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid));
++
+ /*
+ * If this is a request that can be sent anywhere, then see if
+ * we can send it to our peer (to save load on the master), but
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 2009-01-28 10:54:52.000000000 -0500
++++ db-4.7.25/sequence/sequence.c 2009-05-13 20:43:56.000000000 -0400
@@ -187,7 +187,11 @@
if ((ret = __db_get_flags(dbp, &tflags)) != 0)
goto err;
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
