[CVS] RPM: rpm-5_4: rpm/ devtool.conf

2016-05-08 Thread Jeff Johnson
  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:49:01
  Branch: rpm-5_4  Handle: 2016050818490100

  Modified files:   (Branch: rpm-5_4)
rpm devtool.conf

  Log:
- devtool: save config used on El Capitan.

  Summary:
RevisionChanges Path
2.365.2.105 +22 -8  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.365.2.104 -r2.365.2.105 devtool.conf
  --- rpm/devtool.conf  20 Apr 2016 09:40:55 -  2.365.2.104
  +++ rpm/devtool.conf  8 May 2016 18:49:01 -   2.365.2.105
  @@ -301,11 +301,25 @@
   #
   #
   # Lion
  -#--with-ruby=/opt/local/lib/ruby/1.8 \
  -#--with-libgit2=internal tgit needs linkage assistance
  -#
--with-perlembed=/opt/local/lib/perl5/5.12.3/darwin-multi-2level/CORE \
  +#   --with-ruby=/opt/local/lib/ruby/1.8 \
  +#   --with-libgit2=internal tgit needs linkage assistance
  +#   
--with-perlembed=/opt/local/lib/perl5/5.12.3/darwin-multi-2level/CORE \
   #   --with-js=/opt/local/lib:/opt/local/include/js \
   #   --with-gpsee \
  +# -- gcc-6.1.0
  +#CC=/opt/local/bin/gcc-mp-6
  +#export CC
  +#CXX=/opt/local/bin/g++-mp-6
  +#export CXX
  +# -- clang   (also needs --disable-openmp)
  +#CC=clang
  +#export CC
  +#CXX=clang++
  +#export CXX
  +#CPPFLAGS="-Wno-unused-command-line-argument -Wno-array-bounds 
-Wno-parentheses-equality -Wno-string-compare"
  +#export CPPFLAGS
  +# -- java
  +#JAVA_HOME="/usr/java/jdk1.8.0_77"
   %falmouth
   %autogen
   %configure \
  @@ -313,7 +327,7 @@
   --prefix=/opt/local \
   --enable-shared \
   --with-db \
  ---with-dbsql \
  +--without-dbsql \
   --without-db-tools-integrated \
   --with-zlib \
   --with-bzip2 \
  @@ -322,10 +336,10 @@
   --with-path-magic=/opt/local/share/misc/magic \
   --with-lua=internal \
   --with-tcl \
  ---without-sqlite \
  +--with-sqlite \
   --with-syck=internal \
   --with-readline \
  ---with-augeas \
  +--without-augeas \
   --with-beecrypt=internal \
   --without-java \
   --with-openssl \
  @@ -360,7 +374,7 @@
   --with-python=2.7 \
   --with-pythonembed=/usr/lib:/usr/include/python2.7 \
   --with-perl \
  -
--with-perlembed=/opt/local/lib/perl5/5.12.4/darwin-thread-multi-2level/CORE \
  +
--with-perlembed=/opt/local/lib/perl5/5.22/darwin-thread-multi-2level/CORE \
   --without-perl-urpm \
   --with-ruby=/opt/local/lib/ruby/1.8 \
   --without-selinux \
  @@ -373,7 +387,7 @@
   --with-squirrel \
   --with-installed-readline \
   --with-valgrind \
  ---enable-openmp \
  +--disable-openmp \
   --enable-build-warnings \
   --enable-build-debug \
   --enable-maintainer-mode
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/perl/ .cvsignore

2016-05-08 Thread Jeff Johnson
  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:48:15
  Branch: rpm-5_4  Handle: 2016050818481500

  Modified files:   (Branch: rpm-5_4)
rpm/perl.cvsignore

  Log:
- perl: ignore cruft.

  Summary:
RevisionChanges Path
1.7.6.1 +2  -0  rpm/perl/.cvsignore
  

  patch -p0 <<'@@ .'
  Index: rpm/perl/.cvsignore
  
  $ cvs diff -u -r1.7 -r1.7.6.1 .cvsignore
  --- rpm/perl/.cvsignore   11 Jun 2008 20:10:03 -  1.7
  +++ rpm/perl/.cvsignore   8 May 2016 18:48:15 -   1.7.6.1
  @@ -3,6 +3,8 @@
   Makefile.PL
   Makefile.in
   Makefile.perl
  +MYMETA.json
  +MYMETA.yml
   RPM-*
   RPM.bs
   RPM.c
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/rpmio/ mongoc.c mongoc.h

2016-05-08 Thread Jeff Johnson
  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:47:27
  Branch: rpm-5_4  Handle: 2016050818472601

  Modified files:   (Branch: rpm-5_4)
rpm/rpmio   mongoc.c mongoc.h

  Log:
- mongo: permit enabling both openssl and common crypto on OS X.

  Summary:
RevisionChanges Path
1.1.2.13+145 -145   rpm/rpmio/mongoc.c
1.1.2.10+2  -2  rpm/rpmio/mongoc.h
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/mongoc.c
  
  $ cvs diff -u -r1.1.2.12 -r1.1.2.13 mongoc.c
  --- rpm/rpmio/mongoc.c10 Apr 2016 22:15:32 -  1.1.2.12
  +++ rpm/rpmio/mongoc.c8 May 2016 18:47:26 -   1.1.2.13
  @@ -454,6 +454,150 @@
   }
   
   
  +/*==*/
  +/* --- mongoc-stream-tls.c */
  +
  +#ifdef MONGOC_ENABLE_SSL
  +
  +#undef MONGOC_LOG_DOMAIN
  +#define MONGOC_LOG_DOMAIN "stream-tls"
  +
  +
  +/**
  + * mongoc_stream_tls_do_handshake:
  + *
  + * force an ssl handshake
  + *
  + * This will happen on the first read or write otherwise
  + */
  +bool
  +mongoc_stream_tls_do_handshake (mongoc_stream_t *stream,
  +int32_t  timeout_msec)
  +{
  +   mongoc_stream_tls_t *stream_tls = (mongoc_stream_tls_t 
*)mongoc_stream_get_tls_stream (stream);
  +
  +   BSON_ASSERT (stream_tls);
  +   BSON_ASSERT (stream_tls->do_handshake);
  +
  +   return stream_tls->do_handshake(stream, timeout_msec);
  +}
  +
  +
  +/**
  + * mongoc_stream_tls_should_retry:
  + *
  + * If the stream should be retried
  + */
  +bool
  +mongoc_stream_tls_should_retry (mongoc_stream_t *stream)
  +{
  +   mongoc_stream_tls_t *stream_tls = (mongoc_stream_tls_t 
*)mongoc_stream_get_tls_stream (stream);
  +
  +   BSON_ASSERT (stream_tls);
  +   BSON_ASSERT (stream_tls->should_retry);
  +
  +   return stream_tls->should_retry(stream);
  +}
  +
  +
  +/**
  + * mongoc_stream_tls_should_read:
  + *
  + * If the stream should read
  + */
  +bool
  +mongoc_stream_tls_should_read (mongoc_stream_t *stream)
  +{
  +   mongoc_stream_tls_t *stream_tls = (mongoc_stream_tls_t 
*)mongoc_stream_get_tls_stream (stream);
  +
  +   BSON_ASSERT (stream_tls);
  +   BSON_ASSERT (stream_tls->should_read);
  +
  +   return stream_tls->should_read(stream);
  +}
  +
  +
  +/**
  + * mongoc_stream_tls_should_write:
  + *
  + * If the stream should write
  + */
  +bool
  +mongoc_stream_tls_should_write (mongoc_stream_t *stream)
  +{
  +   mongoc_stream_tls_t *stream_tls = (mongoc_stream_tls_t 
*)mongoc_stream_get_tls_stream (stream);
  +
  +   BSON_ASSERT (stream_tls);
  +   BSON_ASSERT (stream_tls->should_write);
  +
  +   return stream_tls->should_write(stream);
  +}
  +
  +
  +/**
  + * mongoc_stream_tls_check_cert:
  + *
  + * check the cert returned by the other party
  + */
  +bool
  +mongoc_stream_tls_check_cert (mongoc_stream_t *stream,
  +  const char  *host)
  +{
  +   mongoc_stream_tls_t *stream_tls = (mongoc_stream_tls_t 
*)mongoc_stream_get_tls_stream (stream);
  +
  +   BSON_ASSERT (stream_tls);
  +   BSON_ASSERT (stream_tls->check_cert);
  +
  +   return stream_tls->check_cert(stream, host);
  +}
  +
  +
  +/*
  + *--
  + *
  + * mongoc_stream_tls_new --
  + *
  + *   Creates a new mongoc_stream_tls_t to communicate with a remote
  + *   server using a TLS stream.
  + *
  + *   @base_stream should be a stream that will become owned by the
  + *   resulting tls stream. It will be used for raw I/O.
  + *
  + *   @trust_store_dir should be a path to the SSL cert db to use for
  + *   verifying trust of the remote server.
  + *
  + * Returns:
  + *   NULL on failure, otherwise a mongoc_stream_t.
  + *
  + * Side effects:
  + *   None.
  + *
  + *--
  + */
  +
  +mongoc_stream_t *
  +mongoc_stream_tls_new (mongoc_stream_t  *base_stream,
  +   mongoc_ssl_opt_t *opt,
  +   int   client)
  +{
  +   BSON_ASSERT (base_stream);
  +
  +   switch(MONGOC_TLS_TYPE)
  +   {
  +#ifdef MONGOC_ENABLE_OPENSSL
  +  case MONGOC_TLS_OPENSSL:
  + return mongoc_stream_tls_openssl_new (base_stream, opt, client);
  + break;
  +#endif
  +
  +  default:
  + MONGOC_ERROR("Unknown crypto engine");
  + return NULL;
  +   }
  +}
  +
  +#endif
  +
   
   

[CVS] RPM: rpm-5_4: rpm/ INSTALL

2016-05-08 Thread Jeff Johnson
  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:40:07
  Branch: rpm-5_4  Handle: 2016050818400700

  Modified files:   (Branch: rpm-5_4)
rpm INSTALL

  Log:
- keep track of latest versions.

  Summary:
RevisionChanges Path
2.134.2.25  +4  -3  rpm/INSTALL
  

  patch -p0 <<'@@ .'
  Index: rpm/INSTALL
  
  $ cvs diff -u -r2.134.2.24 -r2.134.2.25 INSTALL
  --- rpm/INSTALL   20 Apr 2016 09:45:39 -  2.134.2.24
  +++ rpm/INSTALL   8 May 2016 18:40:07 -   2.134.2.25
  @@ -57,10 +57,10 @@
   System libelf   optional  -   -   e.g. 
http://www.mr511.de/software/english.html
   CPUInfo  optional  r143r143https://launchpad.net/cpuinfo
   Python  optional  2.7.10  2.7.11  http://www.ruby-lang.org/
  -Tcl optional  8.6.4   8.6.4   http://www.squirrel-lang.org
  -MRuby   optional  1.0.0   1.0.0   https://github.com/iij/mruby
  +Tcl optional  8.6.4   8.6.4   http://tcl.sourceforge.net/
  +MRuby   optional  1.0.0   1.2.0   https://github.com/iij/mruby
   Rubyoptional  1.8.7   2.2.4   http://www.ruby-lang.org/
  -Squirreloptional  3.0.6   3.1rc1  http://www.squirrel-lang.org
  +Squirreloptional  3.0.6   3.1 http://www.squirrel-lang.org
   Java JDK[8] optional  1.7.0_03 1.8.0_77 
http://www.oracle.com/technetwork/java/javase/downloads/index.html
   libgit2 optional  0.24.0  0.24.0  https://libgit2.github.com
   yajlbundled   2.1.1   2.1.1   https://lloyd.github.io/yajl/
  @@ -123,6 +123,7 @@
   GNU cpiooptional  -   -   http://www.gnu.org/software/cpio/
   UnZip   optional  -   -   http://www.info-zip.org/UnZip.html
   GnuPG   [1] optional  2.1.0   2.1.11  http://www.gnupg.org/
  +Mongodb optional  3.0.0   3.2.6   http://mongodb.org/
   --- - --- --- 
-
   
   [1] GnuPG:   gnupg-2.1.0 or later is necessary to externally sign with ECDSA.
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/rpmdb/ DB_CONFIG.in

2016-05-08 Thread Jeff Johnson
  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:36:45
  Branch: rpm-5_4  Handle: 2016050818364500

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   DB_CONFIG.in

  Log:
- increase thread_count from 64 -> 4096.

  Summary:
RevisionChanges Path
1.12.2.6+1  -1  rpm/rpmdb/DB_CONFIG.in
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/DB_CONFIG.in
  
  $ cvs diff -u -r1.12.2.5 -r1.12.2.6 DB_CONFIG.in
  --- rpm/rpmdb/DB_CONFIG.in5 Mar 2016 21:39:56 -   1.12.2.5
  +++ rpm/rpmdb/DB_CONFIG.in8 May 2016 18:36:45 -   1.12.2.6
  @@ -8,7 +8,7 @@
   set_flags DB_TXN_SNAPSHOT on
   
   # -- thread_count must be >= 8
  -set_thread_count 64
  +set_thread_count 4096
   
   #  Debugging
   #set_verbose DB_VERB_BACKUP
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/tests/ref/ DB_CONFIG

2016-05-08 Thread Jeff Johnson
  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:35:38
  Branch: rpm-5_4  Handle: 2016050818353800

  Modified files:   (Branch: rpm-5_4)
rpm/tests/ref   DB_CONFIG

  Log:
- change thread_count from 64 -> 4096.

  Summary:
RevisionChanges Path
1.4.2.7 +1  -1  rpm/tests/ref/DB_CONFIG
  

  patch -p0 <<'@@ .'
  Index: rpm/tests/ref/DB_CONFIG
  
  $ cvs diff -u -r1.4.2.6 -r1.4.2.7 DB_CONFIG
  --- rpm/tests/ref/DB_CONFIG   5 Mar 2016 21:57:07 -   1.4.2.6
  +++ rpm/tests/ref/DB_CONFIG   8 May 2016 18:35:38 -   1.4.2.7
  @@ -12,7 +12,7 @@
   #set_metadata_dir s
   #set_shm_key s
   # -- thread_count must be >= 8
  -set_thread_count 64
  +set_thread_count 4096
   set_tmp_dir ./tmp
   
   #set_tx_max u
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: syck/lib/ syck.c syck/tests/ Basic.c Emit.c Parse....

2016-05-08 Thread Jeff Johnson
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: syck Date:   08-May-2016 20:35:07
  Branch: rpm-5_4  Handle: 2016050818350600

  Modified files:   (Branch: rpm-5_4)
syck/libsyck.c
syck/tests  Basic.c Emit.c Parse.c YTS.c

  Log:
- syck: revert previous changes triggered by changing system.h.

  Summary:
RevisionChanges Path
1.5.4.3 +0  -11 syck/lib/syck.c
1.2.8.3 +0  -10 syck/tests/Basic.c
1.2.8.3 +0  -10 syck/tests/Emit.c
1.3.8.4 +0  -10 syck/tests/Parse.c
1.3.8.4 +0  -10 syck/tests/YTS.c
  

  patch -p0 <<'@@ .'
  Index: syck/lib/syck.c
  
  $ cvs diff -u -r1.5.4.2 -r1.5.4.3 syck.c
  --- syck/lib/syck.c   23 Feb 2015 09:37:02 -  1.5.4.2
  +++ syck/lib/syck.c   8 May 2016 18:35:06 -   1.5.4.3
  @@ -28,17 +28,6 @@
   }
   #endif
   
  -/*@-modfilesys@*/
  -/*@only@*/ /*@null@*/
  -void *syck_vmefail(size_t size)
  -{
  -fprintf(stderr, "memory alloc (%u bytes) returned NULL.\n", 
(unsigned)size);
  -exit(EXIT_FAILURE);
  -/*@notreached@*/
  -return NULL;
  -}
  -/*@=modfilesys@*/
  -
   /*
* Allocates and copies a string
*/
  @@ .
  patch -p0 <<'@@ .'
  Index: syck/tests/Basic.c
  
  $ cvs diff -u -r1.2.8.2 -r1.2.8.3 Basic.c
  --- syck/tests/Basic.c7 May 2016 15:21:07 -   1.2.8.2
  +++ syck/tests/Basic.c8 May 2016 18:35:06 -   1.2.8.3
  @@ -12,16 +12,6 @@
   #include "CuTest.h"
   #include "debug.h"
   
  -void *vmefail(size_t size)
  -{
  -fprintf(stderr, "memory alloc (%u bytes) returned NULL.\n", 
(unsigned)size);
  -exit(EXIT_FAILURE);
  -/*@notreached@*/
  -#if !(__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))
  -return NULL;
  -#endif
  -}
  -
   //
   // Test allocating a single node of kind 'str'.
   //
  @@ .
  patch -p0 <<'@@ .'
  Index: syck/tests/Emit.c
  
  $ cvs diff -u -r1.2.8.2 -r1.2.8.3 Emit.c
  --- syck/tests/Emit.c 7 May 2016 15:21:08 -   1.2.8.2
  +++ syck/tests/Emit.c 8 May 2016 18:35:06 -   1.2.8.3
  @@ -12,16 +12,6 @@
   #include "CuTest.h"
   #include "debug.h"
   
  -void *vmefail(size_t size)
  -{
  -fprintf(stderr, "memory alloc (%u bytes) returned NULL.\n", 
(unsigned)size);
  -exit(EXIT_FAILURE);
  -/*@notreached@*/
  -#if !(__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))
  -return NULL;
  -#endif
  -}
  -
   //
   // 1. Test the buffering -- print 10 bytes at a time
   //
  @@ .
  patch -p0 <<'@@ .'
  Index: syck/tests/Parse.c
  
  $ cvs diff -u -r1.3.8.3 -r1.3.8.4 Parse.c
  --- syck/tests/Parse.c7 May 2016 15:21:08 -   1.3.8.3
  +++ syck/tests/Parse.c8 May 2016 18:35:06 -   1.3.8.4
  @@ -12,16 +12,6 @@
   #include "CuTest.h"
   #include "debug.h"
   
  -void *vmefail(size_t size)
  -{
  -fprintf(stderr, "memory alloc (%u bytes) returned NULL.\n", 
(unsigned)size);
  -exit(EXIT_FAILURE);
  -/*@notreached@*/
  -#if !(__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))
  -return NULL;
  -#endif
  -}
  -
   //
   // 1. Test the buffering -- read 4 bytes at a time
   //
  @@ .
  patch -p0 <<'@@ .'
  Index: syck/tests/YTS.c
  
  $ cvs diff -u -r1.3.8.3 -r1.3.8.4 YTS.c
  --- syck/tests/YTS.c  7 May 2016 15:21:08 -   1.3.8.3
  +++ syck/tests/YTS.c  8 May 2016 18:35:06 -   1.3.8.4
  @@ -32,16 +32,6 @@
   };
   struct test_node end_node = { T_END };
   
  -void *vmefail(size_t size)
  -{
  -fprintf(stderr, "memory alloc (%u bytes) returned NULL.\n", 
(unsigned)size);
  -exit(EXIT_FAILURE);
  -/*@notreached@*/
  -#if !(__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))
  -return NULL;
  -#endif
  -}
  -
   /*
* Assertion which compares a YAML document with an
* equivalent set of test_node structs.
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/macros/ macros.in rp...

2016-05-08 Thread Jeff Johnson
  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:
RevisionChanges 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 -  1.3501.2.486
  +++ rpm/CHANGES   8 May 2016 18:33:29 -   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 -  2.472.2.142
  +++ rpm/configure.ac  8 May 2016 18:33:29 -   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 -  1.39.2.48
  +++ rpm/macros/macros.in  8 May 2016 18:33:29 -   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_tmpdirtmpdir=%{_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 -  1.156.2.26
  +++ rpm/rpmdb/db3.c   8 May 2016 18:33:29 -   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 Managerhttp://rpm5.org
CVS Sources Repository