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: 08-May-2016 20:33:30
Branch: rpm-5_4 Handle: 2016050818332900
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/macros macros.in
rpm/rpmdb db3.c
Log:
- db: make peace with db-6.1.26/db-6.2.23 (db +PATCH is needed).
- db: fix: change thread_count from 64 -> 4096 for db-6.1.26 and later.
Summary:
Revision Changes Path
1.3501.2.487+2 -0 rpm/CHANGES
2.472.2.143 +3 -3 rpm/configure.ac
1.39.2.49 +2 -2 rpm/macros/macros.in
1.156.2.27 +1 -0 rpm/rpmdb/db3.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.486 -r1.3501.2.487 CHANGES
--- rpm/CHANGES 24 Apr 2016 18:13:21 -0000 1.3501.2.486
+++ rpm/CHANGES 8 May 2016 18:33:29 -0000 1.3501.2.487
@@ -1,4 +1,6 @@
5.4.16 -> 5.4.17:
+ - jbj: db: make peace with db-6.1.26/db-6.2.23 (db +PATCH is needed).
+ - jbj: db: fix: change thread_count from 64 -> 4096 for db-6.1.26 and
later.
- jbj: sasl2: change to "opt-in" instead as "opt-out" default.
- jbj: pkgio: fix: verify type/count for RPMSIGTAG_MD5.
- jbj: python: add symlinks so that python module can be loaded.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.472.2.142 -r2.472.2.143 configure.ac
--- rpm/configure.ac 24 Apr 2016 18:13:21 -0000 2.472.2.142
+++ rpm/configure.ac 8 May 2016 18:33:29 -0000 2.472.2.143
@@ -1079,7 +1079,7 @@
MYPATH=$PATH
fi
-DBXY=db61
+DBXY=db62
AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH)
AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH)
@@ -2293,7 +2293,7 @@
CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}"
RPM_CHECK_LIB(
[Berkeley-DB], [db],
- [db-6.1], [db_create], [db.h],
+ [db-6.2], [db_create], [db.h],
[yes,external], [db3],
[ DBLIBSRCS="$DBLIBSRCS db3.c"
AM_CONDITIONAL(WITH_DB, [ true ])
@@ -2319,7 +2319,7 @@
dnl # Sqlite 3.8.3.1 from db-6.1.19
RPM_CHECK_LIB(
[Berkeley-DB (+SQLite3)], [dbsql],
- [db_sql-6.1], [sqlite3_open], [dbsql.h],
+ [db_sql-6.2], [sqlite3_open], [dbsql.h],
[yes,external], [db3/sql],
[
AM_CONDITIONAL(WITH_DBSQL, [ true ])
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
============================================================================
$ cvs diff -u -r1.39.2.48 -r1.39.2.49 macros.in
--- rpm/macros/macros.in 28 Mar 2016 19:15:02 -0000 1.39.2.48
+++ rpm/macros/macros.in 8 May 2016 18:33:29 -0000 1.39.2.49
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.39.2.48 2016/03/28 19:15:02 jbj Exp $
+# $Id: macros.in,v 1.39.2.49 2016/05/08 18:33:29 jbj Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -352,7 +352,7 @@
# Use Berkeley DB transaction logging for rpmdb ACID behavior.
# XXX the %{?__nofsync} is passed from the --nofsync popt alias on the rpm
cli.
-%__dbi_txn create %{?__nofsync:nofsync} lock log mpool txn multiversion
auto_commit thread thread_count=64
+%__dbi_txn create %{?__nofsync:nofsync} lock log mpool txn multiversion
auto_commit thread thread_count=4096
%__dbi_perms perms=0644
%__dbi_tmpdir tmpdir=%{_dbpath}/tmp
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
============================================================================
$ cvs diff -u -r1.156.2.26 -r1.156.2.27 db3.c
--- rpm/rpmdb/db3.c 20 Apr 2016 09:34:53 -0000 1.156.2.26
+++ rpm/rpmdb/db3.c 8 May 2016 18:33:29 -0000 1.156.2.27
@@ -1176,6 +1176,7 @@
/*@-noeffectuncon@*/
dbenv->set_msgfile(dbenv, rpmdb->db_errfile);
/*@=noeffectuncon@*/
+ /* XXX FIXME: estimate thread_count range better. */
if (dbi->dbi_thread_count >= 8) {
xx = dbenv->set_thread_count(dbenv, dbi->dbi_thread_count);
xx = cvtdberr(dbi, "dbenv->set_thread_count", xx, _debug);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
