[openpts] New upstream release 0.2.6 Removed aide support Added ARU support Updated spec files Modified patche

Mon Jan 9 17:20:19 UTC 2012

commit 0d53a70cf3e55a00ef1dee6c3ac575e6d13339e5
Author: Avesh Agarwal <avagarwa at redhat.com>
Date:   Mon Jan 9 12:20:17 2012 -0500

    New upstream release 0.2.6
    Removed aide support
    Added ARU support
    Updated spec files
    Modified patches as per new release

 .gitignore        |    1 +
 bugs.patch        |   30 ++++++------------------------
 init-script.patch |    6 +++---
 openpts.spec      |   21 +++++++++++++++------
 sources           |    2 +-
 5 files changed, 26 insertions(+), 34 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 562a264..f9907e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /openpts-0.2.4.tgz
 /openpts-0.2.5.tgz
+/openpts-0.2.6.tar.gz
diff --git a/bugs.patch b/bugs.patch
index 82a957c..d818baf 100644
--- a/bugs.patch
+++ b/bugs.patch
@@ -1,30 +1,12 @@
-diff -urNp openpts-0.2.5-cvs-patched/src/fsm.c openpts-0.2.5-current/src/fsm.c
---- openpts-0.2.5-cvs-patched/src/fsm.c	2011-07-20 13:34:32.811188838 -0400
-+++ openpts-0.2.5-current/src/fsm.c	2011-07-20 13:37:59.340429693 -0400
-@@ -762,7 +762,7 @@ char *getEventString(OPENPTS_PCR_EVENT_W
+diff -urNp openpts-0.2.6-cvs-patched/src/fsm.c openpts-0.2.6-current/src/fsm.c
+--- openpts-0.2.6-cvs-patched/src/fsm.c	2012-01-05 03:49:15.000000000 -0500
++++ openpts-0.2.6-current/src/fsm.c	2012-01-09 12:11:17.338706205 -0500
+@@ -934,7 +934,7 @@ char *getEventString(OPENPTS_PCR_EVENT_W
      /* event */
      event = eventWrapper->event;
      if (event != NULL) {
 -        // len = snprintf(buf, size, "PCR[%d],TYPE=%d", (int)event->ulPcrIndex, event->eventType);
 +        snprintf(buf, size, "PCR[%d],TYPE=%d", (int)event->ulPcrIndex, event->eventType);
      } else {
-         ERROR("NULL event\n");  // TODO(munetoh)
-         free(buf);
-diff -urNp openpts-0.2.5-cvs-patched/src/iml.c openpts-0.2.5-current/src/iml.c
---- openpts-0.2.5-cvs-patched/src/iml.c	2011-07-20 13:34:32.811188838 -0400
-+++ openpts-0.2.5-current/src/iml.c	2011-07-20 13:40:49.305829943 -0400
-@@ -2029,10 +2029,10 @@ int printImlByPcr(
-         }
- 
-         /* base64 */
--        // len = encodeBase64(
--        //     (unsigned char *)buf,
--        //     (unsigned char *)eventWrapper->event->rgbPcrValue,
--         //   20);
-+        encodeBase64(
-+            (unsigned char *)buf,
-+            (unsigned char *)eventWrapper->event->rgbPcrValue,
-+            20);
- 
-         printf(" (%s) \n", buf);
-         eventWrapper = eventWrapper->next_pcr;
+         LOG(LOG_ERR, "NULL event\n");  // TODO(munetoh)
+         xfree(buf);
diff --git a/init-script.patch b/init-script.patch
index 194307c..6070316 100644
--- a/init-script.patch
+++ b/init-script.patch
@@ -1,6 +1,6 @@
-diff -urNp openpts-0.2.5-cvs-patched/dist/fedora.initrd.ptscd openpts-0.2.5-current/dist/fedora.initrd.ptscd
---- openpts-0.2.5-cvs-patched/dist/fedora.initrd.ptscd	2011-07-20 13:34:32.807188870 -0400
-+++ openpts-0.2.5-current/dist/fedora.initrd.ptscd	2011-07-20 13:35:28.999732479 -0400
+diff -urNp openpts-0.2.6-cvs-patched/dist/fedora.initrd.ptscd openpts-0.2.6-current/dist/fedora.initrd.ptscd
+--- openpts-0.2.6-cvs-patched/dist/fedora.initrd.ptscd	2012-01-05 03:49:15.000000000 -0500
++++ openpts-0.2.6-current/dist/fedora.initrd.ptscd	2012-01-09 12:14:13.352097329 -0500
 @@ -87,13 +87,13 @@ case "$1" in
  		reload
  		;;
diff --git a/openpts.spec b/openpts.spec
index 10e8abb..0b32aff 100644
--- a/openpts.spec
+++ b/openpts.spec
@@ -1,14 +1,14 @@
 %define with_tboot 1
 %define enable_tnc 1
 
-Summary: TCG Platform Trust Service (PTS) for embedded devices
+Summary: TCG Platform Trust Service (PTS)
 Name: openpts
-Version: 0.2.5
+Version: 0.2.6
 
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: CPL
 Url: http://sourceforge.jp/projects/openpts/
-Source0: http://sourceforge.jp/projects/openpts/downloads/51879/openpts-%{version}.tgz
+Source0: http://sourceforge.jp/projects/openpts/downloads/54410/openpts-%{version}.tar.gz
 
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,7 +47,7 @@ specifications set forth by the Trusted Computing Group (TCG).
 
 %build
 sh bootstrap.sh
-%configure --disable-static --prefix=/usr --libdir=%{_libdir} --with-tss --with-aide \
+%configure --disable-static --prefix=/usr --libdir=%{_libdir} --with-tss --with-aru \
 %if %{with_tboot}
   --with-tboot \
 %endif
@@ -101,7 +101,7 @@ getent group ptsc >/dev/null || groupadd -r ptsc
 %attr(755, root, root) %{_sbindir}/ptsc
 %attr(755, root, root) %{_bindir}/openpts
 %attr(755, root, root) %{_bindir}/uml2dot
-%attr(755, root, root) %{_bindir}/iml2aide
+#%attr(755, root, root) %{_bindir}/iml2aide
 %attr(755, root, root) %{_bindir}/tpm_createkey
 %attr(755, root, root) %{_bindir}/tpm_readpcr
 %attr(755, root, root) %{_bindir}/tpm_extendpcr
@@ -129,6 +129,8 @@ getent group ptsc >/dev/null || groupadd -r ptsc
 %attr(755,root,root) %dir %{_var}/lib/openpts
 %attr(0640, root, ptsc) %config(noreplace) %{_sysconfdir}/ptsc.conf
 %attr(0640, root, ptsc) %config(noreplace) %{_sysconfdir}/ptsv.conf
+%{_mandir}/man5/*
+%{_mandir}/man8/*
 # Fedora
 %{_initddir}/ptsc
 
@@ -150,6 +152,13 @@ getent group ptsc >/dev/null || groupadd -r ptsc
 #fi
 
 %changelog
+* Mon Jan 9 2012 Avesh Agarwal <avagarwa at redhat.com> - 0.2.6-1
+- New upstream release 0.2.6
+- Removed aide support
+- Added ARU support
+- Updated spec files
+- Modified patches as per new release
+
 * Mon Aug 15 2011 Kalev Lember <kalevlember at gmail.com> - 0.2.5-2
 - Rebuilt for rpm bug #728707
 
diff --git a/sources b/sources
index b3bf651..dd4f166 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f3a49584826fcf01375ca74156a8b948  openpts-0.2.5.tgz
+4e8104f7e85b588cd6465ff77dc4c405  openpts-0.2.6.tar.gz
