RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   27-Sep-2010 21:29:40
  Branch: rpm-5_3                          Handle: 2010092719293901

  Modified files:           (Branch: rpm-5_3)
    rpm                     CHANGES
    rpm/lib                 poptALL.c
    rpm/rpmdb               Makefile.am librpmdb.vers poptDB.c

  Log:
    - rpmrepo: move from rpmio -> rpmdb to finish tools/rpmrepo.c gutting.

  Summary:
    Revision    Changes     Path
    1.3296.2.81 +1  -0      rpm/CHANGES
    2.139.2.2   +5  -0      rpm/lib/poptALL.c
    1.124.2.5   +8  -3      rpm/rpmdb/Makefile.am
    1.86.2.1    +23 -0      rpm/rpmdb/librpmdb.vers
    1.17.2.1    +3  -0      rpm/rpmdb/poptDB.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3296.2.80 -r1.3296.2.81 CHANGES
  --- rpm/CHANGES	23 Sep 2010 15:29:10 -0000	1.3296.2.80
  +++ rpm/CHANGES	27 Sep 2010 19:29:39 -0000	1.3296.2.81
  @@ -1,4 +1,5 @@
   5.3.3 -> 5.3.4:
  +    - jbj: rpmrepo: move from rpmio -> rpmdb to finish tools/rpmrepo.c gutting.
       - jbj: perl: don't automate use RPM, @INC issues need to be solved first.
       - jbj: macosx: avoid <unistd.h> uuid_t typedef, permit --with-uuid.
       - jbj: macosx: add -fnested-functions (when available).
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/poptALL.c
  ============================================================================
  $ cvs diff -u -r2.139.2.1 -r2.139.2.2 poptALL.c
  --- rpm/lib/poptALL.c	13 Aug 2010 14:18:17 -0000	2.139.2.1
  +++ rpm/lib/poptALL.c	27 Sep 2010 19:29:40 -0000	2.139.2.2
  @@ -73,6 +73,9 @@
   extern int _pkgio_debug;
   
   /*@unchecked@*/
  +extern int _rpmrepo_debug;
  +
  +/*@unchecked@*/
   extern int _print_pkts;
   
   /*@unchecked@*/
  @@ -491,6 +494,7 @@
       extern rpmioPool _rpmmiPool;
       extern rpmioPool _dbiPool;
       extern rpmioPool _rpmdbPool;
  +    extern rpmioPool _rpmrepoPool;
       extern rpmioPool _rpmwfPool;
       extern const char * evr_tuple_order;
       extern const char * evr_tuple_match;
  @@ -528,6 +532,7 @@
   
       _rpmwfPool = rpmioFreePool(_rpmwfPool);
       _rpmdbPool = rpmioFreePool(_rpmdbPool);
  +    _rpmrepoPool = rpmioFreePool(_rpmrepoPool);
       _dbiPool = rpmioFreePool(_dbiPool);
       _headerPool = rpmioFreePool(_headerPool);
   /*@=onlyunqglobaltrans@*/
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.124.2.4 -r1.124.2.5 Makefile.am
  --- rpm/rpmdb/Makefile.am	22 May 2010 16:08:30 -0000	1.124.2.4
  +++ rpm/rpmdb/Makefile.am	27 Sep 2010 19:29:40 -0000	1.124.2.5
  @@ -50,7 +50,7 @@
   pkginc_HEADERS = pkgio.h rpmdb.h rpmevr.h rpmns.h rpmtag.h rpmtypes.h
   noinst_HEADERS = \
   	fprint.h header_internal.h legacy.h rpmdpkg.h rpmlio.h \
  -	rpmtd.h rpmtxn.h rpmwf.h signature.h
  +	rpmrepo.h rpmtd.h rpmtxn.h rpmwf.h signature.h
   
   #pkglibdir =		@USRLIBRPM@
   #pkglib_LTLIBRARIES =	libsqldb.la
  @@ -63,11 +63,16 @@
   
   usrlibdir = $(libdir)
   usrlib_LTLIBRARIES = librpmdb.la
  +# XXX rpmrepo.c needs to include templates from scripts/*
  +librpmdb_la_CPPFLAGS = \
  +	$(AM_CPPFLAGS) -I$(top_srcdir)/scripts -I$(top_builddir)/scripts \
  +	$(CPPFLAGS)
   librpmdb_la_SOURCES = \
   	dbconfig.c fprint.c \
   	hdrfmt.c hdrNVR.c header.c header_internal.c legacy.c merge.c \
  -	pkgio.c poptDB.c rpmdb.c rpmdpkg.c rpmevr.c rpmlio.c rpmns.c rpmtd.c \
  -	rpmtxn.c rpmwf.c signature.c tagname.c tagtbl.c $(logio_LSOURCES)
  +	pkgio.c poptDB.c rpmdb.c rpmdpkg.c rpmevr.c rpmlio.c rpmns.c \
  +	rpmrepo.c rpmtd.c rpmtxn.c rpmwf.c signature.c tagname.c tagtbl.c \
  +	$(logio_LSOURCES)
   librpmdb_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
   if HAVE_LD_VERSION_SCRIPT
   librpmdb_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmdb.vers
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/librpmdb.vers
  ============================================================================
  $ cvs diff -u -r1.86 -r1.86.2.1 librpmdb.vers
  --- rpm/rpmdb/librpmdb.vers	6 Mar 2010 16:20:46 -0000	1.86
  +++ rpm/rpmdb/librpmdb.vers	27 Sep 2010 19:29:40 -0000	1.86.2.1
  @@ -184,6 +184,29 @@
       rpmpkgRead;
       rpmpkgSizeof;
       rpmpkgWrite;
  +    _rpmrepo_debug;
  +    _rpmrepoOptions;
  +    _rpmrepoPool;
  +    rpmrepoCheckTimeStamps;
  +    rpmrepoCloseMDFile;
  +    rpmrepoDoFinalMove;
  +    rpmrepoDoRepoMetadata;
  +    rpmrepoError;
  +    rpmrepoFclose;
  +    rpmrepoGetFileList;
  +    rpmrepoGetPath;
  +    rpmrepoMDExpand;
  +    rpmrepoMkdir;
  +    rpmrepoNew;
  +    rpmrepoOpenMDFile;
  +    rpmrepoProgress;
  +    rpmrepoRealpath;
  +    rpmrepoRfileDigest;
  +    rpmrepoTestSetupDirs;
  +    rpmrfileSQL;
  +    rpmrfileSQLStep;
  +    rpmrfileSQLWrite;
  +    rpmrfileXMLWrite;
       rpm_mergesort;
       rpmTagTable;
       rpmTagTableSize;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/poptDB.c
  ============================================================================
  $ cvs diff -u -r1.17 -r1.17.2.1 poptDB.c
  --- rpm/rpmdb/poptDB.c	29 Jan 2010 21:02:31 -0000	1.17
  +++ rpm/rpmdb/poptDB.c	27 Sep 2010 19:29:40 -0000	1.17.2.1
  @@ -11,6 +11,7 @@
   #include <rpmtag.h>
   #include <rpmdb.h>
   #include <rpmlio.h>
  +#include <rpmrepo.h>
   #include <rpmtxn.h>
   
   #include <rpmcli.h>	/* XXX rpmQVKArguments_s, <popt.h> */
  @@ -39,6 +40,8 @@
   	N_("Debug dbiIndex DataBase Index"), NULL},
    { "rpmliodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmlio_debug, -1,
   	N_("Debug rpmlio database Log I/O"), NULL},
  + { "rpmrepodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmrepo_debug, -1,
  +	N_("Debug rpmrepo repository wrappers "), NULL},
    { "rpmtxndebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmtxn_debug, -1,
   	N_("Debug rpmtxn database Transaction"), NULL},
   
  @@ .