[pkg-java] r16280 - in trunk/bouncycastle/debian: . patches

Sat Aug 18 11:08:16 UTC 2012

Author: drazzib
Date: 2012-08-18 11:08:15 +0000 (Sat, 18 Aug 2012)
New Revision: 16280

Modified:
   trunk/bouncycastle/debian/changelog
   trunk/bouncycastle/debian/patches/01_build.patch
   trunk/bouncycastle/debian/rules
Log:
* Now building for Java 1.5 rather than 1.6 (Closes: #678904)
* Compile using jdk16.xml rather than jdk14.xml as the latter exludes classes
* Pass unicode flag to javac targets as comments in the files prevent them from
  being compiled as ASCII
* Disabled optimizations on sparc (Closes: #652117)
* Disabled tests as they will fail as a known issue of the security certs
  having expired.  Upstream has been informed and should fix for the next
  upstream release. This should fix the building of bouncycastle on certain
  platforms that were previously failing.

Modified: trunk/bouncycastle/debian/changelog
===================================================================

--- trunk/bouncycastle/debian/changelog	2012-08-17 04:42:17 UTC (rev 16279)
+++ trunk/bouncycastle/debian/changelog	2012-08-18 11:08:15 UTC (rev 16280)
@@ -1,3 +1,32 @@
+bouncycastle (1.46+dfsg-6) unstable; urgency=low
+
+  * Now building for Java 1.5 rather than 1.6 (Closes: #678904)
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com>  Wed, 01 Aug 2012 16:32:19 +0000
+
+bouncycastle (1.46+dfsg-5) unstable; urgency=low
+
+  * Compile using jdk16.xml rather than jdk14.xml as the latter exludes classes
+  * Pass unicode flag to javac targets as comments in the files prevent them from
+    being compiled as ASCII
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com>  Tue, 22 May 2012 15:23:21 +0000
+
+bouncycastle (1.46+dfsg-4) unstable; urgency=low
+
+  * Disabled optimizations on sparc (Closes: #652117)
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com>  Tue, 03 Apr 2012 22:00:48 +0000
+
+bouncycastle (1.46+dfsg-3) unstable; urgency=low
+
+  * Disabled tests as they will fail as a known issue of the security certs
+    having expired.  Upstream has been informed and should fix for the next
+    upstream release. This should fix the building of bouncycastle on certain
+    platforms that were previously failing.
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com>  Mon, 12 Mar 2012 16:14:47 -0400
+
 bouncycastle (1.46+dfsg-2) unstable; urgency=low
 
   [ by sponsor Steffen Moeller ]

Modified: trunk/bouncycastle/debian/patches/01_build.patch
===================================================================
--- trunk/bouncycastle/debian/patches/01_build.patch	2012-08-17 04:42:17 UTC (rev 16279)
+++ trunk/bouncycastle/debian/patches/01_build.patch	2012-08-18 11:08:15 UTC (rev 16280)
@@ -1,34 +1,64 @@
-Description: Set JRE paths and replace mail.jar reference with gnumail.jar
+Description: Modify JAR paths and pass unicode flag to javac targets for proper compilation
+Author: Brian Thomason <brian.thomason at eucalyptus.com>
 
---- bouncycastle-1.46+dfsg.orig/build1-4
-+++ bouncycastle-1.46+dfsg/build1-4
-@@ -6,9 +6,9 @@
+--- bouncycastle-1.46+dfsg.orig/build1-5
++++ bouncycastle-1.46+dfsg/build1-5
+@@ -6,10 +6,10 @@
  # otherwise it just creates the docs and class files.
  #
  
--JDKPATH=/opt/jdk1.4.2
--JAVA_MAIL_HOME=/opt/javamail-1.3.1
--JAVA_ACTIVATION_HOME=/opt/jaf-1.0.2
+-JDKPATH=/opt/jdk1.5.0   # JDK 1.5 location
+-JAVA_MAIL_HOME=/opt/javamail
+-JAVA_ACTIVATION_HOME=/opt/jaf
+-JUNIT_HOME=/opt/junit
 +JDKPATH=/usr/lib/jvm/default-java
 +JAVA_MAIL_HOME=/usr/share/java
 +JAVA_ACTIVATION_HOME=/usr/share/java
++JUNIT_HOME=/usr/share/java
  
  JAVA_HOME=$JDKPATH
  export JAVA_HOME
-@@ -16,7 +16,7 @@ export JAVA_HOME
+@@ -17,7 +17,7 @@ export JAVA_HOME
  PATH=$JDKPATH/bin:$PATH
  export PATH
  
--CLASSPATH=$JAVA_MAIL_HOME/mail.jar:$JAVA_ACTIVATION_HOME/activation.jar:$CLASSPATH
-+CLASSPATH=$JAVA_MAIL_HOME/gnumail.jar:$JAVA_ACTIVATION_HOME/activation.jar:$CLASSPATH
+-CLASSPATH=$JAVA_MAIL_HOME/mail.jar:$JAVA_ACTIVATION_HOME/activation.jar:$JUNIT_HOME/junit.jar:$CLASSPATH
++CLASSPATH=$JAVA_MAIL_HOME/gnumail.jar:$JAVA_ACTIVATION_HOME/activation.jar:$JUNIT_HOME/junit.jar:$CLASSPATH
  export CLASSPATH
  
  if [ "$1" = "test" ]
-@@ -26,6 +26,6 @@ else
-     if ant -f jdk14.xml build-provider
+@@ -27,7 +27,7 @@ else
+     if ant -f jdk15.xml build-provider
      then
-         ant -f jdk14.xml build
--        ant -f jdk14.xml zip-src
-+        #ant -f jdk14.xml zip-src
+         ant -f jdk15.xml build
+-        ant -f jdk15.xml zip-src
++        #ant -f jdk15.xml zip-src
      fi
  fi
+ 
+--- bouncycastle-1.46+dfsg.orig/bc-build.xml
++++ bouncycastle-1.46+dfsg/bc-build.xml
+@@ -101,6 +101,7 @@
+                             <include name="**/*.jar" />
+                         </fileset>
+                     </classpath>
++                <compilerarg line="-encoding utf-8"/>
+                 </javac>
+                 <copy todir="${build.dir}/@{target}/classes">
+                      <fileset dir="${artifacts.dir}/@{target}/src" includes="**/*.properties" />
+@@ -131,6 +132,7 @@
+                     srcdir="${artifacts.dir}/@{target}/src"
+                     destdir="${build.dir}/@{target}/classes"
+                     debug="${release.debug}">
++                <compilerarg line="-encoding utf-8"/>
+                     <classpath>
+                         <fileset dir="${artifacts.jars.dir}">
+                             <include name="**/*.jar" />
+@@ -238,6 +240,7 @@
+             srcdir="${lcrypto.target.src.dir}"
+             destdir="${lcrypto.target.classes.dir}"
+             debug="${release.debug}">
++        <compilerarg line="-encoding utf-8"/>
+         </javac>
+     </target>
+ 

Modified: trunk/bouncycastle/debian/rules
===================================================================
--- trunk/bouncycastle/debian/rules	2012-08-17 04:42:17 UTC (rev 16279)
+++ trunk/bouncycastle/debian/rules	2012-08-18 11:08:15 UTC (rev 16280)
@@ -3,12 +3,15 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-builddir = build/artifacts/jdk1.4
+builddir = build/artifacts/jdk1.5
 
 include /usr/share/gcj/debian_defaults
 
+#exclude sparc for now as there is a gcj bug which prevents its optimizations from compiling
+export BUILD_NATIVE = $(filter-out sparc%, $(gcj_native_archs))
+
 DEB_HOST_ARCH ?= $(shell dpkg-architecture qDEB_HOST_ARCH)
-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+ifneq (,$(filter $(DEB_HOST_ARCH), $(BUILD_NATIVE)))
   with_native := yes
 endif
 
@@ -16,12 +19,12 @@
 
 common-build-indep:: stamp-build-indep
 stamp-build-indep:
-	sh -x ./build1-4
-	sh -x ./build1-4 test
+	sh -x ./build1-5
+	#sh -x ./build1-5 test
 	mkdir -p debian/build
 	set -e; \
 	for j in $(jars); do \
-	  install -m 644 $(builddir)/jars/$$j-jdk14-*.jar \
+	  install -m 644 $(builddir)/jars/$$j-jdk15-*.jar \
 	    debian/build/$$j.jar; \
 	done
 	touch stamp-build-indep
@@ -35,7 +38,7 @@
 # bcprov
 binary-install/libbcprov-java:: build/libbcprov-java
 	mh_installpoms -plibbcprov-java
-	mh_installjar -plibbcprov-java -l debian/poms/bcprov.pom $(builddir)/jars/bcprov-jdk14-*.jar
+	mh_installjar -plibbcprov-java -l debian/poms/bcprov.pom $(builddir)/jars/bcprov-jdk15-*.jar
 	ln -sf ../bcprov.jar debian/libbcprov-java/usr/share/java/gcj-endorsed/bcprov.jar
 	touch debian/libbcprov-java/etc/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
 binary-install/libbcprov-java-doc::
@@ -44,21 +47,21 @@
 # bcmail
 binary-install/libbcmail-java:: build/libbcmail-java
 	mh_installpoms -plibbcmail-java
-	mh_installjar -plibbcmail-java -l debian/poms/bcmail.pom $(builddir)/jars/bcmail-jdk14-*.jar
+	mh_installjar -plibbcmail-java -l debian/poms/bcmail.pom $(builddir)/jars/bcmail-jdk15-*.jar
 binary-install/libbcmail-java-doc::
 	mv -i $(builddir)/javadoc/bcmail debian/libbcmail-java-doc/usr/share/doc/libbcmail-java-doc/api
 
 # bcpg
 binary-install/libbcpg-java:: build/libbcpg-java
 	mh_installpoms -plibbcpg-java
-	mh_installjar -plibbcpg-java -l debian/poms/bcpg.pom $(builddir)/jars/bcpg-jdk14-*.jar
+	mh_installjar -plibbcpg-java -l debian/poms/bcpg.pom $(builddir)/jars/bcpg-jdk15-*.jar
 binary-install/libbcpg-java-doc::
 	mv -i $(builddir)/javadoc/bcpg debian/libbcpg-java-doc/usr/share/doc/libbcpg-java-doc/api
 
 # bctsp
 binary-install/libbctsp-java:: build/libbctsp-java
 	mh_installpoms -plibbctsp-java
-	mh_installjar -plibbctsp-java -l debian/poms/bctsp.pom $(builddir)/jars/bctsp-jdk14-*.jar
+	mh_installjar -plibbctsp-java -l debian/poms/bctsp.pom $(builddir)/jars/bctsp-jdk15-*.jar
 binary-install/libbctsp-java-doc::
 	mv -i $(builddir)/javadoc/bctsp debian/libbctsp-java-doc/usr/share/doc/libbctsp-java-doc/api
 
@@ -102,7 +105,7 @@
 	mkdir -p debian/poms
 	for pom in $(POMS); do \
 		wget -O debian/poms/$${pom}.pom -U NoAgent-1.0 \
-			http://repo1.maven.org/maven2/org/bouncycastle/$${pom}-jdk14/$(UPSTREAM_VERSION)/$${pom}-jdk14-$(UPSTREAM_VERSION).pom ; \
+			http://repo1.maven.org/maven2/org/bouncycastle/$${pom}-jdk55/$(UPSTREAM_VERSION)/$${pom}-jdk15-$(UPSTREAM_VERSION).pom ; \
 	done ;
 
 get-orig-source:


