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 19:01:33
Branch: HEAD Handle: 2010092717012804
Modified files:
rpm CHANGES
rpm/lib poptALL.c
rpm/rpmdb Makefile.am librpmdb.vers poptDB.c
rpm/rpmio Makefile.am librpmio.vers poptIO.c rpmio.c
Log:
- rpmrepo: move from rpmio -> rpmdb to finish tools/rpmrepo.c gutting.
Summary:
Revision Changes Path
1.3452 +1 -0 rpm/CHANGES
2.143 +5 -0 rpm/lib/poptALL.c
1.130 +7 -3 rpm/rpmdb/Makefile.am
1.90 +23 -0 rpm/rpmdb/librpmdb.vers
1.19 +4 -1 rpm/rpmdb/poptDB.c
1.289 +2 -6 rpm/rpmio/Makefile.am
2.197 +0 -22 rpm/rpmio/librpmio.vers
1.94 +0 -3 rpm/rpmio/poptIO.c
1.230 +0 -2 rpm/rpmio/rpmio.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3451 -r1.3452 CHANGES
--- rpm/CHANGES 24 Sep 2010 16:11:22 -0000 1.3451
+++ rpm/CHANGES 27 Sep 2010 17:01:28 -0000 1.3452
@@ -1,4 +1,5 @@
5.3.3 -> 5.4a1:
+ - jbj: rpmrepo: move from rpmio -> rpmdb to finish tools/rpmrepo.c gutting.
- devzero2000 : added --withoutcheck popt alias (#lp:634104) (#mdvbz:35423)
- jbj: i18n: update po files (Translation Project).
- jbj: mongo: handle endianness at runtime, remove MONGO_BIG_ENDIAN.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptALL.c
============================================================================
$ cvs diff -u -r2.142 -r2.143 poptALL.c
--- rpm/lib/poptALL.c 17 Sep 2010 16:17:02 -0000 2.142
+++ rpm/lib/poptALL.c 27 Sep 2010 17:01:30 -0000 2.143
@@ -73,6 +73,9 @@
extern int _pkgio_debug;
/*@unchecked@*/
+extern int _rpmrepo_debug;
+
+/*@unchecked@*/
extern int _print_pkts;
/*@unchecked@*/
@@ -489,6 +492,7 @@
extern rpmioPool _dbiPool;
extern rpmioPool _rpmdbPool;
extern rpmioPool _rpmmdbPool;
+ extern rpmioPool _rpmrepoPool;
extern rpmioPool _rpmwfPool;
extern const char * evr_tuple_order;
extern const char * evr_tuple_match;
@@ -529,6 +533,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.129 -r1.130 Makefile.am
--- rpm/rpmdb/Makefile.am 17 Sep 2010 16:17:02 -0000 1.129
+++ rpm/rpmdb/Makefile.am 27 Sep 2010 17:01:30 -0000 1.130
@@ -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 rpmmdb.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,15 @@
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 rpmmdb.c \
- rpmns.c rpmtd.c rpmtxn.c rpmwf.c signature.c tagname.c tagtbl.c \
+ pkgio.c poptDB.c rpmdb.c rpmdpkg.c rpmevr.c rpmlio.c rpmmdb.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
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/librpmdb.vers
============================================================================
$ cvs diff -u -r1.89 -r1.90 librpmdb.vers
--- rpm/rpmdb/librpmdb.vers 18 Sep 2010 03:31:45 -0000 1.89
+++ rpm/rpmdb/librpmdb.vers 27 Sep 2010 17:01:30 -0000 1.90
@@ -189,6 +189,29 @@
rpmpkgSizeof;
rpmpkgWrite;
rpm_mergesort;
+ _rpmrepo_debug;
+ _rpmrepoOptions;
+ _rpmrepoPool;
+ rpmrepoCheckTimeStamps;
+ rpmrepoCloseMDFile;
+ rpmrepoDoFinalMove;
+ rpmrepoDoRepoMetadata;
+ rpmrepoError;
+ rpmrepoFclose;
+ rpmrepoGetFileList;
+ rpmrepoGetPath;
+ rpmrepoMDExpand;
+ rpmrepoMkdir;
+ rpmrepoNew;
+ rpmrepoOpenMDFile;
+ rpmrepoProgress;
+ rpmrepoRealpath;
+ rpmrepoRfileDigest;
+ rpmrepoTestSetupDirs;
+ rpmrfileSQL;
+ rpmrfileSQLStep;
+ rpmrfileSQLWrite;
+ rpmrfileXMLWrite;
rpmTagTable;
rpmTagTableSize;
rpmTags;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/poptDB.c
============================================================================
$ cvs diff -u -r1.18 -r1.19 poptDB.c
--- rpm/rpmdb/poptDB.c 17 Sep 2010 16:17:02 -0000 1.18
+++ rpm/rpmdb/poptDB.c 27 Sep 2010 17:01:30 -0000 1.19
@@ -12,6 +12,7 @@
#include <rpmdb.h>
#include <rpmlio.h>
#include <rpmmdb.h>
+#include <rpmrepo.h>
#include <rpmtxn.h>
#include <rpmcli.h> /* XXX rpmQVKArguments_s, <popt.h> */
@@ -41,7 +42,9 @@
{ "rpmliodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmlio_debug, -1,
N_("Debug rpmlio database Log I/O"), NULL},
{ "rpmmdbdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmmdb_debug, -1,
- N_("Debug Mongo DB"), NULL},
+ N_("Debug rpmmdb Mongo DB"), 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},
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.288 -r1.289 Makefile.am
--- rpm/rpmio/Makefile.am 18 Sep 2010 03:31:45 -0000 1.288
+++ rpm/rpmio/Makefile.am 27 Sep 2010 17:01:32 -0000 1.289
@@ -85,17 +85,13 @@
rpmcdsa.h rpmcudf.h rpmcvs.h rpmdav.h rpmdir.h rpmficl.h rpmgc.h rpmgit.h rpmhash.h \
rpmhkp.h rpmhook.h rpmio_internal.h rpmjs.h rpmjsio.h rpmkeyring.h \
rpmku.h rpmltc.h rpmlua.h rpmmg.h rpmnix.h rpmnss.h \
- rpmperl.h rpmpython.h rpmrepo.h rpmruby.h rpmsm.h rpmsp.h \
+ rpmperl.h rpmpython.h rpmruby.h rpmsm.h rpmsp.h \
rpmsq.h rpmsql.h rpmsquirrel.h rpmssl.h rpmsvn.h rpmsx.h rpmsyck.h \
rpmtcl.h rpmtpm.h rpmurl.h rpmuuid.h rpmxar.h rpmz.h rpmzq.h \
tar.h ugid.h rpmio-stub.h
usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpmio.la
-# XXX rpmrepo.c needs to include templates from scripts/*
-librpmio_la_CPPFLAGS = \
- $(AM_CPPFLAGS) -I$(top_srcdir)/scripts -I$(top_builddir)/scripts \
- $(CPPFLAGS)
librpmio_la_SOURCES = \
ar.c argv.c bson.c bzdio.c cpio.c crc.c digest.c fnmatch.c fts.c \
getdate.c gzdio.c glob.c iosm.c lsyck.c \
@@ -108,7 +104,7 @@
rpmhash.c rpmhkp.c rpmhook.c rpmio.c rpmiob.c rpmio-stub.c \
rpmjs.c rpmjsio.c rpmkeyring.c rpmku.c \
rpmlog.c rpmltc.c rpmlua.c rpmmalloc.c rpmmg.c rpmnix.c rpmnss.c \
- rpmperl.c rpmpgp.c rpmpython.c rpmrepo.c rpmrpc.c rpmruby.c rpmsm.c rpmsp.c \
+ rpmperl.c rpmpgp.c rpmpython.c rpmrpc.c rpmruby.c rpmsm.c rpmsp.c \
rpmsq.c rpmsql.c rpmsquirrel.c rpmssl.c rpmsvn.c rpmsw.c rpmsx.c \
rpmsyck.c rpmtcl.c rpmtpm.c rpmuuid.c rpmxar.c rpmzlog.c rpmzq.c \
strcasecmp.c strtolocale.c tar.c url.c ugid.c xzdio.c yarn.c
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
============================================================================
$ cvs diff -u -r2.196 -r2.197 librpmio.vers
--- rpm/rpmio/librpmio.vers 18 Sep 2010 03:31:45 -0000 2.196
+++ rpm/rpmio/librpmio.vers 27 Sep 2010 17:01:32 -0000 2.197
@@ -541,30 +541,8 @@
rpmpythonNew;
rpmpythonRun;
rpmpythonRunFile;
- _rpmrepo_debug;
- _rpmrepoOptions;
rpmioExists;
rpmioCtime;
- rpmrepoCheckTimeStamps;
- rpmrepoCloseMDFile;
- rpmrepoDoFinalMove;
- rpmrepoDoRepoMetadata;
- rpmrepoError;
- rpmrepoFclose;
- rpmrepoGetFileList;
- rpmrepoGetPath;
- rpmrepoMDExpand;
- rpmrepoMkdir;
- rpmrepoNew;
- rpmrepoOpenMDFile;
- rpmrepoProgress;
- rpmrepoRealpath;
- rpmrepoRfileDigest;
- rpmrepoTestSetupDirs;
- rpmrfileSQL;
- rpmrfileSQLStep;
- rpmrfileSQLWrite;
- rpmrfileXMLWrite;
_rpmrubyI;
_rpmrubyPool;
_rpmruby_debug;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/poptIO.c
============================================================================
$ cvs diff -u -r1.93 -r1.94 poptIO.c
--- rpm/rpmio/poptIO.c 18 Sep 2010 03:31:45 -0000 1.93
+++ rpm/rpmio/poptIO.c 27 Sep 2010 17:01:32 -0000 1.94
@@ -41,7 +41,6 @@
#include <rpmnix.h>
#include <rpmperl.h>
#include <rpmpython.h>
-#include <rpmrepo.h>
#include <rpmruby.h>
#include <rpmsql.h>
#include <rpmsquirrel.h>
@@ -634,8 +633,6 @@
N_("Debug depsolver wrappers "), NULL},
{ "rpmcvsdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmcvs_debug, -1,
N_("Debug CVS wrappers "), NULL},
- { "rpmrepodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmrepo_debug, -1,
- N_("Debug repository wrappers "), NULL},
{ "rpmsvndebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmsvn_debug, -1,
N_("Debug Subversion wrappers "), NULL},
{ "rpmtpmdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmtpm_debug, -1,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
============================================================================
$ cvs diff -u -r1.229 -r1.230 rpmio.c
--- rpm/rpmio/rpmio.c 18 Sep 2010 03:31:45 -0000 1.229
+++ rpm/rpmio/rpmio.c 27 Sep 2010 17:01:32 -0000 1.230
@@ -3223,7 +3223,6 @@
extern rpmioPool _rpmasnPool;
extern rpmioPool _rpmbagPool;
extern rpmioPool _rpmcvsPool;
- extern rpmioPool _rpmrepoPool;
extern rpmioPool _rpmsvnPool;
extern rpmioPool _rpmtpmPool;
@@ -3285,7 +3284,6 @@
_rpmasnPool = rpmioFreePool(_rpmasnPool);
_rpmbagPool = rpmioFreePool(_rpmbagPool);
_rpmcvsPool = rpmioFreePool(_rpmcvsPool);
- _rpmrepoPool = rpmioFreePool(_rpmrepoPool);
_rpmsvnPool = rpmioFreePool(_rpmsvnPool);
_rpmtpmPool = rpmioFreePool(_rpmtpmPool);
@@ .
Received on Mon Sep 27 19:01:33 2010