[tncfhh] New upstream release updated local patches

[avesh agarwal]

commit b1d8a1a0cd921b8de037fee0384bd9b708212f85
Author: Avesh Agarwal <avagarwa at redhat.com>
Date:   Fri Sep 2 16:18:50 2011 -0400

    New upstream release
    updated local patches

 .gitignore                         |    1 +
 sources                            |    2 +-
 tncfhh-0.8.2-issues.patch          |  126 -------------
 tncfhh-0.8.3-issues.patch          |   42 +++++
 tncfhh-cmake-issues.patch          |  350 ------------------------------------
 tncfhh-memory-leak-exception.patch |   16 --
 tncfhh.spec                        |   16 +-
 tncxacml-xerces.patch              |   49 -----
 8 files changed, 51 insertions(+), 551 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a02e1cc..f49916c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /tncfhh-0.8.2.tar.gz
+/tncfhh-0.8.3.tar.gz
diff --git a/sources b/sources
index e75b806..a8bc8d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-866ada19c80146387ff91b971f199a8c  tncfhh-0.8.2.tar.gz
+c6ecea3efc4a7a3014c8e9af432bd47b  tncfhh-0.8.3.tar.gz
diff --git a/tncfhh-0.8.3-issues.patch b/tncfhh-0.8.3-issues.patch
new file mode 100644
index 0000000..d419a4c
--- /dev/null
+++ b/tncfhh-0.8.3-issues.patch
@@ -0,0 +1,42 @@
+diff -urNp tncfhh-0.8.3/imcv/platid/imc/src/PlatidIMC.cpp tncfhh-0.8.3-cvs-patched/imcv/platid/imc/src/PlatidIMC.cpp
+--- tncfhh-0.8.3/imcv/platid/imc/src/PlatidIMC.cpp	2011-08-29 07:17:52.000000000 -0400
++++ tncfhh-0.8.3-cvs-patched/imcv/platid/imc/src/PlatidIMC.cpp	2011-09-02 16:02:34.884916923 -0400
+@@ -189,7 +189,7 @@ void PlatidIMC::processPrivateKeyLine(st
+ 
+ void PlatidIMC::processCertificateFileLine(string line)
+ {
+-	int i;
++	unsigned int i;
+ 	i = line.find_first_of(' ');
+ 
+ 	if (i != line.npos) {
+diff -urNp tncfhh-0.8.3/imunit/src/imunit/imc/IMCLibrary.cpp tncfhh-0.8.3-cvs-patched/imunit/src/imunit/imc/IMCLibrary.cpp
+--- tncfhh-0.8.3/imunit/src/imunit/imc/IMCLibrary.cpp	2011-08-29 07:17:52.000000000 -0400
++++ tncfhh-0.8.3-cvs-patched/imunit/src/imunit/imc/IMCLibrary.cpp	2011-09-02 16:03:06.726866021 -0400
+@@ -171,7 +171,10 @@ TNC_Result IMCLibrary::notifyConnectionC
+ 
+ 					// save IMC
+ 					imcInstances[connectionID] = tmp;
+-					imc = getImcInstances(connectionID);
++					/* why to search  in the global list*/
++					/* if the list is long, it can cause performance issues*/
++					//imc = getImcInstances(connectionID);
++					imc = tmp;
+ 				}
+ 				break;
+ 			case TNC_CONNECTION_STATE_DELETE:
+diff -urNp tncfhh-0.8.3/imunit/src/imunit/imv/IMVLibrary.cpp tncfhh-0.8.3-cvs-patched/imunit/src/imunit/imv/IMVLibrary.cpp
+--- tncfhh-0.8.3/imunit/src/imunit/imv/IMVLibrary.cpp	2011-08-29 07:17:52.000000000 -0400
++++ tncfhh-0.8.3-cvs-patched/imunit/src/imunit/imv/IMVLibrary.cpp	2011-09-02 16:03:33.662823230 -0400
+@@ -183,7 +183,10 @@ TNC_Result IMVLibrary::notifyConnectionC
+ 					if (!tmp) throw ResultException("createNewIMVInstance(..) return NULL", TNC_RESULT_FATAL);
+ 
+ 					imvInstances[connectionID] = tmp;
+-					imv = getImvInstances(connectionID);
++					/* why to search  in the global list*/
++					/* if the list is long, it can cause performance issues*/
++					//imv = getImvInstances(connectionID);
++					imv=tmp;
+ 				}
+ 				break;
+ 				case TNC_CONNECTION_STATE_DELETE:
diff --git a/tncfhh.spec b/tncfhh.spec
index 0b3f920..7d7eb1e 100644
--- a/tncfhh.spec
+++ b/tncfhh.spec
@@ -2,9 +2,9 @@
 
 Summary: An open source implementation of the Trusted Network Connect (TNC) framework
 Name: tncfhh
-Version: 0.8.2
+Version: 0.8.3
 
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 Url: http://trust.inform.fh-hannover.de/joomla/index.php/projects/tncfhh
 Source0: http://trust.inform.fh-hannover.de/download/tncfhh/tncfhh-%{version}.tar.gz
@@ -14,10 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: cmake log4cxx-devel xerces-c-devel trousers-devel libtnc-devel
 BuildRequires: libtool-ltdl-devel boost-devel openssl-devel
 
-Patch1: tncxacml-xerces.patch
-Patch2: tncfhh-cmake-issues.patch
-Patch3: tncfhh-memory-leak-exception.patch
-Patch4: tncfhh-0.8.2-issues.patch
+Patch1: tncfhh-0.8.3-issues.patch
 
 %description
 The TNC at FHH project is an open source implementation of the Trusted Network
@@ -73,9 +70,6 @@ A shared library that offers simple configuration file parsing.
 %prep
 %setup -q -n tncfhh-%{version}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %cmake . -DCOMPONENT=all -DNAL=8021x \
@@ -162,6 +156,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libtncutil.so.?.?.?
 
 %changelog
+* Fri Sep 2 2011 Avesh Agarwal <avagarwa at redhat.com> - 0.8.3-1
+- New upstream release
+- updated local patches
+
 * Mon Aug 8 2011 Avesh Agarwal <avagarwa at redhat.com> - 0.8.2-2
 - Fixed broken dependencies of boost-system and boost-thread
 - Fixed some performance and implementation issues