]>
Commit | Line | Data |
---|---|---|
cb4aee82 JB |
1 | --- rpm-4.3/rpmdb/dbconfig.c.orig Fri Aug 30 18:12:30 2002 |
2 | +++ rpm-4.3/rpmdb/dbconfig.c Wed Nov 26 12:57:29 2003 | |
3 | @@ -34,8 +34,16 @@ | |
4 | /*@unchecked@*/ | |
5 | struct poptOption rdbOptions[] = { | |
6 | /* XXX DB_CXX_NO_EXCEPTIONS */ | |
7 | +#if defined(DB_CLIENT) | |
8 | { "client", 0,POPT_BIT_SET, &db3dbi.dbi_ecflags, DB_CLIENT, | |
9 | NULL, NULL }, | |
10 | +#endif | |
11 | +#if defined(DB_RPCCLIENT) | |
12 | + { "client", 0,POPT_BIT_SET, &db3dbi.dbi_ecflags, DB_RPCCLIENT, | |
13 | + NULL, NULL }, | |
14 | + { "rpcclient", 0,POPT_BIT_SET, &db3dbi.dbi_ecflags, DB_RPCCLIENT, | |
15 | + NULL, NULL }, | |
16 | +#endif | |
17 | ||
18 | { "xa_create", 0,POPT_BIT_SET, &db3dbi.dbi_cflags, DB_XA_CREATE, | |
19 | NULL, NULL }, | |
20 | --- rpm-4.3/rpmdb/db3.c.orig Thu Feb 6 19:03:58 2003 | |
21 | +++ rpm-4.3/rpmdb/db3.c Wed Nov 26 13:02:06 2003 | |
22 | @@ -20,6 +20,10 @@ | |
23 | ||
24 | #include "debug.h" | |
25 | ||
26 | +#if !defined(DB_CLIENT) /* XXX db-4.2.42 retrofit */ | |
27 | +#define DB_CLIENT DB_RPCCLIENT | |
28 | +#endif | |
29 | + | |
30 | /*@access rpmdb @*/ | |
31 | /*@access dbiIndex @*/ | |
32 | /*@access dbiIndexSet @*/ | |
33 | @@ -453,7 +457,7 @@ | |
34 | if (db != NULL) | |
35 | rc = db->sync(db, flags); | |
36 | /* XXX DB_INCOMPLETE is returned occaisionally with multiple access. */ | |
37 | -#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1) | |
38 | +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) | |
39 | _printit = _debug; | |
40 | #else | |
41 | _printit = (rc == DB_INCOMPLETE ? 0 : _debug); | |
42 | @@ -690,13 +694,12 @@ | |
43 | { | |
44 | DB * db = dbi->dbi_db; | |
45 | DB * secondary = dbisecondary->dbi_db; | |
46 | -#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1) | |
47 | - DB_TXN * txnid = NULL; | |
48 | -#endif | |
49 | int rc; | |
50 | ||
51 | /*@-moduncon@*/ /* FIX: annotate db3 methods */ | |
52 | -#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1) | |
53 | +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) | |
54 | + DB_TXN * txnid = NULL; | |
55 | + | |
56 | rc = db->associate(db, txnid, secondary, callback, flags); | |
57 | #else | |
58 | rc = db->associate(db, secondary, callback, flags); | |
59 | @@ -892,7 +895,7 @@ | |
60 | ||
61 | DB * db = NULL; | |
62 | DB_ENV * dbenv = NULL; | |
63 | -#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1) | |
64 | +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) | |
65 | DB_TXN * txnid = NULL; | |
66 | #endif | |
67 | u_int32_t oflags; | |
68 | @@ -1254,7 +1257,7 @@ | |
69 | ? dbfullpath : dbfile; | |
70 | #endif | |
71 | ||
72 | -#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1) | |
73 | +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) | |
74 | rc = db->open(db, txnid, dbpath, dbsubfile, | |
75 | dbi->dbi_type, oflags, dbi->dbi_perms); | |
76 | #else | |
77 | --- rpm-4.3/rpmdb/tjfn.c.orig Tue Dec 31 12:58:54 2002 | |
78 | +++ rpm-4.3/rpmdb/tjfn.c Wed Nov 26 13:02:39 2003 | |
79 | @@ -69,7 +69,7 @@ | |
80 | goto err; | |
81 | } | |
82 | ||
83 | -#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1) | |
84 | +#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) | |
85 | ret = db->open(db, NULL, dbfn, NULL, DB_BTREE, DB_CREATE, 0664); | |
86 | #else | |
87 | ret = db->open(db, dbfn, NULL, DB_BTREE, DB_CREATE, 0664); | |
88 | --- rpm-4.3/python/_rpmdb.c.orig Tue May 6 17:44:12 2003 | |
89 | +++ rpm-4.3/python/_rpmdb.c Wed Nov 26 13:14:03 2003 | |
90 | @@ -4302,7 +4302,7 @@ | |
91 | ADD_INT(d, DB_MAX_PAGES); | |
92 | ADD_INT(d, DB_MAX_RECORDS); | |
93 | ||
94 | - ADD_INT(d, DB_CLIENT); | |
95 | + ADD_INT(d, DB_RPCCLIENT); | |
96 | ADD_INT(d, DB_XA_CREATE); | |
97 | ||
98 | ADD_INT(d, DB_CREATE); | |
99 | @@ -4451,9 +4451,6 @@ | |
100 | ADD_INT(d, DB_CHECKPOINT); | |
101 | ADD_INT(d, DB_CURLSN); | |
102 | #endif | |
103 | -#if (DBVER >= 33) | |
104 | - ADD_INT(d, DB_COMMIT); | |
105 | -#endif | |
106 | ADD_INT(d, DB_CONSUME); | |
107 | #if (DBVER >= 32) | |
108 | ADD_INT(d, DB_CONSUME_WAIT); | |
109 | --- rpm-4.3/configure.ac.orig Wed Nov 26 12:46:44 2003 | |
110 | +++ rpm-4.3/configure.ac Wed Nov 26 13:15:23 2003 | |
111 | @@ -502,6 +502,7 @@ | |
112 | ||
113 | dnl Check for Berkeley db3 API. | |
114 | AC_CHECK_FUNC(db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"], | |
115 | + AC_CHECK_LIB(db-4.2, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-4.2"], | |
116 | AC_CHECK_LIB(db-4.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-4.1"], | |
117 | AC_CHECK_LIB(db-3.2, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.2"], | |
118 | AC_CHECK_LIB(db-3.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.1"], | |
119 | @@ -512,6 +513,7 @@ | |
120 | ) | |
121 | ) | |
122 | ) | |
123 | + ) | |
124 | ) | |
125 | ||
126 | if test X"$DBLIBSRCS" = X; then |