Author: cfry-guest Date: 2006-04-25 23:08:42 +0000 (Tue, 25 Apr 2006) New Revision: 2100
Removed: trunk/bouncycastle/debian/patches/02_gjdoc.patch Modified: trunk/bouncycastle/debian/changelog trunk/bouncycastle/debian/control trunk/bouncycastle/debian/copyright trunk/bouncycastle/debian/libbcprov-java.README.Debian trunk/bouncycastle/debian/patches/01_build.patch trunk/bouncycastle/debian/rules Log: updated for new release Modified: trunk/bouncycastle/debian/changelog =================================================================== --- trunk/bouncycastle/debian/changelog 2006-04-25 21:39:58 UTC (rev 2099) +++ trunk/bouncycastle/debian/changelog 2006-04-25 23:08:42 UTC (rev 2100) @@ -1,3 +1,11 @@ +bouncycastle (1.32-1) unstable; urgency=low + + * New upstream release + * Add build dependencies on ant, use java-gcj-compat-dev (thanks to Matthias + Klose <[EMAIL PROTECTED]>) + + -- Charles Fry <[EMAIL PROTECTED]> Thu, 20 Apr 2006 22:15:18 -0400 + bouncycastle (1.30-1) unstable; urgency=low * Initial release (Closes: #234048) Modified: trunk/bouncycastle/debian/control =================================================================== --- trunk/bouncycastle/debian/control 2006-04-25 21:39:58 UTC (rev 2099) +++ trunk/bouncycastle/debian/control 2006-04-25 23:08:42 UTC (rev 2100) @@ -1,14 +1,14 @@ Source: bouncycastle -Section: contrib/libs +Section: libs Priority: optional -Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Charles Fry <[EMAIL PROTECTED]> -Build-Depends-Indep: cdbs, debhelper (>= 4.1.0), free-java-sdk, libgnumail-java, gjdoc, junit +Maintainer: Charles Fry <[EMAIL PROTECTED]> +Uploaders: Debian Java Maintainers <[email protected]> +Build-Depends-Indep: cdbs, debhelper (>= 4.1.0), java-gcj-compat-dev, ant, libgnumail-java, gjdoc, junit Standards-Version: 3.6.2 Package: libbcprov-java Architecture: all -Depends: sablevm | java2-runtime +Depends: java-gcj-compat | java2-runtime Suggests: java-virtual-machine, libbcprov-java-doc Description: Bouncy Castle Java Cryptographic Service Provider The Bouncy Castle Crypto package is a Java implementation of Modified: trunk/bouncycastle/debian/copyright =================================================================== --- trunk/bouncycastle/debian/copyright 2006-04-25 21:39:58 UTC (rev 2099) +++ trunk/bouncycastle/debian/copyright 2006-04-25 23:08:42 UTC (rev 2100) @@ -2,12 +2,13 @@ Fri, 12 Aug 2005 11:47:16 -0400. It was downloaded from http://www.bouncycastle.org/latest_releases.html +(specifically the file crypto-<version>.tar.gz) Copyright Holder: The Legion Of The Bouncy Castle License: -Copyright (c) 2000-2005 The Legion Of The Bouncy Castle +Copyright (c) 2000-2006 The Legion Of The Bouncy Castle (http://www.bouncycastle.org) Permission is hereby granted, free of charge, to any person obtaining a copy of Modified: trunk/bouncycastle/debian/libbcprov-java.README.Debian =================================================================== --- trunk/bouncycastle/debian/libbcprov-java.README.Debian 2006-04-25 21:39:58 UTC (rev 2099) +++ trunk/bouncycastle/debian/libbcprov-java.README.Debian 2006-04-25 23:08:42 UTC (rev 2100) @@ -36,56 +36,10 @@ Bouncy Caslte as a Trusted Security Provider -------------------------------------------- -Unfortunately, the Debian release of Bouncy Castle can not currently be used as -a trusted security provider, as the jar has not been signed by a trusted CA. We -are actively working to remedy this, and hope to support this functionality in -the future. +The Debian release of Bouncy Castle can not currently be used as a trusted +security provider, as the jar has not been signed by a trusted CA. This is a +non-issue for free JVMs, as they don't currently have a notion of trusted +CAs. -Regression Test Failures in Free JVMs -------------------------------------- - -Currently some of the regression tests fail with certain free JVMs, as -documented here. There is an outstanding Classpath bug for this issue: - - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23899 - -This package will remain in contrib until I find a free JVM that can -successfully pass all fo the tests. - -Kaffe version 1.1.5-cvs20050808 fails on the following tests: - -DSA: r component wrong. - expecting: 68076202252361894315274692543577577550894681403 - got : 1074783417826318429645906256512688606749844619578 -ECDSA 192 bit prime: r component wrong. - expecting: 3342403536405981729393488334694600415596881826869351677613 - got : 4004251526638939117541133732327825497563233973235018568759 -GOST3410-TEST1-512: r component wrong. - expecting: 3e5f895e276d81d2d52c0763270a458157b784c57abdbd807bc44fd43a32ac06 - got : 83ab3f874fd89723c7351beb0c4f1582668cfc1c049ab9b6ee24826e5766c6d5 -ECGOST3410 - TEST: r component wrong. - expecting: 29700980915817952874371204983938256990422752107994319651632687982059210933395 - got : 2310540715789163898123798483963857190741244562950675143483258216624959678287 - -SableVM version 1.11.3 and gij version 4.0.2 20050913 failed on the following -tests: - - -DSA: r component wrong. - expecting: 68076202252361894315274692543577577550894681403 - got : 746231301394742731982047691450321420276689060848 -ECDSA 192 bit prime: r component wrong. - expecting: 3342403536405981729393488334694600415596881826869351677613 - got : 6249833018739160226694907120521802919631748840289650662347 -GOST3410-TEST1-512: r component wrong. - expecting: 3e5f895e276d81d2d52c0763270a458157b784c57abdbd807bc44fd43a32ac06 - got : 24287d8a0d17fedec7c6dfd5a018a27ddcca4528a84ae7a51344715a83de2456 -ECGOST3410 - TEST: r component wrong. - expecting: 29700980915817952874371204983938256990422752107994319651632687982059210933395 - got : 13628253036095457453781547057345293906187223953521072753797672813397452752475 - -If you encounter errors with other JVMs, please report them so that they can be -documented here, and ultimately fixed upstream. - - -- Charles Fry <[EMAIL PROTECTED]>, Mon Aug 19 18:21:08 2005 + -- Charles Fry <[EMAIL PROTECTED]>, Tue Apr 25 19:07:32 2006 Modified: trunk/bouncycastle/debian/patches/01_build.patch =================================================================== --- trunk/bouncycastle/debian/patches/01_build.patch 2006-04-25 21:39:58 UTC (rev 2099) +++ trunk/bouncycastle/debian/patches/01_build.patch 2006-04-25 23:08:42 UTC (rev 2100) @@ -1,93 +1,25 @@ -diff -urNad --exclude=CVS --exclude=.svn ./build1-4 /tmp/dpep-work.LBSoJf/bouncycastle/build1-4 ---- ./build1-4 2005-04-17 23:02:48.000000000 -0400 -+++ /tmp/dpep-work.LBSoJf/bouncycastle/build1-4 2005-09-14 13:50:30.000000000 -0400 -@@ -6,7 +6,7 @@ +diff -Nur bouncycastle-1.32/build1-4 bouncycastle-1.32.new/build1-4 +--- bouncycastle-1.32/build1-4 2005-12-17 02:17:06.000000000 -0500 ++++ bouncycastle-1.32.new/build1-4 2006-04-20 22:14:10.000000000 -0400 +@@ -6,9 +6,9 @@ # otherwise it just creates the docs and class files. # --JDK14PATH=/opt/j2sdk1.4.2_04 # JDK 1.4 location -+JDK14PATH=/usr/lib/fjsdk # JDK 1.4 location +-JDKPATH=/opt/j2sdk1.4.2_04 # JDK 1.4 location +-JAVA_MAIL_HOME=/opt/javamail-1.3.1 +-JAVA_ACTIVATION_HOME=/opt/jaf-1.0.2 ++JDKPATH=/usr/lib/jvm/java-gcj # JDK 1.4 location ++JAVA_MAIL_HOME=/usr/share/java ++JAVA_ACTIVATION_HOME=/usr/share/java - base=$1 - version=`echo $base | sed -e "s/\([0-9]\)\([0-9a-z]*\)/\1.\2/"` -@@ -22,7 +22,7 @@ - exit - fi + JAVA_HOME=$JDKPATH + export JAVA_HOME +@@ -16,7 +16,7 @@ + PATH=$JDKPATH/bin:$PATH + export PATH --echo Java version to use - JDK14PATH set to $JDK14PATH -+# echo Java version to use - JDK14PATH set to $JDK14PATH +-CLASSPATH=$JAVA_MAIL_HOME/mail.jar:$JAVA_ACTIVATION_HOME/activation.jar:$CLASSPATH ++CLASSPATH=$JAVA_MAIL_HOME/gnumail.jar:$JAVA_ACTIVATION_HOME/activation.jar:$CLASSPATH + export CLASSPATH - if test "$base" != "" -a ! -d lcrypto-jdk14-$base - then -@@ -41,7 +41,7 @@ - - echo "compiling" - -- (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src *.java */*.java */*/*.java ) -+ (cd src/org/bouncycastle; javac -nowarn -d ../../../classes -classpath ../../../classes:../../../src:/usr/share/java/junit.jar *.java */*.java */*/*.java ) - - javadoc -windowtitle "$WINDOWTITLE" -doctitle "$DOCTITLE" \ - -header "$HEADER" \ -@@ -183,7 +183,7 @@ - rm -rf src/org/bouncycastle/openpgp; - rm -rf src/org/bouncycastle/bcpg; - -- (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src *.java */*.java */*/*.java */*/*/*.java) -+ (cd src/org/bouncycastle; javac -nowarn -d ../../../classes -classpath ../../../classes:../../../src:/usr/share/java/junit.jar *.java */*.java */*/*.java */*/*/*.java) - - cp src/org/bouncycastle/openssl/test/*.pem classes/org/bouncycastle/openssl/test - -@@ -243,7 +243,7 @@ - -header "$HEADER" \ - -group "CMS Packages" "org.bouncycastle.cms*" \ - -group "S/MIME Packages" "org.bouncycastle.mail.smime*" \ -- -classpath classes:../jce-jdk14-$base/classes \ -+ -classpath classes:../bcprov-jdk14-$base.jar \ - -d docs -sourcepath src -breakiterator \ - org.bouncycastle.cms \ - org.bouncycastle.cms.test \ -@@ -254,7 +254,7 @@ - - echo "compiling" - -- (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:../../../../jce-jdk14-$base/classes */*.java */*/*.java */*/*/*.java) -+ (cd src/org/bouncycastle; javac -nowarn -d ../../../classes -classpath ../../../classes:../../../src:../../../../bcprov-jdk14-$base.jar:/usr/share/java/junit.jar:/usr/share/java/gnumail.jar:/usr/share/java/activation.jar */*.java */*/*.java */*/*/*.java) - cat > classes/mail.mf <<% - Manifest-Version: 1.0 - Extension-Name: org.bouncycastle.bcmail -@@ -298,7 +298,7 @@ - - echo "compiling" - -- (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src */*.java */*/*.java) -+ (cd src/org/bouncycastle; javac -nowarn -d ../../../classes -classpath ../../../classes:../../../src:../../../../bcprov-jdk14-$base.jar:/usr/share/java/junit.jar */*.java */*/*.java) - cat > classes/pg.mf <<% - Manifest-Version: 1.0 - Extension-Name: org.bouncycastle.bcpg -@@ -344,7 +344,7 @@ - - echo "compiling" - -- (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:../../../../bcmail-jdk14-$base/classes */*.java */*/*.java) -+ (cd src/org/bouncycastle; javac -nowarn -d ../../../classes -classpath ../../../classes:../../../src:../../../../bcmail-jdk14-$base/classes:../../../../bcprov-jdk14-$base.jar:/usr/share/java/junit.jar:/usr/share/java/gnumail.jar:/usr/share/java/activation.jar */*.java */*/*.java) - cat > classes/tsp.mf <<% - Manifest-Version: 1.0 - Extension-Name: org.bouncycastle.bctsp -@@ -356,7 +356,7 @@ - % - - (cd classes; jar cmf tsp.mf ../../bctsp-jdk14-$base.jar org) -- java -classpath ../bcmail-jdk14-$base/classes:classes org.bouncycastle.tsp.test.RegressionTest -+ java -classpath ../bcmail-jdk14-$base/classes:classes:../bcprov-jdk14-$base.jar:/usr/share/java/junit.jar org.bouncycastle.tsp.test.RegressionTest - ) - - (2>&1 find bctsp-jdk14-$base -name CVS -exec rm -rf \{\} \;) > /dev/null -@@ -382,7 +382,7 @@ - > /dev/null \ - - echo "compiling" -- (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../tools/src */*/*.java */*/*/*.java) -+ (cd src/org/bouncycastle; javac -nowarn -d ../../../classes -classpath ../../../classes:../../../tools/src:/usr/share/java/junit.jar */*/*.java */*/*/*.java) - cat > classes/tools.mf <<% - Manifest-Version: 1.0 - Extension-Name: org.bouncycastle.tools + if [ "$1" == "test" ] Deleted: trunk/bouncycastle/debian/patches/02_gjdoc.patch =================================================================== --- trunk/bouncycastle/debian/patches/02_gjdoc.patch 2006-04-25 21:39:58 UTC (rev 2099) +++ trunk/bouncycastle/debian/patches/02_gjdoc.patch 2006-04-25 23:08:42 UTC (rev 2100) @@ -1,57 +0,0 @@ -diff -urNad --exclude=CVS --exclude=.svn ./build1-4 /tmp/dpep-work.SNE1yV/bouncycastle/build1-4 ---- ./build1-4 2005-09-15 09:53:14.236916699 -0400 -+++ /tmp/dpep-work.SNE1yV/bouncycastle/build1-4 2005-09-15 09:53:15.050806758 -0400 -@@ -43,7 +43,7 @@ - - (cd src/org/bouncycastle; javac -nowarn -d ../../../classes -classpath ../../../classes:../../../src:/usr/share/java/junit.jar *.java */*.java */*/*.java ) - -- javadoc -windowtitle "$WINDOWTITLE" -doctitle "$DOCTITLE" \ -+ /usr/bin/gjdoc -windowtitle "$WINDOWTITLE" -doctitle "$DOCTITLE" \ - -header "$HEADER" \ - -group "Lightweight Crypto Packages" "org.bouncycastle.crypto*" \ - -group "ASN.1 Support Packages" "org.bouncycastle.asn1*" \ -@@ -115,7 +115,7 @@ - PATH=$JDK14PATH/bin:$PATH - export PATH - -- javadoc -windowtitle "$WINDOWTITLE" -doctitle "$DOCTITLE" \ -+ /usr/bin/gjdoc -windowtitle "$WINDOWTITLE" -doctitle "$DOCTITLE" \ - -header "$HEADER"\ - -group "JCE Utility and Extension Packages" "org.bouncycastle.jce*" \ - -group "OCSP and OpenSSL PEM Support Packages" "org.bouncycastle.ocsp*:org.bouncycastle.openssl*" \ -@@ -239,7 +239,7 @@ - PATH=$JDK14PATH/bin:$PATH - export PATH - -- javadoc -windowtitle "$WINDOWTITLE" -doctitle "$DOCTITLE" \ -+ /usr/bin/gjdoc -windowtitle "$WINDOWTITLE" -doctitle "$DOCTITLE" \ - -header "$HEADER" \ - -group "CMS Packages" "org.bouncycastle.cms*" \ - -group "S/MIME Packages" "org.bouncycastle.mail.smime*" \ -@@ -283,7 +283,7 @@ - PATH=$JDK14PATH/bin:$PATH - export PATH - -- javadoc -windowtitle "$WINDOWTITLE" -doctitle "$DOCTITLE" \ -+ /usr/bin/gjdoc -windowtitle "$WINDOWTITLE" -doctitle "$DOCTITLE" \ - -header "$HEADER" \ - -group "BCPG Support Packages" "org.bouncycastle.bcpg*" \ - -group "OpenPGP Packages" "org.bouncycastle.openpgp*" \ -@@ -334,7 +334,7 @@ - rm -rf src/org/bouncycastle/cms - rm -rf src/org/bouncycastle/mail - -- javadoc -windowtitle "$WINDOWTITLE" -doctitle "$DOCTITLE" \ -+ /usr/bin/gjdoc -windowtitle "$WINDOWTITLE" -doctitle "$DOCTITLE" \ - -header "$HEADER" \ - -group "TSP Packages" "org.bouncycastle.tsp*" \ - -classpath classes:../bcmail-jdk14-$base/classes \ -@@ -371,7 +371,7 @@ - ( - cd bctools-jdk14-$base; mkdir classes; mkdir docs; - -- javadoc -windowtitle "$WINDOWTITLE" -doctitle "$DOCTITLE" \ -+ /usr/bin/gjdoc -windowtitle "$WINDOWTITLE" -doctitle "$DOCTITLE" \ - -header "$HEADER" -group "Core Packages" "org.bouncycastle*" \ - -group "Example Packages" "example*" -classpath classes \ - -d docs -sourcepath src -breakiterator \ Modified: trunk/bouncycastle/debian/rules =================================================================== --- trunk/bouncycastle/debian/rules 2006-04-25 21:39:58 UTC (rev 2099) +++ trunk/bouncycastle/debian/rules 2006-04-25 23:08:42 UTC (rev 2100) @@ -1,26 +1,29 @@ #!/usr/bin/make -f +# -*- makefile -*- include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +builddir = build/artifacts/jdk1.4 + common-build-indep:: - # build as version 0 for the sake of package creation - . ./build1-4 0 + sh -x ./build1-4 clean:: - rm -rf *-0* + rm -rf build +binary-install/libbcprov-java:: + install -m 644 $(builddir)/jars/bcprov-jdk14-*.jar debian/libbcprov-java/usr/share/java/bcprov.jar + +binary-install/libbcprov-java-doc:: + mv -i $(builddir)/bcprov-jdk14-*/docs debian/libbcprov-java-doc/usr/share/doc/libbcprov-java-doc/apidoc + #binary-install/libbcmail-java:: -# install -m 644 bcmail-jdk14-0.jar debian/libbcmail-java/usr/share/java/bcmail.jar - #mv -i bcmail-jdk14-0/docs debian/libbcmail-java/usr/share/doc/libbcmail-java/apidoc +# install -m 644 $(builddir)/jars/bcmail-jdk14-*.jar debian/libbcmail-java/usr/share/java/bcmail.jar + #mv -i $(builddir)/bcmail-jdk14-*/docs debian/libbcmail-java/usr/share/doc/libbcmail-java/apidoc #binary-install/libbcpg-java:: -# install -m 644 bcpg-jdk14-0.jar debian/libbcpg-java/usr/share/java/bcpg.jar - #mv -i bcpg-jdk14-0/docs debian/libbcpg-java/usr/share/doc/libbcpg-java/apidoc -binary-install/libbcprov-java:: - install -m 644 bcprov-jdk14-0.jar debian/libbcprov-java/usr/share/java/bcprov.jar +# install -m 644 $(builddir)/jars/bcpg-jdk14-*.jar debian/libbcpg-java/usr/share/java/bcpg.jar + #mv -i $(builddir)/bcpg-jdk14-*/docs debian/libbcpg-java/usr/share/doc/libbcpg-java/apidoc #binary-install/libbctsp-java:: -# install -m 644 bctsp-jdk14-0.jar debian/libbctsp-java/usr/share/java/bctsp.jar - #mv -i bctsp-jdk14-0/docs debian/libbctsp-java/usr/share/doc/libbctsp-java/apidoc - -binary-install/libbcprov-java-doc:: - mv -i bcprov-jdk14-0/docs debian/libbcprov-java-doc/usr/share/doc/libbcprov-java-doc/apidoc +# install -m 644 $(builddir)/jars/bctsp-jdk14-*.jar debian/libbctsp-java/usr/share/java/bctsp.jar + #mv -i $(builddir)/bctsp-jdk14-*/docs debian/libbctsp-java/usr/share/doc/libbctsp-java/apidoc _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
