RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 18-Feb-2012 20:19:38
Branch: rpm-5_4 Handle: 2012021819193701
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmdb DB_CONFIG.in
rpm/tests/ref DB_CONFIG
Log:
- rpmdb: fix: db-5.3.15 DB_CONFIG can't handle multichar whitespace.
Summary:
Revision Changes Path
1.3501.2.193+1 -0 rpm/CHANGES
1.12.2.1 +27 -27 rpm/rpmdb/DB_CONFIG.in
1.4.2.1 +112 -112 rpm/tests/ref/DB_CONFIG
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.192 -r1.3501.2.193 CHANGES
--- rpm/CHANGES 17 Feb 2012 16:35:12 -0000 1.3501.2.192
+++ rpm/CHANGES 18 Feb 2012 19:19:37 -0000 1.3501.2.193
@@ -1,4 +1,5 @@
5.4.4 -> 5.4.5:
+ - jbj: rpmdb: fix: db-5.3.15 DB_CONFIG can't handle multichar whitespace.
- jbj: format: hash RPMTAG_FILE{INODES,DEVICES,RDEVS} in headers.
- jbj: autofu: make peace with automake-1.11.2.
- jbj: hkp: default to standard SKS pool for now, todo++.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/DB_CONFIG.in
============================================================================
$ cvs diff -u -r1.12 -r1.12.2.1 DB_CONFIG.in
--- rpm/rpmdb/DB_CONFIG.in 2 Dec 2010 14:38:08 -0000 1.12
+++ rpm/rpmdb/DB_CONFIG.in 18 Feb 2012 19:19:37 -0000 1.12.2.1
@@ -1,40 +1,40 @@
# ================ Environment
-#add_data_dir .
-set_data_dir .
-set_create_dir .
-set_lg_dir ./log
-set_tmp_dir ./tmp
+#add_data_dir .
+set_data_dir .
+set_create_dir .
+set_lg_dir ./log
+set_tmp_dir ./tmp
# -- thread_count must be >= 8
-set_thread_count 64
+set_thread_count 64
-#set_verbose DB_VERB_DEADLOCK
-#set_verbose DB_VERB_FILEOPS
-#set_verbose DB_VERB_FILEOPS_ALL
-#set_verbose DB_VERB_RECOVERY
-#set_verbose DB_VERB_REGISTER
-#set_verbose DB_VERB_REPLICATION
-#set_verbose DB_VERB_REP_ELECT
-#set_verbose DB_VERB_REP_LEASE
-#set_verbose DB_VERB_REP_MISC
-#set_verbose DB_VERB_REP_MSGS
-#set_verbose DB_VERB_REP_SYNC
-#set_verbose DB_VERB_REP_TEST
-#set_verbose DB_VERB_REPMGR_CONNFAIL
-#set_verbose DB_VERB_REPMGR_MISC
-#set_verbose DB_VERB_WAITSFOR
+#set_verbose DB_VERB_DEADLOCK
+#set_verbose DB_VERB_FILEOPS
+#set_verbose DB_VERB_FILEOPS_ALL
+#set_verbose DB_VERB_RECOVERY
+#set_verbose DB_VERB_REGISTER
+#set_verbose DB_VERB_REPLICATION
+#set_verbose DB_VERB_REP_ELECT
+#set_verbose DB_VERB_REP_LEASE
+#set_verbose DB_VERB_REP_MISC
+#set_verbose DB_VERB_REP_MSGS
+#set_verbose DB_VERB_REP_SYNC
+#set_verbose DB_VERB_REP_TEST
+#set_verbose DB_VERB_REPMGR_CONNFAIL
+#set_verbose DB_VERB_REPMGR_MISC
+#set_verbose DB_VERB_WAITSFOR
# ================ Logging
# ================ Memory Pool
#XXX initializing dbenv with set_cachesize has unimplemented prerequsites
-#set_cachesize 0 1048576 0
-set_mp_mmapsize 268435456
+#set_cachesize 0 1048576 0
+set_mp_mmapsize 268435456
# ================ Locking
-set_lk_max_locks 16384
-set_lk_max_lockers 16384
-set_lk_max_objects 16384
-mutex_set_max 163840
+set_lk_max_locks 16384
+set_lk_max_lockers 16384
+set_lk_max_objects 16384
+mutex_set_max 163840
# ================ Replication
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/DB_CONFIG
============================================================================
$ cvs diff -u -r1.4 -r1.4.2.1 DB_CONFIG
--- rpm/tests/ref/DB_CONFIG 8 Oct 2010 22:34:12 -0000 1.4
+++ rpm/tests/ref/DB_CONFIG 18 Feb 2012 19:19:38 -0000 1.4.2.1
@@ -1,140 +1,140 @@
# ================ Environment
-#add_data_dir .
-set_data_dir .
-set_create_dir .
-set_lg_dir ./log
-set_tmp_dir ./tmp
+#add_data_dir .
+set_data_dir .
+set_create_dir .
+set_lg_dir ./log
+set_tmp_dir ./tmp
# -- thread_count must be >= 8
-set_thread_count 64
+set_thread_count 64
-#set_tx_max u
-#set_txn_timeout u
+#set_tx_max u
+#set_txn_timeout u
-#set_verbose DB_VERB_DEADLOCK
-#set_verbose DB_VERB_FILEOPS
-#set_verbose DB_VERB_FILEOPS_ALL
-#set_verbose DB_VERB_RECOVERY
-#set_verbose DB_VERB_REGISTER
-#set_verbose DB_VERB_REPLICATION
-#set_verbose DB_VERB_REP_ELECT
-#set_verbose DB_VERB_REP_LEASE
-#set_verbose DB_VERB_REP_MISC
-#set_verbose DB_VERB_REP_MSGS
-#set_verbose DB_VERB_REP_SYNC
-#set_verbose DB_VERB_REP_TEST
-#set_verbose DB_VERB_REPMGR_CONNFAIL
-#set_verbose DB_VERB_REPMGR_MISC
-#set_verbose DB_VERB_WAITSFOR
+#set_verbose DB_VERB_DEADLOCK
+#set_verbose DB_VERB_FILEOPS
+#set_verbose DB_VERB_FILEOPS_ALL
+#set_verbose DB_VERB_RECOVERY
+#set_verbose DB_VERB_REGISTER
+#set_verbose DB_VERB_REPLICATION
+#set_verbose DB_VERB_REP_ELECT
+#set_verbose DB_VERB_REP_LEASE
+#set_verbose DB_VERB_REP_MISC
+#set_verbose DB_VERB_REP_MSGS
+#set_verbose DB_VERB_REP_SYNC
+#set_verbose DB_VERB_REP_TEST
+#set_verbose DB_VERB_REPMGR_CONNFAIL
+#set_verbose DB_VERB_REPMGR_MISC
+#set_verbose DB_VERB_WAITSFOR
-#set_intermediate_dir i
+#set_intermediate_dir i
#set_intermediate_dir_mode i
-#set_flags DB_AUTO_COMMIT on
-#set_flags DB_CDB_ALLDB on
+#set_flags DB_AUTO_COMMIT on
+#set_flags DB_CDB_ALLDB on
# XXX http://forums.oracle.com/forums/thread.jspa?messageID=3421463
# XXX http://www.openldap.org/lists/openldap-devel/200701/msg00018.html
-#set_flags DB_DIRECT_DB on
-#set_flags DB_DSYNC_DB on
-#set_flags DB_MULTIVERSION on
-#set_flags DB_NOLOCKING on
-#set_flags DB_NOMMAP on
-#set_flags DB_NOPANIC on
-#set_flags DB_OVERWRITE on
-#set_flags DB_REGION_INIT on
-set_flags DB_TXN_NOSYNC on
-#set_flags DB_TXN_NOWAIT on
-#set_flags DB_TXN_SNAPSHOT on
-#set_flags DB_TXN_WRITE_NOSYNC on
-#set_flags DB_YIELDCPU on
+#set_flags DB_DIRECT_DB on
+#set_flags DB_DSYNC_DB on
+#set_flags DB_MULTIVERSION on
+#set_flags DB_NOLOCKING on
+#set_flags DB_NOMMAP on
+#set_flags DB_NOPANIC on
+#set_flags DB_OVERWRITE on
+#set_flags DB_REGION_INIT on
+set_flags DB_TXN_NOSYNC on
+#set_flags DB_TXN_NOWAIT on
+#set_flags DB_TXN_SNAPSHOT on
+#set_flags DB_TXN_WRITE_NOSYNC on
+#set_flags DB_YIELDCPU on
## XXX same as set_log_config with similar names
-#set_flags db_log_inmemory on
-#set_flags db_direct_log on
-#set_flags db_dsync_log on
-set_flags db_log_autoremove on
+#set_flags db_log_inmemory on
+#set_flags db_direct_log on
+#set_flags db_dsync_log on
+set_flags db_log_autoremove on
# ================ Logging
-#set_log_config DB_LOG_AUTO_REMOVE on
-#set_log_config DB_LOG_DIRECT on
-#set_log_config DB_LOG_DSYNC on
-#set_log_config DB_LOG_IN_MEMORY on
-#set_log_config DB_LOG_ZERO on
+#set_log_config DB_LOG_AUTO_REMOVE on
+#set_log_config DB_LOG_DIRECT on
+#set_log_config DB_LOG_DSYNC on
+#set_log_config DB_LOG_IN_MEMORY on
+#set_log_config DB_LOG_ZERO on
# 32Kb on disk, 1Mb in memory
-#set_lg_bsize 268435456
-#set_lg_filemode i
+#set_lg_bsize 268435456
+#set_lg_filemode i
# 10Mb on disk, 256Kb in memory
-#set_lg_max 268435456
-#set_lg_regionmax 131072
+#set_lg_max 268435456
+#set_lg_regionmax 131072
# ================ Locking
-#set_lk_detect DB_LOCK_DEFAULT
-#set_lk_detect DB_LOCK_EXPIRE
-#set_lk_detect DB_LOCK_MAXLOCKS
-#set_lk_detect DB_LOCK_MAXWRITE
-#set_lk_detect DB_LOCK_MINLOCKS
-#set_lk_detect DB_LOCK_MINWRITE
-#set_lk_detect DB_LOCK_OLDEST
-#set_lk_detect DB_LOCK_RANDOM
-#set_lk_detect DB_LOCK_YOUNGEST
-
-set_lk_max_locks 16000
-set_lk_max_lockers 16000
-set_lk_max_objects 16000
+#set_lk_detect DB_LOCK_DEFAULT
+#set_lk_detect DB_LOCK_EXPIRE
+#set_lk_detect DB_LOCK_MAXLOCKS
+#set_lk_detect DB_LOCK_MAXWRITE
+#set_lk_detect DB_LOCK_MINLOCKS
+#set_lk_detect DB_LOCK_MINWRITE
+#set_lk_detect DB_LOCK_OLDEST
+#set_lk_detect DB_LOCK_RANDOM
+#set_lk_detect DB_LOCK_YOUNGEST
+
+set_lk_max_locks 16000
+set_lk_max_lockers 16000
+set_lk_max_objects 16000
# 10 * ncpus (or 1 for non-SMP)
-#set_lk_partitions u
+#set_lk_partitions u
-#set_lock_timeout u
-#mutex_set_align u
-#mutex_set_increment u
-mutex_set_max 200000
-#mutex_set_tas_spins u
-#set_tas_spins i XXX legacy
-
-#set_region_init i
-#set_reg_timeout i
-#set_shm_key i
+#set_lock_timeout u
+#mutex_set_align u
+#mutex_set_increment u
+mutex_set_max 200000
+#mutex_set_tas_spins u
+#set_tas_spins i XXX legacy
+
+#set_region_init i
+#set_reg_timeout i
+#set_shm_key i
# ================ Memory Pool
#XXX initializing dbenv with set_cachesize has unimplemented prerequsites
-#set_cachesize 0 67108864 4
+set_cachesize 0 67108864 1
-#set_mp_max_openfd i
-#set_mp_pagesize u
-#set_mp_max_write i i
-set_mp_mmapsize 268435456
-#set_mp_mmapsize 536870912
+#set_mp_max_openfd i
+#set_mp_pagesize u
+#set_mp_max_write i i
+set_mp_mmapsize 268435456
+#set_mp_mmapsize 536870912
# ================ Replication
-#rep_set_clockskew u u
+#rep_set_clockskew u u
-#rep_set_config DB_REP_CONF_AUTOINIT on
-#rep_set_config DB_REP_CONF_BULK on
-#rep_set_config DB_REP_CONF_DELAYCLIENT on
-#rep_set_config DB_REP_CONF_LEASE on
-#rep_set_config DB_REP_CONF_NOWAIT on
-#rep_set_config DB_REP_CONF_2SITE_STRICT on
-#rep_set_config DB_REP_CONF_ELECTIONS on
-
-#rep_set_limit u u
-#rep_set_nsites u
-#rep_set_priority u
-#rep_set_request u u
-
-#rep_set_timeout DB_REP_ACK_TIMEOUT u
-#rep_set_timeout DB_REP_CHECKPOINT_DELAY u
-#rep_set_timeout DB_REP_CONNECTION_RETRY u
-#rep_set_timeout DB_REP_ELECTION_TIMEOUT u
-#rep_set_timeout DB_REP_ELECTION_RETRY u
-#rep_set_timeout DB_REP_FULL_ELECTION_TIMEOUT u
-#rep_set_timeout DB_REP_HEARTBEAT_MONITOR u
-#rep_set_timeout DB_REP_HEARTBEAT_SEND u
-#rep_set_timeout DB_REP_LEASE_TIMEOUT u
-
-#repmgr_set_ack_policy DB_REPMGR_ACKS_ALL
-#repmgr_set_ack_policy DB_REPMGR_ACKS_ALL_PEERS
-#repmgr_set_ack_policy DB_REPMGR_ACKS_NONE
-#repmgr_set_ack_policy DB_REPMGR_ACKS_ONE
-#repmgr_set_ack_policy DB_REPMGR_ACKS_ONE_PEER
-#repmgr_set_ack_policy DB_REPMGR_ACKS_QUORUM
+#rep_set_config DB_REP_CONF_AUTOINIT on
+#rep_set_config DB_REP_CONF_BULK on
+#rep_set_config DB_REP_CONF_DELAYCLIENT on
+#rep_set_config DB_REP_CONF_LEASE on
+#rep_set_config DB_REP_CONF_NOWAIT on
+#rep_set_config DB_REP_CONF_2SITE_STRICT on
+#rep_set_config DB_REP_CONF_ELECTIONS on
+
+#rep_set_limit u u
+#rep_set_nsites u
+#rep_set_priority u
+#rep_set_request u u
+
+#rep_set_timeout DB_REP_ACK_TIMEOUT u
+#rep_set_timeout DB_REP_CHECKPOINT_DELAY u
+#rep_set_timeout DB_REP_CONNECTION_RETRY u
+#rep_set_timeout DB_REP_ELECTION_TIMEOUT u
+#rep_set_timeout DB_REP_ELECTION_RETRY u
+#rep_set_timeout DB_REP_FULL_ELECTION_TIMEOUT u
+#rep_set_timeout DB_REP_HEARTBEAT_MONITOR u
+#rep_set_timeout DB_REP_HEARTBEAT_SEND u
+#rep_set_timeout DB_REP_LEASE_TIMEOUT u
+
+#repmgr_set_ack_policy DB_REPMGR_ACKS_ALL
+#repmgr_set_ack_policy DB_REPMGR_ACKS_ALL_PEERS
+#repmgr_set_ack_policy DB_REPMGR_ACKS_NONE
+#repmgr_set_ack_policy DB_REPMGR_ACKS_ONE
+#repmgr_set_ack_policy DB_REPMGR_ACKS_ONE_PEER
+#repmgr_set_ack_policy DB_REPMGR_ACKS_QUORUM
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
