[openpts] New upstream release 0.2.5 Fixed spec file and updated local patches
avesh agarwal
avesh at fedoraproject.org
Wed Jul 20 18:41:20 UTC 2011
commit e0b92c2e267751d6d4e9b5f6cfb7e4aec294e8b3
Author: Avesh Agarwal <avagarwa at redhat.com>
Date: Wed Jul 20 14:41:05 2011 -0400
New upstream release 0.2.5
Fixed spec file and updated local patches
.gitignore | 1 +
bugs.patch | 16 ++++++++--------
init-script.patch | 6 +++---
openpts.spec | 27 ++++++++++++++++++---------
sources | 2 +-
5 files changed, 31 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 89b63e1..562a264 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/openpts-0.2.4.tgz
+/openpts-0.2.5.tgz
diff --git a/bugs.patch b/bugs.patch
index df667a1..82a957c 100644
--- a/bugs.patch
+++ b/bugs.patch
@@ -1,7 +1,7 @@
-diff -urNp openpts-0.2.4-cvs-patched/src/fsm.c openpts-0.2.4-current/src/fsm.c
---- openpts-0.2.4-cvs-patched/src/fsm.c 2011-05-09 13:33:10.336421448 -0400
-+++ openpts-0.2.4-current/src/fsm.c 2011-05-09 14:05:21.814459969 -0400
-@@ -757,7 +757,7 @@ char *getEventString(OPENPTS_PCR_EVENT_W
+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
/* event */
event = eventWrapper->event;
if (event != NULL) {
@@ -10,10 +10,10 @@ diff -urNp openpts-0.2.4-cvs-patched/src/fsm.c openpts-0.2.4-current/src/fsm.c
} else {
ERROR("NULL event\n"); // TODO(munetoh)
free(buf);
-diff -urNp openpts-0.2.4-cvs-patched/src/iml.c openpts-0.2.4-current/src/iml.c
---- openpts-0.2.4-cvs-patched/src/iml.c 2011-05-09 13:33:10.337421438 -0400
-+++ openpts-0.2.4-current/src/iml.c 2011-05-09 14:10:10.707623882 -0400
-@@ -1972,10 +1972,10 @@ int printImlByPcr(
+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 */
diff --git a/init-script.patch b/init-script.patch
index 17e6115..194307c 100644
--- a/init-script.patch
+++ b/init-script.patch
@@ -1,6 +1,6 @@
-diff -urNp openpts-0.2.4-cvs-patched/dist/fedora.initrd.ptscd openpts-0.2.4-current/dist/fedora.initrd.ptscd
---- openpts-0.2.4-cvs-patched/dist/fedora.initrd.ptscd 2011-05-09 13:33:10.333421478 -0400
-+++ openpts-0.2.4-current/dist/fedora.initrd.ptscd 2011-05-09 13:53:46.893282066 -0400
+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
@@ -87,13 +87,13 @@ case "$1" in
reload
;;
diff --git a/openpts.spec b/openpts.spec
index 31d0433..65f8132 100644
--- a/openpts.spec
+++ b/openpts.spec
@@ -1,9 +1,9 @@
%define with_tboot 1
-%define with_libtnc 1
+%define enable_tnc 1
Summary: TCG Platform Trust Service (PTS) for embedded devices
Name: openpts
-Version: 0.2.4
+Version: 0.2.5
Release: 1%{?dist}
License: CPL
@@ -14,12 +14,13 @@ Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf automake libtool trousers-devel openssl-devel
BuildRequires: libxml2-devel libuuid-devel gettext-devel
+Requires: trousers >= 0.3.6, openssl >= 1.0.0, libxml2, libuuid
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts
-%if %{with_libtnc}
+%if %{enable_tnc}
BuildRequires: libtnc-devel
Requires: libtnc
%endif
@@ -50,11 +51,12 @@ sh bootstrap.sh
%if %{with_tboot}
--with-tboot \
%endif
-%if %{with_libtnc}
- --with-libtnc
+%if %{enable_tnc}
+ --enable-tnc
%endif
-make %{?_smp_mflags}
-
+#fails due to -lopenpts in src/Makefile.am
+#make %{?_smp_mflags}
+make
%install
rm -rf $RPM_BUILD_ROOT
@@ -64,7 +66,7 @@ mkdir -p ${RPM_BUILD_ROOT}/%{_initddir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
cp -p dist/fedora.initrd.ptsc ${RPM_BUILD_ROOT}/%{_initddir}/ptsc
cp -p dist/ptsc.conf.in ${RPM_BUILD_ROOT}/%{_sysconfdir}/ptsc.conf
-
+cp -p dist/ptsv.conf.in ${RPM_BUILD_ROOT}/%{_sysconfdir}/ptsv.conf
mkdir -p ${RPM_BUILD_ROOT}/%{_prefix}/share/openpts/models
cp -p models/*.uml ${RPM_BUILD_ROOT}/%{_prefix}/share/openpts/models/
mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/openpts
@@ -111,7 +113,9 @@ getent group ptsc >/dev/null || groupadd -r ptsc
%{_prefix}/share/openpts/tboot/*
%attr(755,root,root) %dir %{_prefix}/share/openpts/tboot
%endif
-%if %{with_libtnc}
+%{_libdir}/libopenpts.la
+%{_libdir}/libopenpts*.so
+%if %{enable_tnc}
%{_libdir}/libopenpts_imc.la
%{_libdir}/libopenpts_imc.so*
%{_libdir}/libopenpts_imv.la
@@ -124,6 +128,7 @@ getent group ptsc >/dev/null || groupadd -r ptsc
%attr(755,root,root) %dir %{_prefix}/share/openpts/tpm_emulator
%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
# Fedora
%{_initddir}/ptsc
@@ -145,6 +150,10 @@ getent group ptsc >/dev/null || groupadd -r ptsc
#fi
%changelog
+* Wed Jul 20 2011 Avesh Agarwal <avagarwa at redhat.com> - 0.2.5-1
+- New upstream release 0.2.5
+- Fixed spec file and updated local patches
+
* Tue Jun 7 2011 Avesh Agarwal <avagarwa at redhat.com> - 0.2.4-1
- Initial build on F16
- Latest upstream release 0.2.4
diff --git a/sources b/sources
index 22d4eae..b3bf651 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-84d6dc0f4e8c7941056750ef90249d6d openpts-0.2.4.tgz
+f3a49584826fcf01375ca74156a8b948 openpts-0.2.5.tgz
More information about the scm-commits
mailing list