rpms/mono-bouncycastle/devel bccrypto-strongname.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mono-bouncycastle.spec, 1.5, 1.6 sources, 1.2, 1.3 bccrypto-generate-zip.sh, 1.1, NONE bccrypto-mono.patch, 1.1, NONE bccrypto-nopatents.patch, 1.2, NONE

Kalev Lember kalev at fedoraproject.org
Sat Feb 6 01:10:34 UTC 2010


Author: kalev

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

Modified Files:
	.cvsignore mono-bouncycastle.spec sources 
Added Files:
	bccrypto-strongname.patch 
Removed Files:
	bccrypto-generate-zip.sh bccrypto-mono.patch 
	bccrypto-nopatents.patch 
Log Message:
- Update to version 1.6
- Use upstream source zip now that IDEA code is removed
- Removed patches which were merged upstream
- Added patch to strongname sign the resulting assembly
- ASL 1.1 files were relicensed to ASL 2.0, so now
  the license tag reads 'MIT and ASL 2.0'


bccrypto-strongname.patch:
 NBuild.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bccrypto-strongname.patch ---
diff -up csharp/crypto/NBuild.build.strongname csharp/crypto/NBuild.build
--- csharp/crypto/NBuild.build.strongname	2010-02-05 14:19:40.000000000 +0200
+++ csharp/crypto/NBuild.build	2010-02-06 02:50:49.000000000 +0200
@@ -147,7 +147,7 @@
 		<echo message="Compiling API in release mode."/>
 		<mkdir dir="${api-releasepath}"/>
 		<csc target="library" noconfig="true" nostdlib="${enable-nostdlib}" output="${api-releasepath}/${name}.dll"
-			verbose="false" debug="false" optimize="true" define="${compile-defines}${OPTIONAL_INCLUDE_IDEA}">
+			verbose="false" debug="false" optimize="true" define="${compile-defines}${OPTIONAL_INCLUDE_IDEA};STRONG_NAME">
 			<sources>
 				<include name="${api-srcpath}/**/*.cs"/>
 				<include name="${bzip2-srcpath}/**/*.cs"/>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Dec 2009 08:40:55 -0000	1.2
+++ .cvsignore	6 Feb 2010 01:10:33 -0000	1.3
@@ -1 +1 @@
-bccrypto-net-1.5-src-nopatents.zip
+bccrypto-net-1.6-src.zip


Index: mono-bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/devel/mono-bouncycastle.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mono-bouncycastle.spec	23 Jan 2010 22:23:54 -0000	1.5
+++ mono-bouncycastle.spec	6 Feb 2010 01:10:34 -0000	1.6
@@ -1,27 +1,18 @@
 %global debug_package %{nil}
 
 Name:           mono-bouncycastle
-Version:        1.5
-Release:        6%{?dist}
+Version:        1.6
+Release:        1%{?dist}
 Summary:        Bouncy Castle Crypto Package for Mono
 
 Group:          System Environment/Libraries
-# Files in crypto/bzip2/ are ASL 1.1 licensed,
+# Files in crypto/bzip2/ are ASL 2.0 licensed,
 # everything else is MIT.
-License:        MIT and ASL 1.1
+License:        MIT and ASL 2.0
 URL:            http://www.bouncycastle.org/csharp/
-# Original source http://www.bouncycastle.org/csharp/download/bccrypto-net-%{version}-src.zip
-Source0:        bccrypto-net-%{version}-src-nopatents.zip
-# The following script is used to remove certain patented algorithms
-# from the source zip file before shipping it.
-# Download the upstream zip file and invoke this script:
-# ./bccrypto-generate-zip.sh %{version}
-Source1:        bccrypto-generate-zip.sh
-# 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
+Source0:        http://www.bouncycastle.org/csharp/download/bccrypto-net-%{version}-src.zip
+# Enable strongname signing so that we could install the assembly into GAC
+Patch0:         bccrypto-strongname.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  mono-devel, nant
@@ -40,20 +31,19 @@ and real-world use the Java version has 
 
 %prep
 %setup -q -n csharp
-%patch0 -p1 -b .mono
-%patch1 -p1 -b .nopatents
+%patch0 -p1 -b .strongname
 
 %build
 # Use the mono system key instead of generating our own here.
 cp -a /etc/pki/mono/mono.snk BouncyCastle.snk
-cd crypto/
-nant dist
+pushd crypto/
+nant compile-release
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd crypto/
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/mono/gac/
-gacutil -i dist/BouncyCastle.Crypto.dll -f -package bouncycastle -root $RPM_BUILD_ROOT%{_libdir}
+gacutil -i crypto/api/bin/release/BouncyCastle.Crypto.dll -f -package bouncycastle -root $RPM_BUILD_ROOT%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +57,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mono/bouncycastle/
 
 %changelog
+* Sat Feb 06 2010 Kalev Lember <kalev at smartlink.ee> - 1.6-1
+- Update to version 1.6
+- Use upstream source zip now that IDEA code is removed
+- Removed patches which were merged upstream
+- Added patch to strongname sign the resulting assembly
+- ASL 1.1 files were relicensed to ASL 2.0, so now
+  the license tag reads 'MIT and ASL 2.0'
+
 * Sat Jan 23 2010 Kalev Lember <kalev at smartlink.ee> - 1.5-6
 - Removed bundled mono.snk key
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Dec 2009 08:40:55 -0000	1.2
+++ sources	6 Feb 2010 01:10:34 -0000	1.3
@@ -1 +1 @@
-2905d4f7bf067394ebe4c9bbf49d81aa  bccrypto-net-1.5-src-nopatents.zip
+31d583b16798da470611a476994dd3a3  bccrypto-net-1.6-src.zip


--- bccrypto-generate-zip.sh DELETED ---


--- bccrypto-mono.patch DELETED ---


--- bccrypto-nopatents.patch DELETED ---



More information about the scm-commits mailing list