[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in

2011-05-26 Thread Pinto Elia 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   26-May-2011 17:49:34
  Branch: HEAD Handle: 2011052615493301

  Modified files:
rpm CHANGES
rpm/macros  macros.in

  Log:
the elfutils --reloc-debug-sections is useful
mostly for LKM and not in general. Better to enable
when needed/useful and not systemwide.

  Summary:
RevisionChanges Path
1.3649  +3  -0  rpm/CHANGES
1.56+2  -2  rpm/macros/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3648 -r1.3649 CHANGES
  --- rpm/CHANGES   26 May 2011 14:26:26 -  1.3648
  +++ rpm/CHANGES   26 May 2011 15:49:33 -  1.3649
  @@ -1,4 +1,7 @@
   5.4.0 -> 5.4.1:
  +- devzero2000: the elfutils --reloc-debug-sections is useful
  +  mostly for LKM and not in general. Better to enable
  +  when needed/useful and not systemwide.
   - devzero2000: elfutils-0.153 introduce the --reloc-debug-sections
 This is a new option to eu-strip that strips
 out/resolves relocations between .debug_* elf sections in ET_REL files.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.55 -r1.56 macros.in
  --- rpm/macros/macros.in  26 May 2011 14:26:27 -  1.55
  +++ rpm/macros/macros.in  26 May 2011 15:49:34 -  1.56
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.55 2011/05/26 14:26:27 devzero2000 Exp $
  +# $Id: macros.in,v 1.56 2011/05/26 15:49:34 devzero2000 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
  @@ -137,7 +137,7 @@
   # the script.  See the script for details.
   #
   %__debug_install_post   \
  -   %{_rpmhome}/find-debuginfo.sh 
%{?_missing_build_ids_terminate_build:--strict-build-id} 
%{?_find_debuginfo_opts} @debuginfo_eu_strip_reloc_debug_sections@ 
"%{_builddir}/%{?buildsubdir}"\
  +   %{_rpmhome}/find-debuginfo.sh 
%{?_missing_build_ids_terminate_build:--strict-build-id} 
%{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"\
   %{nil}
   
   #Template for debug information sub-package.
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in

2011-05-09 Thread Pinto Elia 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   09-May-2011 17:14:20
  Branch: HEAD Handle: 2011050915141901

  Modified files:
rpm CHANGES
rpm/macros  macros.in

  Log:
Give the right name to the security arbitrary tags

  Summary:
RevisionChanges Path
1.3630  +1  -0  rpm/CHANGES
1.54+2  -2  rpm/macros/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3629 -r1.3630 CHANGES
  --- rpm/CHANGES   9 May 2011 14:10:09 -   1.3629
  +++ rpm/CHANGES   9 May 2011 15:14:19 -   1.3630
  @@ -1,4 +1,5 @@
   5.4.0 -> 5.4.1:
  +- devzero2000: Give the right name to the security arbitrary tags
   - devzero2000: document arbitrary tags in the spec manual
   - devzero2000: added arbitrary tag for security description and 
reference.
 Fix a typo in arbitrary_tag_tests also.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.53 -r1.54 macros.in
  --- rpm/macros/macros.in  9 May 2011 13:53:25 -   1.53
  +++ rpm/macros/macros.in  9 May 2011 15:14:20 -   1.54
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.53 2011/05/09 13:53:25 devzero2000 Exp $
  +# $Id: macros.in,v 1.54 2011/05/09 15:14:20 devzero2000 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
  @@ -286,7 +286,7 @@
   # Colon separated list of permitted arbitrary tag names
   %_arbitrary_tags_debian  
Priority:Essential:Depends:Predepends:Recommends:Suggests:Enhances:Breaks:
   %_arbitrary_tags_tests   Foo:Bar
  -%_arbitrary_tags_security  CVEID:RHSA:RHBZ:MDVSA:SUSE-SA:CVSSv2
  +%_arbitrary_tags_security  Cveid:Rhsa:Mdvsa:Cvssv2:Rhbz:Susesa
   %_arbitrary_tags 
Class:Track:Trackprog:Depflags:Transflags:%{_arbitrary_tags_debian}:%{_arbitrary_tags_tests}:%{_arbitrary_tags_security}
   
   
#==
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in

2011-05-09 Thread Pinto Elia 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   09-May-2011 15:53:26
  Branch: HEAD Handle: 2011050913532501

  Modified files:
rpm CHANGES
rpm/macros  macros.in

  Log:
added arbitrary tag for security description and reference.
Fix a typo in arbitrary_tag_tests also.

Submitted by: Elia Pinto

  Summary:
RevisionChanges Path
1.3628  +2  -0  rpm/CHANGES
1.53+4  -3  rpm/macros/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3627 -r1.3628 CHANGES
  --- rpm/CHANGES   9 May 2011 12:44:48 -   1.3627
  +++ rpm/CHANGES   9 May 2011 13:53:26 -   1.3628
  @@ -1,4 +1,6 @@
   5.4.0 -> 5.4.1:
  +- devzero2000: added arbitrary tag for security description and 
reference.
  +  Fix a typo in arbitrary_tag_tests also.
   - devzero2000: fix typo, add more info to per_transaction_dependecies 
doc.
 Distribuite it also.
   - devzero2000: add a preliminary docs on per_transaction_dependecies,
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.52 -r1.53 macros.in
  --- rpm/macros/macros.in  3 Apr 2011 19:56:55 -   1.52
  +++ rpm/macros/macros.in  9 May 2011 13:53:25 -   1.53
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.52 2011/04/03 19:56:55 jbj Exp $
  +# $Id: macros.in,v 1.53 2011/05/09 13:53:25 devzero2000 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
  @@ -285,8 +285,9 @@
   #
   # Colon separated list of permitted arbitrary tag names
   %_arbitrary_tags_debian  
Priority:Essential:Depends:Predepends:Recommends:Suggests:Enhances:Breaks:
  -$_arbitrary_tags_tests   Foo:Bar
  -%_arbitrary_tags 
Class:Track:Trackprog:Depflags:Transflags:%{_arbitrary_tags_debian}:%{_arbitrary_tags_tests}
  +%_arbitrary_tags_tests   Foo:Bar
  +%_arbitrary_tags_security  CVEID:RHSA:RHBZ:MDVSA:SUSE-SA:CVSSv2
  +%_arbitrary_tags 
Class:Track:Trackprog:Depflags:Transflags:%{_arbitrary_tags_debian}:%{_arbitrary_tags_tests}:%{_arbitrary_tags_security}
   
   
#==
   #  Database configuration macros.
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in

2011-04-03 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:   03-Apr-2011 21:56:55
  Branch: HEAD Handle: 2011040319565401

  Modified files:
rpm CHANGES
rpm/macros  macros.in

  Log:
- mongo: stub-in a configurable mongodb:// %_mongodb URI.

  Summary:
RevisionChanges Path
1.3597  +1  -0  rpm/CHANGES
1.52+10 -1  rpm/macros/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3596 -r1.3597 CHANGES
  --- rpm/CHANGES   3 Apr 2011 19:22:54 -   1.3596
  +++ rpm/CHANGES   3 Apr 2011 19:56:54 -   1.3597
  @@ -1,4 +1,5 @@
   5.4.0 -> 5.4.1:
  +- jbj: mongo: stub-in a configurable mongodb:// %_mongodb URI.
   - jbj: autofu: fix: remove --with-js remnants.
   - jbj: autofu: drop --with-js=internal now that JS 1.8.5 is available.
   - jbj: fix: reduce false positives checking for duplicate keys (#62822).
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.51 -r1.52 macros.in
  --- rpm/macros/macros.in  1 Apr 2011 05:09:40 -   1.51
  +++ rpm/macros/macros.in  3 Apr 2011 19:56:55 -   1.52
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.51 2011/04/01 05:09:40 pkarlsen Exp $
  +# $Id: macros.in,v 1.52 2011/04/03 19:56:55 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
  @@ -265,6 +265,15 @@
   #%_pgp_name
   #%_pgp_path
   
  +#Elements necessary to construct a mongodb:// URI configurably
  +#
  +%__mongodb_user  luser
  +%__mongodb_password  %{nil}
  +%__mongodb_host  tempest.mongohq.com
  +%__mongodb_port  10017
  +%__mongodb_database  cooker
  +%_mongodb 
mongodb://%{__mongodb_user}:%{__mongodb_password}@%{__mongodb_host}:%{__mongodb_port}/%{__mongodb_database}
  +
   
#==
   #  Build configuration macros.
   #
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in

2011-03-31 Thread Pinto Elia 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   31-Mar-2011 09:40:20
  Branch: HEAD Handle: 2011033107401901

  Modified files:
rpm CHANGES
rpm/macros  macros.in

  Log:
I misread the private review, repost as the original patch

  Summary:
RevisionChanges Path
1.3588  +1  -0  rpm/CHANGES
1.50+3  -3  rpm/macros/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3587 -r1.3588 CHANGES
  --- rpm/CHANGES   30 Mar 2011 16:27:06 -  1.3587
  +++ rpm/CHANGES   31 Mar 2011 07:40:19 -  1.3588
  @@ -1,4 +1,5 @@
   5.4.0 -> 5.4.1:
  +- devzero2000: misread the review, repost as the original patch
   - devzero2000: change the order for the _initddir macro assignment
   - proyvind: mandriva: add systemd macros (mdvbz#62741, from Andrey 
Borzenkov).
   - proyvind: dbconvert: fix conversion to older hash database format
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.49 -r1.50 macros.in
  --- rpm/macros/macros.in  31 Mar 2011 07:20:45 -  1.49
  +++ rpm/macros/macros.in  31 Mar 2011 07:40:20 -  1.50
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.49 2011/03/31 07:20:45 devzero2000 Exp $
  +# $Id: macros.in,v 1.50 2011/03/31 07:40:20 devzero2000 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
  @@ -866,9 +866,9 @@
   %_mandir %{_datarootdir}/man
   %_localedir  %{_datarootdir}/locale
   %_lispdir%{_datarootdir}/emacs/site-lisp
  +%_initddir   %{_sysconfdir}/rc.d/init.d
   # This is a deprecated misspelling, present for backwards compatibility.
  -%_initrddir %{_sysconfdir}/rc.d/init.d
  -%_initddir   %{_initrddir}
  +%_initrddir %{_initddir}
   
   #-
   #   Multilibs
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in

2011-03-30 Thread Pinto Elia 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   30-Mar-2011 18:27:07
  Branch: HEAD Handle: 2011033016270601

  Modified files:
rpm CHANGES
rpm/macros  macros.in

  Log:
change the order for the _initddir macro assignment

  Summary:
RevisionChanges Path
1.3587  +1  -0  rpm/CHANGES
1.48+3  -3  rpm/macros/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3586 -r1.3587 CHANGES
  --- rpm/CHANGES   30 Mar 2011 14:33:34 -  1.3586
  +++ rpm/CHANGES   30 Mar 2011 16:27:06 -  1.3587
  @@ -1,4 +1,5 @@
   5.4.0 -> 5.4.1:
  +- devzero2000: change the order for the _initddir macro assignment
   - proyvind: mandriva: add systemd macros (mdvbz#62741, from Andrey 
Borzenkov).
   - proyvind: dbconvert: fix conversion to older hash database format
resulting in "missing" package from rpmdb.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.47 -r1.48 macros.in
  --- rpm/macros/macros.in  30 Mar 2011 11:10:59 -  1.47
  +++ rpm/macros/macros.in  30 Mar 2011 16:27:07 -  1.48
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.47 2011/03/30 11:10:59 devzero2000 Exp $
  +# $Id: macros.in,v 1.48 2011/03/30 16:27:07 devzero2000 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
  @@ -866,9 +866,9 @@
   %_mandir %{_datarootdir}/man
   %_localedir  %{_datarootdir}/locale
   %_lispdir%{_datarootdir}/emacs/site-lisp
  -%_initddir  %{_sysconfdir}/rc.d/init.d
   # This is a deprecated misspelling, present for backwards compatibility.
  -%_initrddir  %{_initddir}
  +%_initrddir %{_sysconfdir}/rc.d/init.d
  +%_initddir   %{_initrdir}
   
   #-
   #   Multilibs
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in

2011-03-30 Thread Pinto Elia 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   30-Mar-2011 12:53:26
  Branch: HEAD Handle: 2011033010532600

  Modified files:
rpm CHANGES
rpm/macros  macros.in

  Log:
devzero2000: add %_initddir macro for Mandriva
(ref http://lists.mandriva.com/maintainers/2011-03/msg00252.php)

  Summary:
RevisionChanges Path
1.3584  +2  -0  rpm/CHANGES
1.46+5  -3  rpm/macros/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3583 -r1.3584 CHANGES
  --- rpm/CHANGES   29 Mar 2011 08:02:27 -  1.3583
  +++ rpm/CHANGES   30 Mar 2011 10:53:26 -  1.3584
  @@ -1,4 +1,6 @@
   5.4.0 -> 5.4.1:
  +- devzero2000: add %_initddir macro for Mandriva 
  +  (ref http://lists.mandriva.com/maintainers/2011-03/msg00252.php)
   - jbj: fix: reduce false positives checking for 
 duplicate keys (mdvbz#62822).
   - jbj: uuid: permit --qf '%{RPMTAG:uuid}' UUIDv1/UUIDv5 output display.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.45 -r1.46 macros.in
  --- rpm/macros/macros.in  29 Mar 2011 08:02:27 -  1.45
  +++ rpm/macros/macros.in  30 Mar 2011 10:53:26 -  1.46
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.45 2011/03/29 08:02:27 devzero2000 Exp $
  +# $Id: macros.in,v 1.46 2011/03/30 10:53:26 devzero2000 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
  @@ -866,8 +866,10 @@
   %_mandir %{_datarootdir}/man
   %_localedir  %{_datarootdir}/locale
   %_lispdir%{_datarootdir}/emacs/site-lisp
  -
  -%_initrddir  %{_sysconfdir}/rc.d/init.d
  +%_initddir  %{_sysconfdir}/rc.d/init.d
  +# This is a deprecated misspelling, present for backwards compatibility.
  +# %_initrddir %{_initddir}
  +%_initrddir  %{_initddir}
   
   #-
   #   Multilibs
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in rpm/ rpmpopt.in

2011-03-24 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:   24-Mar-2011 22:25:50
  Branch: HEAD Handle: 2011032421254901

  Modified files:
rpm CHANGES rpmpopt.in
rpm/macros  macros.in

  Log:
- add a --nofsync popt alias (caveat: experimental & risky).

  Summary:
RevisionChanges Path
1.3575  +1  -0  rpm/CHANGES
1.44+3  -2  rpm/macros/macros.in
2.94+4  -16 rpm/rpmpopt.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3574 -r1.3575 CHANGES
  --- rpm/CHANGES   24 Mar 2011 13:34:23 -  1.3574
  +++ rpm/CHANGES   24 Mar 2011 21:25:49 -  1.3575
  @@ -1,4 +1,5 @@
   5.4.0 -> 5.4.1:
  +- jbj: add a --nofsync popt alias (caveat: experimental & risky).
   - devzero2000: drop borken test on change a directory with a symlink
   - proyvind: always run %clean so it won't be required in .spec file.
   - devzero2000: permit in configure phase to enable the 
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.43 -r1.44 macros.in
  --- rpm/macros/macros.in  10 Feb 2011 21:13:06 -  1.43
  +++ rpm/macros/macros.in  24 Mar 2011 21:25:50 -  1.44
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.43 2011/02/10 21:13:06 pkarlsen Exp $
  +# $Id: macros.in,v 1.44 2011/03/24 21:25:50 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
  @@ -298,7 +298,8 @@
   #==
   
   # Use Berkeley DB transaction logging for rpmdb ACID behavior.
  -%__dbi_txn  create lock log mpool txn auto_commit thread thread_count=64
  +# XXX the %{?__nofsync} is passed from the --nofsync popt alias on the rpm 
cli.
  +%__dbi_txn  create %{?__nofsync:nofsync} lock log mpool txn auto_commit 
thread thread_count=64
   
   %__dbi_other %{?_tmppath:tmpdir=%{_tmppath}} %{?__dbi_txn}
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmpopt.in
  
  $ cvs diff -u -r2.93 -r2.94 rpmpopt.in
  --- rpm/rpmpopt.in24 Feb 2011 19:31:23 -  2.93
  +++ rpm/rpmpopt.in24 Mar 2011 21:25:49 -  2.94
  @@ -2,7 +2,7 @@
   # \verbatim
   #
   # @USRLIBRPM@/@configure_input@
  -# $Id: rpmpopt.in,v 2.93 2011/02/24 19:31:23 pkarlsen Exp $
  +# $Id: rpmpopt.in,v 2.94 2011/03/24 21:25:49 jbj Exp $
   #
   # This file *should not be modified*. Local customizations
   # belong in /etc/popt, not here. This file will be replaced
  @@ -387,6 +387,9 @@
   rpm  alias --rebuilddbapi --define '_dbapi_rebuild !#:+'
   rpm  alias --rebuilddbpath--define '_dbpath_rebuild !#:+'
   
  +# permit fsync disabling of Berkeley DB (caveat: experimental & risky)
  +rpm  alias --nofsync --define '__nofsync nofsync'
  +
   
#==
   #[--dbpath DIRECTORY""use database in DIRECTORY"
   rpm  alias --dbpath  --define '_dbpath !#:+'
  @@ -426,21 +429,6 @@
   rpm  alias --arch --qf '%-34{=NAME}\t%{ARCH}\n' \
--POPTdesc=$"list package architecture"
   
#==
  -rpmb alias --dbpath  --define '_dbpath !#:+' \
  - --POPTdesc=$"use database in DIRECTORY" \
  - --POPTargs=$"DIRECTORY"
  -rpmb alias --ftpport --define '_ftpport !#:+'
  -rpmb alias --ftpproxy--define '_ftpproxy !#:+'
  -rpmb alias --httpport--define '_httpport !#:+'
  -rpmb alias --httpproxy   --define '_httpproxy !#:+'
  -rpmb alias --timecheck   --define '_timecheck !#:+'
  -rpmb alias --with--define "_with_!#:+   --with-!#:+" \
  - --POPTdesc=$"enable configure  for build" \
  - --POPTargs=$""
  -rpmb alias --without --define "_without_!#:+--without-!#:+" \
  - --POPTdesc=$"disable configure  for build" \
  - --POPTargs=$""
  
-#==
   rpmbuild alias --dbpath  --define '_dbpath !#:+' \
--POPTdesc=$"use database in DIRECTORY" \
--POPTargs=$"DIRECTORY"
  @@ .
_

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in

2010-12-25 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:   25-Dec-2010 20:10:31
  Branch: HEAD Handle: 2010122519103001

  Modified files:
rpm CHANGES
rpm/macros  macros.in

  Log:
- rpmdb: disable Depcache, --install and "make test" todo++.

  Summary:
RevisionChanges Path
1.3519  +1  -0  rpm/CHANGES
1.42+2  -2  rpm/macros/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3518 -r1.3519 CHANGES
  --- rpm/CHANGES   25 Dec 2010 18:07:07 -  1.3518
  +++ rpm/CHANGES   25 Dec 2010 19:10:30 -  1.3519
  @@ -1,4 +1,5 @@
   5.3.7 -> 5.4a1:
  +- jbj: rpmdb: disable Depcache, --install and "make test" todo++.
   - jbj: distcheck: tests: move target from "check" to "test".
   - jbj: distcheck: no globs, only explict lists, for EXTRA_DIST.
   - jbj: distcheck: make internal neon "opt-in", avoid GSS-API wrestling.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.41 -r1.42 macros.in
  --- rpm/macros/macros.in  24 Dec 2010 17:31:41 -  1.41
  +++ rpm/macros/macros.in  25 Dec 2010 19:10:31 -  1.42
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.41 2010/12/24 17:31:41 jbj Exp $
  +# $Id: macros.in,v 1.42 2010/12/25 19:10:31 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
  @@ -334,7 +334,7 @@
   %_bt_dupsortbt_dupsort primary=Packages
   %_h_dupsort h_dupsort primary=Packages
   
  -%_dbi_tags_3
Packages:Depcache:Name:Version:Release:Arch:Os:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Seqno:Btree:Hash:Queue:Recno
  +%_dbi_tags_3
Packages:Name:Version:Release:Arch:Os:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Seqno:Btree:Hash:Queue:Recno
   
   %_dbi_tags_4
Packages:Name:Version:Release:Arch:Os:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in

2010-12-24 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:   24-Dec-2010 18:31:41
  Branch: HEAD Handle: 2010122417313902

  Modified files:
rpm CHANGES
rpm/macros  macros.in

  Log:
- rpmdb: use Depchache store by default again.

  Summary:
RevisionChanges Path
1.3514  +1  -0  rpm/CHANGES
1.41+2  -2  rpm/macros/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3513 -r1.3514 CHANGES
  --- rpm/CHANGES   24 Dec 2010 17:28:51 -  1.3513
  +++ rpm/CHANGES   24 Dec 2010 17:31:39 -  1.3514
  @@ -1,4 +1,5 @@
   5.3.7 -> 5.4a1:
  +- jbj: rpmdb: use Depchache store by default again.
   - jbj: db3: fix: avoid non-root EPERM with temp Depcache close.
   - jbj: db3: adjust event debugging, add DB->cursor() open flags.
   - jbj: rpmdb: rename the dependency cache pseudo-tag.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.40 -r1.41 macros.in
  --- rpm/macros/macros.in  24 Dec 2010 14:31:05 -  1.40
  +++ rpm/macros/macros.in  24 Dec 2010 17:31:41 -  1.41
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.40 2010/12/24 14:31:05 jbj Exp $
  +# $Id: macros.in,v 1.41 2010/12/24 17:31:41 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
  @@ -334,7 +334,7 @@
   %_bt_dupsortbt_dupsort primary=Packages
   %_h_dupsort h_dupsort primary=Packages
   
  -%_dbi_tags_3
Packages:Name:Version:Release:Arch:Os:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Seqno:Btree:Hash:Queue:Recno
  +%_dbi_tags_3
Packages:Depcache:Name:Version:Release:Arch:Os:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Seqno:Btree:Hash:Queue:Recno
   
   %_dbi_tags_4
Packages:Name:Version:Release:Arch:Os:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in rpm/tests/ macros.in

2010-10-17 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:   18-Oct-2010 02:30:47
  Branch: HEAD Handle: 2010101800304601

  Modified files:
rpm CHANGES
rpm/macros  macros.in
rpm/tests   macros.in

  Log:
- tests: fix: eliminate the need to jump start "make check"
by copy macros from within tree to /usr/lib/rpm.
- tests: lose all the *.spec build peculier macros just added.

  Summary:
RevisionChanges Path
1.3474  +3  -0  rpm/CHANGES
1.38+43 -25 rpm/macros/macros.in
1.33+14 -0  rpm/tests/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3473 -r1.3474 CHANGES
  --- rpm/CHANGES   16 Oct 2010 09:58:47 -  1.3473
  +++ rpm/CHANGES   18 Oct 2010 00:30:46 -  1.3474
  @@ -1,4 +1,7 @@
   5.3.4 -> 5.4a1:
  +- jbj: tests: fix: eliminate the need to jump start "make check"
  +by copy macros from within tree to /usr/lib/rpm.
  +- jbj: tests: lose all the *.spec build peculier macros just added.
   - proyvind: add gem_helper.rb and it's corresponding macros %gem_unpack,
%gem_build & gem_install for simplifying & streamlining ruby gem
packaging.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.37 -r1.38 macros.in
  --- rpm/macros/macros.in  16 Oct 2010 04:37:54 -  1.37
  +++ rpm/macros/macros.in  18 Oct 2010 00:30:47 -  1.38
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.37 2010/10/16 04:37:54 pkarlsen Exp $
  +# $Id: macros.in,v 1.38 2010/10/18 00:30:47 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
  @@ -46,7 +46,6 @@
   %_usrlibrpmbin   %{_usrlibrpm}/bin
   %__chroot%{_usrlibrpmbin}/chroot
   %__cp%{_usrlibrpmbin}/cp
  -%__dbsql %{_usrlibrpmbin}/dbsql
   %__find  %{_usrlibrpmbin}/find
   %__grep  %{_usrlibrpmbin}/grep
   %__lua   %{_usrlibrpmbin}/lua
  @@ -280,10 +279,6 @@
   %_arbitrary_tags 
Class:Track:Trackprog:Depflags:Transflags:%{_arbitrary_tags_debian}
   
   
#==
  -#  SELinux configuration macros.
  -%{load:%{_usrlibrpm}/macros.d/selinux}
  -
  
-#==
   #  Database configuration macros.
   #Macros used to configure Berkley db parameters.
   #
  @@ -896,10 +891,6 @@
   %_target_vendor  %{_host_vendor}
   %_target_os  %{_host_os}
   
  
-#==
  -#  rpmbuild macros.
  -%{load:%{_usrlibrpm}/macros.rpmbuild}
  -
   #
   # lua macros
   #
  @@ -912,6 +903,48 @@
   #}1}%{rpm_license_check}
   
   #
  +# executable(...) configuration.
  +#
  +# Path to scripts to autogenerate executable(foo) script dependencies,
  +#
  +# Note: Used iff _use_internal_dependency_generator is non-zero. The
  +# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
  +#%__executable_provides  %{_rpmhome}/executabledeps.sh --provides
  +#%__executable_requires  %{_rpmhome}/executabledeps.sh --requires
  +%__scriptlet_requires%{__bash} --rpm-requires
  +
  
+#==
  +# XXX Caveat:
  +# XXX With %{load:...} being interpreted immediately -- not lazily --
  +# XXX within a macro init file, a failure to load causes immediate loading
  +# XXX termination silently.
  +# XXX
  +# XXX So the order as well as the existence of the %{load:...} macros below
  +# XXX are critically important.
  +# XXX
  +# XXX Note also that loaded macro files can NOT recursively load other
  +# XXX macro files; only a top-level (i.e. after --macros, or within a *.spec)
  +# XXX file is permitted to do %{load:...}. The reason for the rule is to
  +# XXX prevent recursive loops: there's no known need for immediate loading
  +# XXX EXCEPT as a construction artifact whi

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in rpm/rpmdb/ pkgio.c

2010-05-20 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:   21-May-2010 05:16:15
  Branch: HEAD Handle: 2010052103161401

  Modified files:
rpm CHANGES
rpm/macros  macros.in
rpm/rpmdb   pkgio.c

  Log:
- hkp: pull the trailing "...=0x" out of _hkp_keyserver_query.

  Summary:
RevisionChanges Path
1.3360  +1  -0  rpm/CHANGES
1.29+2  -2  rpm/macros/macros.in
1.107   +1  -1  rpm/rpmdb/pkgio.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3359 -r1.3360 CHANGES
  --- rpm/CHANGES   20 May 2010 19:46:09 -  1.3359
  +++ rpm/CHANGES   21 May 2010 03:16:14 -  1.3360
  @@ -1,4 +1,5 @@
   5.3.0 -> 5.4a1:
  +- jbj: hkp: pull the trailing "...=0x" out of _hkp_keyserver_query.
   - jbj: hkp: retrofit macro madness disablers for hkp:// lookups.
   - jbj: hkp: permit string lookups.
   - jbj: iob: increase max. buffer from 256Kb to 1Mb for pubkeys.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.28 -r1.29 macros.in
  --- rpm/macros/macros.in  3 Mar 2010 15:43:08 -   1.28
  +++ rpm/macros/macros.in  21 May 2010 03:16:15 -  1.29
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.28 2010/03/03 15:43:08 jbj Exp $
  +# $Id: macros.in,v 1.29 2010/05/21 03:16:15 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
  @@ -500,7 +500,7 @@
   # Horowitz Key Protocol server configuration
   #
   %_hkp_keyserver hkp://keys.rpm5.org
  -%_hkp_keyserver_query   %{_hkp_keyserver}/pks/lookup?op=get&search=0x
  +%_hkp_keyserver_query   %{_hkp_keyserver}/pks/lookup?op=get&search=
   
   
#==
   #  Transaction macros.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/pkgio.c
  
  $ cvs diff -u -r1.106 -r1.107 pkgio.c
  --- rpm/rpmdb/pkgio.c 8 May 2010 22:53:26 -   1.106
  +++ rpm/rpmdb/pkgio.c 21 May 2010 03:16:15 -  1.107
  @@ -263,7 +263,7 @@
   
   /* Try keyserver lookup. */
   if (ts->pkpkt == NULL) {
  - const char * fn = rpmExpand("%{_hkp_keyserver_query}",
  + const char * fn = rpmExpand("%{_hkp_keyserver_query}", "0x",
pgpHexStr(sigp->signid, sizeof(sigp->signid)), NULL);
   
xx = (fn && *fn != '%')
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in

2010-02-21 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:   21-Feb-2010 18:11:10
  Branch: HEAD Handle: 2010022117110901

  Modified files:
rpm CHANGES
rpm/macros  macros.in

  Log:
- hkp: add keys.rpm5.org as the default pubkey server.

  Summary:
RevisionChanges Path
1.3271  +1  -0  rpm/CHANGES
1.27+2  -2  rpm/macros/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3270 -r1.3271 CHANGES
  --- rpm/CHANGES   16 Feb 2010 15:12:20 -  1.3270
  +++ rpm/CHANGES   21 Feb 2010 17:11:09 -  1.3271
  @@ -1,5 +1,6 @@
   
   5.2b1 -> 5.3a1
  +- jbj: hkp: add keys.rpm5.org as the default pubkey server.
   - jbj: fix: split NV iff V starts with digit string in lookupPackage().
   - jbj: fix: remove the inheirited %description before adding explicitly.
   - jbj: use a Bloom filter so that build sanity checks scale.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.26 -r1.27 macros.in
  --- rpm/macros/macros.in  25 Dec 2009 17:41:36 -  1.26
  +++ rpm/macros/macros.in  21 Feb 2010 17:11:10 -  1.27
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.26 2009/12/25 17:41:36 jbj Exp $
  +# $Id: macros.in,v 1.27 2010/02/21 17:11:10 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
  @@ -498,7 +498,7 @@
   
   # Horowitz Key Protocol server configuration
   #
  -%_hkp_keyserver hkp://subkeys.pgp.net
  +%_hkp_keyserver hkp://keys.rpm5.org
   %_hkp_keyserver_query   %{_hkp_keyserver}/pks/lookup?op=get&search=0x
   
   
#==
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in rpm/tests/ Makefile.am r...

2009-12-25 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:   25-Dec-2009 18:41:37
  Branch: HEAD Handle: 2009122517413601

  Modified files:
rpm CHANGES
rpm/macros  macros.in
rpm/tests   Makefile.am
rpm/tests/ref   .alldigests showrc

  Log:
- rc: rescusictate.

  Summary:
RevisionChanges Path
1.3212  +1  -0  rpm/CHANGES
1.26+2  -1  rpm/macros/macros.in
1.38+1  -0  rpm/tests/Makefile.am
1.25+100 -100   rpm/tests/ref/.alldigests
1.17+2  -1  rpm/tests/ref/showrc
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3211 -r1.3212 CHANGES
  --- rpm/CHANGES   25 Dec 2009 17:00:21 -  1.3211
  +++ rpm/CHANGES   25 Dec 2009 17:41:36 -  1.3212
  @@ -1,5 +1,6 @@
   
   5.2b1 -> 5.3a1
  +- jbj: rc: rescusictate.
   - jbj: macros: add a few more rpm-peculier execuctables.
   - jbj: mtree: avoid mtime.tv_usecs differences for now.
   - jbj: pubkeys: fix: all headers, including pubkeys, need PACKAGECOLOR.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.25 -r1.26 macros.in
  --- rpm/macros/macros.in  25 Dec 2009 17:00:22 -  1.25
  +++ rpm/macros/macros.in  25 Dec 2009 17:41:36 -  1.26
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.25 2009/12/25 17:00:22 jbj Exp $
  +# $Id: macros.in,v 1.26 2009/12/25 17:41:36 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
  @@ -49,6 +49,7 @@
   %__find  %{_usrlibrpmbin}/find
   %__grep  %{_usrlibrpmbin}/grep
   %__mtree %{_usrlibrpmbin}/mtree
  +%__rc%{_usrlibrpmbin}/rc
   %__wget  %{_usrlibrpmbin}/wget
   %__xar   %{_usrlibrpmbin}/xar
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.37 -r1.38 Makefile.am
  --- rpm/tests/Makefile.am 25 Dec 2009 16:57:02 -  1.37
  +++ rpm/tests/Makefile.am 25 Dec 2009 17:41:37 -  1.38
  @@ -21,6 +21,7 @@
   find =   $(abs_top_builddir)/tools/find
   grep =   $(abs_top_builddir)/tools/grep
   mtree =  $(abs_top_builddir)/tools/mtree
  +rc = $(abs_top_builddir)/tools/rc
   wget =   $(abs_top_builddir)/tools/wget
   xar =$(abs_top_builddir)/tools/xar
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tests/ref/.alldigests
  
  $ cvs diff -u -r1.24 -r1.25 .alldigests
  --- rpm/tests/ref/.alldigests 25 Dec 2009 16:57:02 -  1.24
  +++ rpm/tests/ref/.alldigests 25 Dec 2009 17:41:37 -  1.25
  @@ -1498,106 +1498,106 @@
   crc64:78d006d5ebc0570c  ref/repomd.xml
   adler32:9e112467  ref/repomd.xml
   jlu32:6f662ac3  ref/repomd.xml
  -md2:1f2ecea3510886b6101587016ccb2e35  ref/showrc
  -md4:e89cc73fba0e9c19dddbbe1e34efd966  ref/showrc
  -md5:3efe16b31c4ddab5a557d0373ee3c795  ref/showrc
  -sha1:e732542ca5b36094328c8588e1b8e171b038492f  ref/showrc
  -sha224:45227ef10d4bd59cb76451b2fcd9e37808281cd60a2b5c3a3c81a6b9  ref/showrc
  -sha256:fa873eac4d706cdcc4f2a0a84768dd4ee5bd27df7ba274478c4ea45997234e18  
ref/showrc
  
-sha384:8ea14abfb9846cf86d2cd5562bceb4230041b18bdfd5a5ea455ac371f8179417a45b9becf4f8ef53009cf5b834cf25e1
  ref/showrc
  
-sha512:5cb617c41c3880ccb9e9f5fca73cddf8dc623541324c948c97da200de672aa8a09d2351adc61a9612324b636f8b383b1021caa7206c50504b96865d7bd7a8adb
  ref/showrc
  -skein-224:8262c52519def3e4f3f1af8ef530088ee20eb943c93016c4afc80d7a  
ref/showrc
  -skein-256:6cd47e70c6f5317c7b18c1dbb3315dbb994ddd29d8ae3c6da762d12742a17791  
ref/showrc
  
-skein-384:2809521a067765007f93732f9c4c8393c4ae125dacc9464c0285b48c087946b894ec1fecad37f0fd6e29f82fbb7e33e4
  ref/showrc
  
-skein-512:1dd231e245d8b87da61b0b622c61b22dd88d0400b4658261fd666a222b4f89bb541dfb9009a6eef0b3706ca0bba7129eeefd72ec0f3f95c1c4915de8c36eb8af
  ref/showrc
  
-skein-1024:4c9acf615826a14486c5e0e98b71c9ed57ff93c4af42f0e460f768c37d1c28a6af7110e2b75ac1d1c99a6c036d484b445bb54c06cfb1fb85845792255faca2ac06d8131f9c8566305d453ac86b712a4995e

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in

2009-11-07 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:   07-Nov-2009 19:20:22
  Branch: HEAD Handle: 2009110718202100

  Modified files:
rpm CHANGES
rpm/macros  macros.in

  Log:
- rpmdb: change from a CDB to ACID database behahvior.

  Summary:
RevisionChanges Path
1.3146  +1  -0  rpm/CHANGES
1.21+7  -28 rpm/macros/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3145 -r1.3146 CHANGES
  --- rpm/CHANGES   7 Nov 2009 18:05:14 -   1.3145
  +++ rpm/CHANGES   7 Nov 2009 18:20:21 -   1.3146
  @@ -1,5 +1,6 @@
   
   5.2b1 -> 5.3a1
  +- jbj: rpmdb: change from a CDB to ACID database behahvior.
   - jbj: rpmdb: eliminate the custom Basenames retrieval code.
   - jbj: rpmdb: eliminate the Basenames index.
   - jbj: rpmdb: abandon RPMTAG_BASENAMES lookup, use RPMTAG_FILEPATHS 
instead.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.20 -r1.21 macros.in
  --- rpm/macros/macros.in  7 Nov 2009 16:07:05 -   1.20
  +++ rpm/macros/macros.in  7 Nov 2009 18:20:21 -   1.21
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.20 2009/11/07 16:07:05 jbj Exp $
  +# $Id: macros.in,v 1.21 2009/11/07 18:20:21 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
  @@ -286,35 +286,11 @@
   #
   #   tokenworks?  Berkeley db flag or value
   #==
  -#-- DBENV->open parameters and tunable values:
  -#-- DBENV->open and DB->open common bits:
  -#   create   DB_CREATE
  -#-- DBENV->open bits:
  -#   joinenv  DB_JOIN_ENV
  -#   mpoolDB_INIT_MPOOL
  -#   cdb  +++ DB_INIT_CDB
  -#   shared   +++ DB_SYSTEM_MEM
  -#-- DB->open parameters and tunable values:
  -#   pagesize=512 +++ DB->set_pagesize
  -#-- DB->open bits:
  -#   rdonly   DB_RDONLY
  -#-- DB->open types:
  -#   btreeDB_BTREE
  -#   hash DB_HASH
  -#   unknown  +++ DB_UNKNOWN
  -#-- DB->set_flags bits:
  -#   bt_dupsort   +++ (btree only) DB_DUPSORT
  -#   h_dupsort+++ (hash only) DB_DUPSORT
  -#--- rpmdb specific configuration:
  -#   usedbenv (always on) Use db3 environment?
  -#   verify   (db3 only) Verify Packages db after RW close?
  -#   nofsync  Disable fsync(2) call performed after db3 writes?
  -#   temporaryUnlink file when closing.
   
  -# Use a CDB database model for concurrent access.
  -%__dbi_cdb   create cdb mpool thread_count=64
  +# Use Berkeley DB transaction logging for rpmdb ACID behavior.
  +%__dbi_txn  create lock log mpool txn auto_commit thread thread_count=64
   
  -%__dbi_other %{?_tmppath:tmpdir=%{_tmppath}} %{?__dbi_cdb}
  +%__dbi_other %{?_tmppath:tmpdir=%{_tmppath}} %{?__dbi_txn}
   
   %__dbi_rebuild   nofsync !lock !txn !log !cdb 
!auto_commit
   %__dbi_transient %{?__dbi_rebuild} temporary private
  @@ -361,6 +337,9 @@
   # database tag configuration
   %_dbi_tags  %{expand:%%{_dbi_tags_%{_dbapi_used}}}
   
  +%_bt_dupsortbt_dupsort index
  +%_h_dupsort h_dupsort index
  +
   %_dbi_tags_3
Packages:Name:Version:Release:Arch:Os:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Seqno:Btree:Hash:Queue:Recno
   
   %_dbi_tags_4
Packages:Name:Version:Release:Arch:Os:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in rpm/rpmdb/ bdb.sql

2009-11-07 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:   07-Nov-2009 17:07:06
  Branch: HEAD Handle: 2009110716070500

  Modified files:
rpm CHANGES
rpm/macros  macros.in
rpm/rpmdb   bdb.sql

  Log:
- rpmdb: eliminate the Basenames index.

  Summary:
RevisionChanges Path
1.3144  +1  -0  rpm/CHANGES
1.20+2  -2  rpm/macros/macros.in
1.4 +0  -6  rpm/rpmdb/bdb.sql
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3143 -r1.3144 CHANGES
  --- rpm/CHANGES   7 Nov 2009 16:02:34 -   1.3143
  +++ rpm/CHANGES   7 Nov 2009 16:07:05 -   1.3144
  @@ -1,5 +1,6 @@
   
   5.2b1 -> 5.3a1
  +- jbj: rpmdb: eliminate the Basenames index.
   - jbj: rpmdb: abandon RPMTAG_BASENAMES lookup, use RPMTAG_FILEPATHS 
instead.
   - jbj: rpmts: stub-in a grandparent transaction.
   - jbj: poptDB: wire up --rpmtxndebug, collect other rpmdb debugging 
options.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.19 -r1.20 macros.in
  --- rpm/macros/macros.in  6 Oct 2009 23:06:18 -   1.19
  +++ rpm/macros/macros.in  7 Nov 2009 16:07:05 -   1.20
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.19 2009/10/06 23:06:18 jbj Exp $
  +# $Id: macros.in,v 1.20 2009/11/07 16:07:05 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
  @@ -361,7 +361,7 @@
   # database tag configuration
   %_dbi_tags  %{expand:%%{_dbi_tags_%{_dbapi_used}}}
   
  -%_dbi_tags_3
Packages:Name:Version:Release:Arch:Os:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Seqno:Btree:Hash:Queue:Recno
  +%_dbi_tags_3
Packages:Name:Version:Release:Arch:Os:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Seqno:Btree:Hash:Queue:Recno
   
   %_dbi_tags_4
Packages:Name:Version:Release:Arch:Os:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/bdb.sql
  
  $ cvs diff -u -r1.3 -r1.4 bdb.sql
  --- rpm/rpmdb/bdb.sql 4 Oct 2009 00:21:52 -   1.3
  +++ rpm/rpmdb/bdb.sql 7 Nov 2009 16:07:05 -   1.4
  @@ -13,12 +13,6 @@
N   VARCHAR2(64) PRIMARY KEY
   );
   
  -CREATE TABLE _Basenames( /*+ DBTYPE = BTREE */
  - hx  INTEGER REFERENCES Packages(instance),
  - ix  INTEGER,
  - bn  VARCHAR2(64) PRIMARY KEY
  -);
  -
   CREATE TABLE _Providename( /*+ DBTYPE = BTREE */
hx  INTEGER REFERENCES Packages(instance),
N   VARCHAR2(64) PRIMARY KEY
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in rpm/rpmdb/ db3.c hdrfmt....

2009-10-02 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:   02-Oct-2009 18:05:18
  Branch: HEAD Handle: 2009100216051601

  Modified files:
rpm CHANGES
rpm/macros  macros.in
rpm/rpmdb   db3.c hdrfmt.c rpmdb.c rpmtag.h

  Log:
- dbi: tear out the rpmdb->db_rebuilding construction scaffholding.
DB->associate() cascaded callbacks to generate bulk secondary index 
key
stores are now functional with --rebuilddb.
- dbi: add uniqification filtering for argv/uint32_t/uint64_t secondary 
keys.
DB_DUPSORT can likely be free;y applied as a schema qualifier.
- dbi: add currently existing secondary key filtering and transforms
through the DB->associate() callback.
- dbi: Backout the PRCO EVR/F tables, the PRCO assertion tables won't need 
no
steenkin' joins.
- dbi: add tables for PRCO dependency assertions based on YAML spewage.
rude & crude but "works".

  Summary:
RevisionChanges Path
1.3137  +13 -0  rpm/CHANGES
1.12+12 -17 rpm/macros/macros.in
1.105   +249 -117   rpm/rpmdb/db3.c
1.143   +16 -4  rpm/rpmdb/hdrfmt.c
1.314   +1  -1  rpm/rpmdb/rpmdb.c
1.67+5  -0  rpm/rpmdb/rpmtag.h
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3136 -r1.3137 CHANGES
  --- rpm/CHANGES   2 Oct 2009 05:46:01 -   1.3136
  +++ rpm/CHANGES   2 Oct 2009 16:05:16 -   1.3137
  @@ -1,5 +1,18 @@
   
   5.2b1 -> 5.3a1
  +- jbj: dbi: tear out the rpmdb->db_rebuilding construction scaffholding.
  + DB->associate() cascaded callbacks to generate bulk secondary index key
  + stores are now functional with --rebuilddb.
  +- jbj: add uniqification filtering for argv/uint32_t/uint64_t secondary 
keys.
  + DB_DUPSORT can likely be free;y applied as a schema qualifier.
  +- jbj: dbi: add currently existing secondary key filtering and transforms
  + through the DB->associate() callback.
  +- jbj: dbi: Backout the PRCO EVR/F tables, the PRCO assertion tables 
won't need no
  + steenkin' joins.
  +- jbj: dbi: add tables for PRCO dependency assertions based on YAML 
spewage.
  + rude & crude but "works".
  +- jbj: rpmtag: make sure that he->tag contains the assigned tag numbers.
  +- jbj: rpmtag: assign numbers to the YAML PRCO tags to index assertions.
   - jbj: rpmbf: pass string length where needed.
   - jbj: dbi: commit to DB->associate() secondary indices as default
(w exceptions, todo++).
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.11 -r1.12 macros.in
  --- rpm/macros/macros.in  1 Oct 2009 19:24:37 -   1.11
  +++ rpm/macros/macros.in  2 Oct 2009 16:05:17 -   1.12
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.11 2009/10/01 19:24:37 jbj Exp $
  +# $Id: macros.in,v 1.12 2009/10/02 16:05:17 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
  @@ -364,43 +364,38 @@
   
   # database tag configuration
   %_dbi_tags  %{expand:%%{_dbi_tags_%{_dbapi_used}}}
  -%_dbi_tags_3
Packages:Name:Basenames:Triggername:Dirnames:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Group:Conflictname:Conflictversion:Conflictflags:Installtid:Obsoletename:Obsoleteversion:Obsoleteflags:Providename:Provideversion:Provideflags:Requirename:Requireversion:Requireflags:Sha1header:Sigmd5
  -%_dbi_tags_4
Packages:Name:Basenames:Group:Providename:Requirename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Group:Obsoletename:Obsoleteversion:Obsoleteflags
  +%_dbi_tags_3
Packages:Name:Basenames:Triggername:Dirnames:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Group:Conflictname:Conflictyamlentry:Installtid:Obsoletename:Obsoleteyamlentry:Providename:Provideyamlentry:Requirename:Requireyamlentry:Sha1header:Sigmd5
  +%_dbi_tags_4
Packages:Name:Basenames:Group:Providename:Requirename:Conflictname:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:P

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in rpm/rpmdb/ db3.c

2009-10-01 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:   01-Oct-2009 21:24:37
  Branch: HEAD Handle: 2009100119243601

  Modified files:
rpm CHANGES
rpm/macros  macros.in
rpm/rpmdb   db3.c

  Log:
- dbi: commit to DB->associate() secondary indices as default
(w exceptions, todo++).
- dbi: commit to DB_DUP/DB_DUPSORT as default (w exceptions, todo++).
- dbi: commit to dbi->dbi_jlen == 4 as default (w exceptions, todo++).
- dbi: commit to DB_BTREE as default (w exceptions, todo++).

  Summary:
RevisionChanges Path
1.3135  +5  -0  rpm/CHANGES
1.11+16 -16 rpm/macros/macros.in
1.104   +57 -11 rpm/rpmdb/db3.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3134 -r1.3135 CHANGES
  --- rpm/CHANGES   1 Oct 2009 14:52:07 -   1.3134
  +++ rpm/CHANGES   1 Oct 2009 19:24:36 -   1.3135
  @@ -1,5 +1,10 @@
   
   5.2b1 -> 5.3a1
  +- jbj: dbi: commit to DB->associate() secondary indices as default
  + (w exceptions, todo++).
  +- jbj: dbi: commit to DB_DUP/DB_DUPSORT as default (w exceptions, 
todo++).
  +- jbj: dbi: commit to dbi->dbi_jlen == 4 as default (w exceptions, 
todo++).
  +- jbj: dbi: commit to DB_BTREE as default (w exceptions, todo++).
   - jbj: dbi: permit tag tables to be secondary indices with dupes.
   - devzero2000: add security CFLAGS for GCC if supported
   - jbj: dbi: configure new indices with 4b join keys and duplicates.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.10 -r1.11 macros.in
  --- rpm/macros/macros.in  1 Oct 2009 14:39:33 -   1.10
  +++ rpm/macros/macros.in  1 Oct 2009 19:24:37 -   1.11
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.10 2009/10/01 14:39:33 jbj Exp $
  +# $Id: macros.in,v 1.11 2009/10/01 19:24:37 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
  @@ -375,32 +375,32 @@
   # database configuration: Berkeley-DB [dbapi 3 hooks]
   %_dbi_config_3  %{_dbi_btconfig}
   %_dbi_config_3_Basenames%{_dbi_btconfig}
  -%_dbi_config_3_Conflictname %{_dbi_btconfig} %{_dbi_dupsort}
  -%_dbi_config_3_Conflictversion  %{_dbi_btconfig} %{_dbi_dupsort}
  -%_dbi_config_3_Conflictflags%{_dbi_btconfig} %{_dbi_dupsort}
  +%_dbi_config_3_Conflictname %{_dbi_btconfig} %{_dbi_dupsort} index
  +%_dbi_config_3_Conflictversion  %{_dbi_btconfig} %{_dbi_dupsort} index
  +%_dbi_config_3_Conflictflags%{_dbi_btconfig} %{_dbi_dupsort} index
   %_dbi_config_3_Dirnames %{_dbi_btconfig}
   %_dbi_config_3_Filedigests  %{_dbi_htconfig}
   %_dbi_config_3_Filepaths %{_dbi_btconfig} %{_dbi_dupsort} index
   %_dbi_config_3_Group%{_dbi_btconfig} %{_dbi_dupsort} index
   %_dbi_config_3_Installtid   %{_dbi_btconfig} %{_dbi_dupsort} index
  -%_dbi_config_3_Name %{_dbi_btconfig}
  +%_dbi_config_3_Name %{_dbi_btconfig} %{_dbi_dupsort} index
   %_dbi_config_3_Nvra %{_dbi_btconfig} %{_dbi_dupsort} index noload
   %_dbi_config_3_Obsoletename %{_dbi_btconfig} %{_dbi_dupsort} index
  -%_dbi_config_3_Obsoleteversion  %{_dbi_btconfig} %{_dbi_dup}
  -%_dbi_config_3_Obsoleteflags%{_dbi_btconfig} %{_dbi_dupsort}
  +%_dbi_config_3_Obsoleteversion  %{_dbi_btconfig} %{_dbi_dup} index
  +%_dbi_config_3_Obsoleteflags%{_dbi_btconfig} %{_dbi_dupsort} index
   %_dbi_config_3_Packagecolor %{_dbi_htconfig} h_dupsort index
  -%_dbi_config_3_Providename  %{_dbi_btconfig}
  -%_dbi_config_3_Provideversion   %{_dbi_btconfig} %{_dbi_dup}
  -%_dbi_config_3_Provideflags %{_dbi_btconfig} %{_dbi_dupsort}
  +%_dbi_config_3_Providename  %{_dbi_btconfig} %{_dbi_dup} index
  +%_dbi_config_3_Provideversion   %{_dbi_btconfig} %{_dbi_dup} index
  +%_dbi_config_3_Provideflags %{_dbi_btconfig} %{_dbi_dupsort} index
   %_dbi_config_3_Pubkeys  %{_dbi_htconfig}
  -%_dbi_config_3_Removetid%{_dbi_btconfig} %{_dbi_dupsort}
  -%_dbi_config_3_Requirename  %{_dbi_btconfig}
  -%_dbi_config_3_Requireversion   %{_dbi_btconfig} %{_dbi_dup}
  -%_dbi_config_3_Requireflags %{_dbi_btconfig} %{_dbi_dupsort}
  -%_dbi_config_3_Sha1header   %{_dbi_htc

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in rpm/rpmdb/ bdb.sql db3.c...

2009-09-29 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:   29-Sep-2009 16:44:00
  Branch: HEAD Handle: 2009092914435900

  Modified files:
rpm CHANGES
rpm/macros  macros.in
rpm/rpmdb   bdb.sql db3.c dbconfig.c rpmdb.h sqlite.c

  Log:
- dbi: configure new indices with 4b join keys and duplicates.
- dbi: generate additional indices.
- dbi: add db->associate_foreign.

  Summary:
RevisionChanges Path
1.3132  +3  -0  rpm/CHANGES
1.8 +16 -8  rpm/macros/macros.in
1.2 +50 -24 rpm/rpmdb/bdb.sql
1.101   +25 -1  rpm/rpmdb/db3.c
1.64+10 -5  rpm/rpmdb/dbconfig.c
1.98+14 -0  rpm/rpmdb/rpmdb.h
1.41+21 -1  rpm/rpmdb/sqlite.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3131 -r1.3132 CHANGES
  --- rpm/CHANGES   28 Sep 2009 14:38:50 -  1.3131
  +++ rpm/CHANGES   29 Sep 2009 14:43:59 -  1.3132
  @@ -1,5 +1,8 @@
   
   5.2b1 -> 5.3a1
  +- jbj: dbi: configure new indices with 4b join keys and duplicates.
  +- jbj: dbi: generate additional indices.
  +- jbj: dbi: add db->associate_foreign.
   - devzero2000: add rpm-genenerate-loop-test-harness.sh 
   - devzero2000: add INSTALL.developer
   - jbj: order: fix: check current package for files/dirs before other 
packages.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.7 -r1.8 macros.in
  --- rpm/macros/macros.in  20 Sep 2009 01:33:56 -  1.7
  +++ rpm/macros/macros.in  29 Sep 2009 14:43:59 -  1.8
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.7 2009/09/20 01:33:56 jbj Exp $
  +# $Id: macros.in,v 1.8 2009/09/29 14:43:59 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
  @@ -364,28 +364,34 @@
   
   # database tag configuration
   %_dbi_tags  %{expand:%%{_dbi_tags_%{_dbapi_used}}}
  -%_dbi_tags_3
Packages:Name:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths
  -%_dbi_tags_4
Packages:Name:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths
  +%_dbi_tags_3
Packages:Name:Basenames:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Group:Conflictname:Conflictversion:Conflictflags:Obsoletename:Obsoleteversion:Obsoleteflags:Providename:Provideversion:Provideflags:Requirename:Requireversion:Requireflags
  +%_dbi_tags_4
Packages:Name:Basenames:Group:Providename:Requirename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Group:Obsoletename:Obsoleteversion:Obsoleteflags
   
   # database configuration: Berkeley-DB [dbapi 3 hooks]
   %_dbi_config_3  %{_dbi_btconfig}
   %_dbi_config_3_Basenames%{_dbi_btconfig}
   %_dbi_config_3_Conflictname %{_dbi_btconfig}
  +%_dbi_config_3_Conflictversion  %{_dbi_btconfig} bt_dup
  +%_dbi_config_3_Conflictflags%{_dbi_btconfig} bt_dup
   %_dbi_config_3_Dirnames %{_dbi_btconfig}
   %_dbi_config_3_Filedigests  %{_dbi_htconfig}
   %_dbi_config_3_Filepaths %{_dbi_btconfig}
  -%_dbi_config_3_Group%{_dbi_btconfig}
  +%_dbi_config_3_Group%{_dbi_btconfig} bt_dup
   %_dbi_config_3_Installtid   %{_dbi_btconfig}
   %_dbi_config_3_Name %{_dbi_btconfig}
  -%_dbi_config_3_Nvra %{_dbi_btconfig} noload
  -%_dbi_config_3_Obsoletename %{_dbi_btconfig}
  +%_dbi_config_3_Nvra %{_dbi_btconfig} bt_dup noload
  +%_dbi_config_3_Obsoletename %{_dbi_btconfig} bt_dup
  +%_dbi_config_3_Obsoleteversion  %{_dbi_btconfig} bt_dup
  +%_dbi_config_3_Obsoleteflags%{_dbi_btconfig} bt_dup
   %_dbi_config_3_Packagecolor %{_dbi_htconfig}
   %_dbi_config_3_Providename  %{_dbi_btconfig}
  -%_dbi_

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in rpm/rpmdb/ DB_CONFIG.in ...

2009-09-19 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:   20-Sep-2009 02:52:57
  Branch: HEAD Handle: 2009092000525501

  Modified files:
rpm CHANGES
rpm/macros  macros.in
rpm/rpmdb   DB_CONFIG.in db3.c dbconfig.c rpmdb.c rpmdb.h

  Log:
- rpmdb: use DB_CONFIG.

  Summary:
RevisionChanges Path
1.3127  +1  -0  rpm/CHANGES
1.6 +3  -11 rpm/macros/macros.in
1.3 +1  -1  rpm/rpmdb/DB_CONFIG.in
1.97+0  -12 rpm/rpmdb/db3.c
1.60+0  -10 rpm/rpmdb/dbconfig.c
1.311   +11 -7  rpm/rpmdb/rpmdb.c
1.94+0  -3  rpm/rpmdb/rpmdb.h
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3126 -r1.3127 CHANGES
  --- rpm/CHANGES   20 Sep 2009 00:26:40 -  1.3126
  +++ rpm/CHANGES   20 Sep 2009 00:52:55 -  1.3127
  @@ -1,5 +1,6 @@
   
   5.2b1 -> 5.3a1
  +- jbj: rpmdb: use DB_CONFIG.
   - jbj: rpmdb: install DB_CONFIG if not already present.
   - jbj: rpmdb: revert the DBENV->set_data_dir() attempt when re-opening. 
Not
the right fix, and spews an error on 4.8.24 with lazy opens in chroot.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.5 -r1.6 macros.in
  --- rpm/macros/macros.in  22 Aug 2009 22:13:54 -  1.5
  +++ rpm/macros/macros.in  20 Sep 2009 00:52:56 -  1.6
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.5 2009/08/22 22:13:54 jbj Exp $
  +# $Id: macros.in,v 1.6 2009/09/20 00:52:56 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
  @@ -308,8 +308,6 @@
   #   tokenworks?  Berkeley db flag or value
   #==
   #-- DBENV->open parameters and tunable values:
  -#   mmapsize=16MbDBENV->set_mp_mmapsize
  -#   cachesize=1MbDBENV->set_cachesize, DB->set_cachesize
   #-- DBENV->open and DB->open common bits:
   #   create   DB_CREATE
   #   thread   ??? DB_THREAD   (useless w/o posix mutexes on linux)
  @@ -340,25 +338,19 @@
   #   queue??? DB_QUEUE
   #   unknown  +++ DB_UNKNOWN
   #-- DB->set_flags bits:
  -#   bt_dup   +++ (btree only) DB_DUP
   #   bt_dupsort   +++ (btree only) DB_DUPSORT
  -#   ht_dup   +++ (hash only) DB_DUP
   #   ht_dupsort   +++ (hash only) DB_DUPSORT
   #--- rpmdb specific configuration:
   #   usedbenv (always on) Use db3 environment?
   #   verify   (db3 only) Verify Packages db after RW close?
   #   nofsync  Disable fsync(2) call performed after db3 writes?
   #   temporaryUnlink file when closing.
  -#   thread_count=64  Track pid/tid of locks in dbenv for stale lock removal
  -#
   
   # XXX Use transactions and logs for rpmdb durability (no clue yet):
  -#%__dbi_othercreate joinenv mpool txn log \
  -#mp_mmapsize=8Mb mp_size=512Kb
  +#%__dbi_othercreate joinenv mpool txn log
   
   # Use a CDB database model for concurrent access.
  -%__dbi_cdb   create cdb mpool mp_mmapsize=16Mb mp_size=1Mb \
  - thread_count=64
  +%__dbi_cdb   create cdb mpool
   
   %__dbi_other %{?_tmppath:tmpdir=%{_tmppath}} %{?__dbi_cdb}
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/DB_CONFIG.in
  
  $ cvs diff -u -r1.2 -r1.3 DB_CONFIG.in
  --- rpm/rpmdb/DB_CONFIG.in20 Sep 2009 00:29:02 -  1.2
  +++ rpm/rpmdb/DB_CONFIG.in20 Sep 2009 00:52:56 -  1.3
  @@ -6,6 +6,6 @@
   set_thread_count 64
   
   #  Memory Pool =
  -set_cachesize0 262144 0 
  +set_cachesize0 1048576 0 
   set_mp_mmapsize  16777216
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/db3.c
  
  $ cvs diff -u -r1.96 -r1.97 db3.c
  --- rpm/rpmdb/db3.c   20 Sep 2009 00:31:26 -  1.96
  +++ rpm/rpmdb/db3.c   20 Sep 2009 00:52:56 -  1