RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 24-Jul-2010 16:12:21 Branch: HEAD Handle: 2010072414121702 Added files: rpm/rpmio rpmtpm.c Modified files: rpm CHANGES rpm/rpmio Makefile.am poptIO.c rpmio.c Log: - tpm: glue in an rpmtpm object wrapper. Summary: Revision Changes Path 1.3406 +1 -0 rpm/CHANGES 1.280 +6 -5 rpm/rpmio/Makefile.am 1.90 +5 -0 rpm/rpmio/poptIO.c 1.226 +4 -0 rpm/rpmio/rpmio.c 1.1 +58 -0 rpm/rpmio/rpmtpm.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3405 -r1.3406 CHANGES --- rpm/CHANGES 23 Jul 2010 18:19:52 -0000 1.3405 +++ rpm/CHANGES 24 Jul 2010 14:12:17 -0000 1.3406 @@ -1,4 +1,5 @@ 5.3.2 -> 5.4a1: + - jbj: tpm: glue in an rpmtpm object wrapper. - jbj: tpm: stub in the AutoFu to detect libtpm. - jbj: fix: debugedit produce empty list file on MIPS (#61). - jbj: asn1: wire up ctor's and dtor's internally. @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am ============================================================================ $ cvs diff -u -r1.279 -r1.280 Makefile.am --- rpm/rpmio/Makefile.am 30 Jun 2010 22:05:26 -0000 1.279 +++ rpm/rpmio/Makefile.am 24 Jul 2010 14:12:18 -0000 1.280 @@ -79,9 +79,10 @@ poptIO.h rpmacl.h rpmasn.h rpmaug.h rpmbc.h rpmbf.h rpmbz.h \ rpmcdsa.h rpmcudf.h rpmdav.h rpmdir.h rpmficl.h rpmgc.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 \ - rpmruby.h rpmsm.h rpmsp.h rpmsq.h rpmsql.h rpmsquirrel.h rpmssl.h \ - rpmsx.h rpmsyck.h rpmtcl.h rpmurl.h rpmuuid.h rpmxar.h rpmz.h rpmzq.h \ + rpmku.h rpmltc.h rpmlua.h rpmmg.h rpmnix.h rpmnss.h \ + rpmperl.h rpmpython.h rpmruby.h rpmsm.h rpmsp.h \ + rpmsq.h rpmsql.h rpmsquirrel.h rpmssl.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) @@ -99,8 +100,8 @@ 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 rpmrpc.c rpmruby.c rpmsm.c rpmsp.c \ - rpmsq.c rpmsql.c rpmsquirrel.c rpmssl.c rpmsyck.c rpmsw.c rpmsx.c \ - rpmtcl.c rpmuuid.c rpmxar.c rpmzlog.c rpmzq.c \ + rpmsq.c rpmsql.c rpmsquirrel.c rpmssl.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 librpmio_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION) if HAVE_LD_VERSION_SCRIPT @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/poptIO.c ============================================================================ $ cvs diff -u -r1.89 -r1.90 poptIO.c --- rpm/rpmio/poptIO.c 30 Jun 2010 17:38:33 -0000 1.89 +++ rpm/rpmio/poptIO.c 24 Jul 2010 14:12:18 -0000 1.90 @@ -27,6 +27,8 @@ #endif #include <rpmasn.h> +#include <rpmtpm.h> + #include <rpmaug.h> #include <rpmbf.h> #include <rpmcudf.h> @@ -622,6 +624,9 @@ { "rpmasndebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmasn_debug, -1, N_("Debug embedded ASN.1 interpreter"), NULL}, + { "rpmtpmdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmtpm_debug, -1, + N_("Debug TPM emulator"), NULL}, + { "rpmaugdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmaug_debug, -1, N_("Debug embedded Augeas interpreter"), NULL}, { "rpmbfdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmbf_debug, -1, @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmio.c ============================================================================ $ cvs diff -u -r1.225 -r1.226 rpmio.c --- rpm/rpmio/rpmio.c 30 Jun 2010 17:38:33 -0000 1.225 +++ rpm/rpmio/rpmio.c 24 Jul 2010 14:12:18 -0000 1.226 @@ -3217,7 +3217,10 @@ extern rpmioPool _rpmsxPool; extern rpmioPool _rpmsyckPool; /*...@=shadow@*/ + extern rpmioPool _rpmasnPool; + extern rpmioPool _rpmtpmPool; + extern rpmioPool _rpmaugPool; extern rpmioPool _rpmcudfPool; extern rpmioPool _rpmficlPool; @@ -3271,6 +3274,7 @@ _rpmaugPool = rpmioFreePool(_rpmaugPool); _rpmasnPool = rpmioFreePool(_rpmasnPool); + _rpmtpmPool = rpmioFreePool(_rpmtpmPool); #ifdef NOTYET /* XXX FIXME: dig out the recursion deadlock. */ _rpmnixI = rpmnixFree(_rpmnixI); @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmtpm.c ============================================================================ $ cvs diff -u -r0 -r1.1 rpmtpm.c --- /dev/null 2010-07-24 16:11:01.000000000 +0200 +++ rpmtpm.c 2010-07-24 16:12:21.261923444 +0200 @@ -0,0 +1,58 @@ +/** \ingroup rpmio + * \file rpmio/rpmtpm.c + */ + +#include "system.h" + +#if defined(WITH_TPM) +#include <tpm/tpm.h> +#endif + +#include <rpmiotypes.h> +#include <rpmio.h> /* for *Pool methods */ +#define _RPMTPM_INTERNAL +#include <rpmtpm.h> + +#include "debug.h" + +/*...@unchecked@*/ +int _rpmtpm_debug = 0; + +/*...@-mustmod@*/ /* XXX splint on crack */ +static void rpmtpmFini(void * _tpm) + /*...@globals fileSystem @*/ + /*...@modifies *_tpm, fileSystem @*/ +{ + rpmtpm tpm = _tpm; + + tpm->fn = _free(tpm->fn); +} +/*...@=mustmod@*/ + +/*...@unchecked@*/ /*...@only@*/ /*...@null@*/ +rpmioPool _rpmtpmPool = NULL; + +static rpmtpm rpmtpmGetPool(/*...@null@*/ rpmioPool pool) + /*...@globals _rpmtpmPool, fileSystem @*/ + /*...@modifies pool, _rpmtpmPool, fileSystem @*/ +{ + rpmtpm tpm; + + if (_rpmtpmPool == NULL) { + _rpmtpmPool = rpmioNewPool("tpm", sizeof(*tpm), -1, _rpmtpm_debug, + NULL, NULL, rpmtpmFini); + pool = _rpmtpmPool; + } + return (rpmtpm) rpmioGetPool(pool, sizeof(*tpm)); +} + +rpmtpm rpmtpmNew(const char * fn, int flags) +{ + rpmtpm tpm = rpmtpmGetPool(_rpmtpmPool); + int xx; + + if (fn) + tpm->fn = xstrdup(fn); + + return rpmtpmLink(tpm); +} @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
