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-Aug-2010 13:45:07
Branch: HEAD Handle: 2010080911450501
Modified files:
rpm configure.ac
rpm/rpmio Makefile.am rpmtpm.c
Log:
Honor the -without-tpm configure option
Summary:
Revision Changes Path
2.445 +5 -1 rpm/configure.ac
1.282 +6 -1 rpm/rpmio/Makefile.am
1.4 +3 -0 rpm/rpmio/rpmtpm.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.444 -r2.445 configure.ac
--- rpm/configure.ac 31 Jul 2010 19:00:03 -0000 2.444
+++ rpm/configure.ac 9 Aug 2010 11:45:05 -0000 2.445
@@ -1253,7 +1253,11 @@
[tpm], [TPM_Init], [tpm.h],
[no,external:none], [],
[ AC_DEFINE(WITH_TPM, 1, [Define if building with IBM TPM 1.2 emulator])
- ], [])
+ AM_CONDITIONAL([WITH_TPM], [true])
+ ],[
+ AM_CONDITIONAL([WITH_TPM], [false])
+ ])
+
dnl # select default Cryptography implementation to use (default for CLI
option --usecrypto)
AC_ARG_WITH([usecrypto],
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.281 -r1.282 Makefile.am
--- rpm/rpmio/Makefile.am 24 Jul 2010 18:05:50 -0000 1.281
+++ rpm/rpmio/Makefile.am 9 Aug 2010 11:45:05 -0000 1.282
@@ -19,9 +19,12 @@
rpmgenbasedir rpmgenpkglist rpmgensrclist rpmgpg \
rpmpbzip2 rpmpigz rpmtar rpmz \
tasn tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic tmire \
- tperl tpython tput tpw trpmio tsexp tsw ttcl ttpm \
+ tperl tpython tput tpw trpmio tsexp tsw ttcl \
dumpasn1 lookup3
+if WITH_TPM
+EXTRA_PROGRAMS += ttpm
+endif
bin_PROGRAMS =
man_MANS =
@@ -382,8 +385,10 @@
ttcl_SOURCES = ttcl.c
ttcl_LDADD = $(RPMIO_LDADD_COMMON) -ltcl
+if WITH_TPM
ttpm_SOURCES = ttpm.c
ttpm_LDADD = $(RPMIO_LDADD_COMMON)
+endif
dumpasn1_SOURCES = dumpasn1.c
dumpasn1_LDFLAGS = $(RPMIO_LDADD_COMMON)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmtpm.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 rpmtpm.c
--- rpm/rpmio/rpmtpm.c 25 Jul 2010 15:00:38 -0000 1.3
+++ rpm/rpmio/rpmtpm.c 9 Aug 2010 11:45:06 -0000 1.4
@@ -28,6 +28,7 @@
/*...@unchecked@*/
int _rpmtpm_debug = -1;
+#if defined(WITH_TPM)
static
int rpmtpmErr(rpmtpm tpm, const char * msg, uint32_t rc)
/*...@*/
@@ -72,6 +73,7 @@
/*==============================================================*/
+#endif
/*...@-mustmod@*/ /* XXX splint on crack */
static void rpmtpmFini(void * _tpm)
/*...@globals fileSystem @*/
@@ -88,6 +90,7 @@
/*...@unchecked@*/ /*...@only@*/ /*...@null@*/
rpmioPool _rpmtpmPool = NULL;
+
static rpmtpm rpmtpmGetPool(/*...@null@*/ rpmioPool pool)
/*...@globals _rpmtpmPool, fileSystem @*/
/*...@modifies pool, _rpmtpmPool, fileSystem @*/
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
