rpms/mono-bouncycastle/devel bccrypto-nopatents.patch, 1.1, 1.2 mono-bouncycastle.spec, 1.2, 1.3

[Kalev Lember]

Author: kalev

Update of /cvs/pkgs/rpms/mono-bouncycastle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv901

Modified Files:
	bccrypto-nopatents.patch mono-bouncycastle.spec 
Log Message:
Updated mono-nopatents.patch to the version sent upstream


bccrypto-nopatents.patch:
 NBuild.build                       |   26 ++++++++++++++------------
 src/security/ParameterUtilities.cs |    4 ++++
 2 files changed, 18 insertions(+), 12 deletions(-)

Index: bccrypto-nopatents.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/devel/bccrypto-nopatents.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bccrypto-nopatents.patch	3 Dec 2009 08:40:55 -0000	1.1
+++ bccrypto-nopatents.patch	11 Dec 2009 14:00:00 -0000	1.2
@@ -1,7 +1,9 @@
+Fix build with IDEA code removed.
+
 diff -up csharp/crypto/NBuild.build.nopatents csharp/crypto/NBuild.build
---- csharp/crypto/NBuild.build.nopatents	2009-08-18 15:11:56.000000000 +0300
-+++ csharp/crypto/NBuild.build	2009-11-13 01:27:18.000000000 +0200
-@@ -136,18 +136,6 @@
+--- csharp/crypto/NBuild.build.nopatents	2009-12-11 15:22:15.000000000 +0200
++++ csharp/crypto/NBuild.build	2009-12-11 15:23:14.000000000 +0200
+@@ -136,18 +136,20 @@
          <include name="System.dll"/>
        </references>
      </csc>
@@ -17,28 +19,46 @@ diff -up csharp/crypto/NBuild.build.nopa
 -        <include name="System.dll"/>
 -      </references>
 -    </csc>
++    <if test="${file::exists(api-srcpath + '/crypto/engines/IdeaEngine.cs')}">
++      <csc target="library" noconfig="true" nostdlib="${enable-nostdlib}" output="${dist-path}/${name-ext}.dll"
++        verbose="false" debug="false" optimize="true" define="${compile-defines};STRONG_NAME;INCLUDE_IDEA">
++        <sources>
++          <include name="${api-srcpath}/**/*.cs"/>
++          <exclude name="${api-srcpath}/cms/CMSAuthenticated*.cs"/>
++          <include name="${bzip2-srcpath}/**/*.cs"/>
++        </sources>
++        <references>
++          <include name="mscorlib.dll"/>
++          <include name="System.dll"/>
++        </references>
++      </csc>
++    </if>
    </target>
  
    <target name="all" depends="compile-debug, compile-release"/>
 diff -up csharp/crypto/src/security/ParameterUtilities.cs.nopatents csharp/crypto/src/security/ParameterUtilities.cs
---- csharp/crypto/src/security/ParameterUtilities.cs.nopatents	2009-11-13 01:26:10.000000000 +0200
-+++ csharp/crypto/src/security/ParameterUtilities.cs	2009-11-13 01:26:49.000000000 +0200
-@@ -226,9 +226,6 @@ namespace Org.BouncyCastle.Security
+--- csharp/crypto/src/security/ParameterUtilities.cs.nopatents	2009-07-06 04:52:58.000000000 +0300
++++ csharp/crypto/src/security/ParameterUtilities.cs	2009-12-11 15:22:15.000000000 +0200
+@@ -226,9 +226,11 @@ namespace Org.BouncyCastle.Security
  					case "RC2":
  						iv = RC2CbcParameter.GetInstance(asn1Params).GetIV();
  						break;
--					case "IDEA":
--						iv = IdeaCbcPar.GetInstance(asn1Params).GetIV();
--						break;
++#if INCLUDE_IDEA
+ 					case "IDEA":
+ 						iv = IdeaCbcPar.GetInstance(asn1Params).GetIV();
+ 						break;
++#endif
  					case "CAST5":
  						iv = Cast5CbcParameters.GetInstance(asn1Params).GetIV();
  						break;
-@@ -292,8 +289,6 @@ namespace Org.BouncyCastle.Security
+@@ -292,8 +294,10 @@ namespace Org.BouncyCastle.Security
  				case "DESEDE":
  				case "DESEDE3":
  					return CreateIVOctetString(random, 8);
--				case "IDEA":
--					return new IdeaCbcPar(CreateIV(random, 8));
++#if INCLUDE_IDEA
+ 				case "IDEA":
+ 					return new IdeaCbcPar(CreateIV(random, 8));
++#endif
  				case "NOEKEON":
  					return CreateIVOctetString(random, 16);
  				case "RC2":


Index: mono-bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/devel/mono-bouncycastle.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mono-bouncycastle.spec	3 Dec 2009 09:52:37 -0000	1.2
+++ mono-bouncycastle.spec	11 Dec 2009 14:00:00 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           mono-bouncycastle
 Version:        1.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Bouncy Castle Crypto Package for Mono
 
 Group:          System Environment/Libraries
@@ -22,6 +22,7 @@ Source2:        mono.snk
 # Patch to enable building with Mono
 Patch0:         bccrypto-mono.patch
 # Patch to fix build with patent encumbered code removed
+# http://www.bouncycastle.org/jira/browse/BMA-53
 Patch1:         bccrypto-nopatents.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -72,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mono/bouncycastle/
 
 %changelog
+* Fri Dec 11 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-5
+- Updated mono-nopatents.patch to the version sent upstream
+
 * Wed Dec 02 2009 Kalev Lember <kalev at smartlink.ee> - 1.5-4
 - Updated License tag to read 'MIT and ASL 1.1'