RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: libtpm Date: 01-Sep-2013 21:31:37
Branch: HEAD Handle: 2013090119313601
Added files:
libtpm/tpm .cvsignore Makefile.am
libtpm/tpm_proxy .cvsignore Makefile.am
libtpm/tpm_proxy/linux .cvsignore Makefile.am
Modified files:
libtpm Makefile.am configure.ac
Removed files:
libtpm/tpm_proxy/linux Makefile
Log:
- rude-and-crude AutoCrap.
Summary:
Revision Changes Path
1.2 +1 -1 libtpm/Makefile.am
1.2 +3 -1 libtpm/configure.ac
1.1 +6 -0 libtpm/tpm/.cvsignore
1.1 +149 -0 libtpm/tpm/Makefile.am
1.1 +2 -0 libtpm/tpm_proxy/.cvsignore
1.1 +5 -0 libtpm/tpm_proxy/Makefile.am
1.1 +5 -0 libtpm/tpm_proxy/linux/.cvsignore
1.2 +0 -45 libtpm/tpm_proxy/linux/Makefile
1.1 +6 -0 libtpm/tpm_proxy/linux/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: libtpm/Makefile.am
============================================================================
$ cvs diff -u -r1.1 -r1.2 Makefile.am
--- libtpm/Makefile.am 31 Aug 2013 21:53:08 -0000 1.1
+++ libtpm/Makefile.am 1 Sep 2013 19:31:36 -0000 1.2
@@ -2,4 +2,4 @@
EXTRA_DIST = autogen.sh
-SUBDIRS = libtpm
+SUBDIRS = libtpm tpm tpm_proxy
@@ .
patch -p0 <<'@@ .'
Index: libtpm/configure.ac
============================================================================
$ cvs diff -u -r1.1 -r1.2 configure.ac
--- libtpm/configure.ac 31 Aug 2013 21:53:08 -0000 1.1
+++ libtpm/configure.ac 1 Sep 2013 19:31:36 -0000 1.2
@@ -30,7 +30,7 @@
dnl (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-dnl $Id: configure.ac,v 1.1 2013/08/31 21:53:08 jbj Exp $
+dnl $Id: configure.ac,v 1.2 2013/09/01 19:31:36 jbj Exp $
dnl Process this file with autoconf to produce a configure script.
@@ -280,6 +280,8 @@
AC_CONFIG_FILES([
Makefile
libtpm/Makefile libtpm/lib/Makefile libtpm/utils/Makefile
+ tpm/Makefile
+ tpm_proxy/Makefile tpm_proxy/linux/Makefile
])
AC_OUTPUT
@@ .
patch -p0 <<'@@ .'
Index: libtpm/tpm/.cvsignore
============================================================================
$ cvs diff -u -r0 -r1.1 .cvsignore
--- /dev/null 2013-09-01 21:31:10.000000000 +0200
+++ .cvsignore 2013-09-01 21:31:37.242139935 +0200
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+tpm_server
+
@@ .
patch -p0 <<'@@ .'
Index: libtpm/tpm/Makefile.am
============================================================================
$ cvs diff -u -r0 -r1.1 Makefile.am
--- /dev/null 2013-09-01 21:31:10.000000000 +0200
+++ Makefile.am 2013-09-01 21:31:37.272141499 +0200
@@ -0,0 +1,149 @@
+##D CC = /usr/bin/gcc
+##D CCFLAGS = -Wall -W -Wmissing-declarations -Wmissing-prototypes
-Wnested-externs -c -ggdb \
+##D -DTPM_NV_DISK -DTPM_V12 -O0 -DTPM_DEBUG -DTPM_AES -DTPM_POSIX
-DTPM_PCCLIENT \
+##D -DTPM_ENABLE_ACTIVATE
+
+AM_CFLAGS = \
+ -Wall -W -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
+ -ggdb \
+ -DTPM_NV_DISK -DTPM_V12 -DTPM_DEBUG -DTPM_AES \
+ -DTPM_POSIX -DTPM_PCCLIENT -DTPM_ENABLE_ACTIVATE
+
+LNFLAGS = -ggdb -lcrypto
+
+CRYPTO_SUBSYSTEM = openssl
+
+# chose between the OpenSSL and FreeBL crypto libraries
+
+##X ifeq ($(CRYPTO_SUBSYSTEM),openssl)
+CRYPTO_SOURCE = tpm_crypto.c
+CRYPTO_LINKLIBS = -lcrypto
+
+##X else
+
+##X ifeq ($(CRYPTO_SUBSYSTEM),freebl)
+##X CRYPTO_SOURCE = tpm_crypto_freebl.c
+##X CRYPTO_OBJFILES = tpm_crypto_freebl.o
+##X CRYPTO_LINKLIBS = -lfreebl -lgmp -lnspr4 -lnssutil3 -lnss3
+
+##X else
+##X CRYPTO_SOURCE = tpm_crypto_unknown.c
+
+##X endif
+##X endif
+
+EXTRA_HEADERS =
+ tpm_admin.h \
+ tpm_audit.h \
+ tpm_auth.h \
+ tpm_commands.h \
+ tpm_constants.h \
+ tpm_counter.h \
+ tpm_crypto.h \
+ tpm_cryptoh.h \
+ tpm_daa.h \
+ tpm_debug.h \
+ tpm_delegate.h \
+ tpm_digest.h \
+ tpm_error.h \
+ tpm_global.h \
+ tpm_identity.h \
+ tpm_init.h \
+ tpm_io.h \
+ tpm_key.h \
+ tpm_load.h \
+ tpm_maint.h \
+ tpm_memory.h \
+ tpm_migration.h \
+ tpm_nonce.h \
+ tpm_nvfile.h \
+ tpm_nvfilename.h \
+ tpm_nvram_const.h \
+ tpm_nvram.h \
+ tpm_owner.h \
+ tpm_pcr.h \
+ tpm_permanent.h \
+ tpm_platform.h \
+ tpm_process.h \
+ tpm_secret.h \
+ tpm_session.h \
+ tpm_sizedbuffer.h \
+ tpm_startup.h \
+ tpm_storage.h \
+ tpm_store.h \
+ tpm_structures.h \
+ tpm_svnrevision.h \
+ tpm_ticks.h \
+ tpm_time.h \
+ tpm_transport.h \
+ tpm_types.h \
+ tpm_ver.h
+
+EXTRA_DIST = $(EXTRA_HEADERS)
+
+myHEADERS = \
+ $(EXTRA_HEADERS) \
+ $(INSTANCE_HEADERS)
+
+CFILES = \
+ tpm_admin.c \
+ tpm_audit.c \
+ tpm_auth.c \
+ tpm_counter.c \
+ tpm_cryptoh.c \
+ tpm_daa.c \
+ tpm_debug.c \
+ tpm_delegate.c \
+ tpm_digest.c \
+ tpm_error.c \
+ tpm_global.c \
+ tpm_identity.c \
+ tpm_init.c \
+ tpm_io.c \
+ tpm_key.c \
+ tpm_load.c \
+ tpm_maint.c \
+ tpm_memory.c \
+ tpm_migration.c \
+ tpm_nonce.c \
+ tpm_nvfile.c \
+ tpm_nvram.c \
+ tpm_owner.c \
+ tpm_pcr.c \
+ tpm_permanent.c \
+ tpm_platform.c \
+ tpm_process.c \
+ tpm_secret.c \
+ tpm_server.c \
+ tpm_session.c \
+ tpm_sizedbuffer.c \
+ tpm_startup.c \
+ tpm_storage.c \
+ tpm_store.c \
+ tpm_svnrevision.c \
+ tpm_ticks.c \
+ tpm_time.c \
+ tpm_transport.c \
+ tpm_ver.c \
+ $(CRYPTO_SOURCE) \
+ $(INSTANCE_CFILES)
+
+EXTRA_DIST += tpm_crypto.c tpm_crypto_freebl.c
+
+noinst_PROGRAMS = tpm_server
+
+tpm_server_SOURCES = $(CFILES)
+tpm_server_LDADD = $(CRYPTO_LINKLIBS)
+
+#tpm_server: $(OBJFILES)
+# $(CC) $(OBJFILES) $(LNFLAGS) -o tpm_server
+
+#tpmexport:
+# rm -rf /tmp/tpmsrc
+# svn export ../src /tmp/tpmsrc
+
+#clean:
+# rm -f *.o tpm_server
+
+#.c.o:
+# $(CC) $(CCFLAGS) $(INSTANCE_CCFLAGS) $<
@@ .
patch -p0 <<'@@ .'
Index: libtpm/tpm_proxy/.cvsignore
============================================================================
$ cvs diff -u -r0 -r1.1 .cvsignore
--- /dev/null 2013-09-01 21:31:10.000000000 +0200
+++ .cvsignore 2013-09-01 21:31:37.532153944 +0200
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
@@ .
patch -p0 <<'@@ .'
Index: libtpm/tpm_proxy/Makefile.am
============================================================================
$ cvs diff -u -r0 -r1.1 Makefile.am
--- /dev/null 2013-09-01 21:31:10.000000000 +0200
+++ Makefile.am 2013-09-01 21:31:37.562154391 +0200
@@ -0,0 +1,5 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+
+EXTRA_DIST = windows
+
+SUBDIRS = linux # windows
@@ .
patch -p0 <<'@@ .'
Index: libtpm/tpm_proxy/linux/.cvsignore
============================================================================
$ cvs diff -u -r0 -r1.1 .cvsignore
--- /dev/null 2013-09-01 21:31:10.000000000 +0200
+++ .cvsignore 2013-09-01 21:31:37.832165680 +0200
@@ -0,0 +1,5 @@
+.deps
+.libs
+Makefile
+Makefile.in
+tpm_proxy
@@ .
rm -f libtpm/tpm_proxy/linux/Makefile <<'@@ .'
Index: libtpm/tpm_proxy/linux/Makefile
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: libtpm/tpm_proxy/linux/Makefile.am
============================================================================
$ cvs diff -u -r0 -r1.1 Makefile.am
--- /dev/null 2013-09-01 21:31:10.000000000 +0200
+++ Makefile.am 2013-09-01 21:31:37.902170170 +0200
@@ -0,0 +1,6 @@
+AUOMAKE_OPTIONS = 1.4 foreign
+
+noinst_PROGRAMS = tpm_proxy
+
+tpm_proxy_SOURCES = tpm_proxy.c
+tpm_proxy_LDADD = $(LDFLAGS)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
