Author: ebourg-guest Date: 2013-05-16 22:14:22 +0000 (Thu, 16 May 2013) New Revision: 16679
Modified: trunk/bouncycastle/debian/changelog trunk/bouncycastle/debian/control trunk/bouncycastle/debian/patches/01_build.patch trunk/bouncycastle/debian/rules Log: Removed the dependency on the Activation Framework (libgnujaf-java) Enabled the hardening for the -gcj packages Upload to unstable Modified: trunk/bouncycastle/debian/changelog =================================================================== --- trunk/bouncycastle/debian/changelog 2013-05-16 19:51:44 UTC (rev 16678) +++ trunk/bouncycastle/debian/changelog 2013-05-16 22:14:22 UTC (rev 16679) @@ -1,3 +1,11 @@ +bouncycastle (1.48+dfsg-2) unstable; urgency=low + + * Removed the dependency on the Activation Framework (libgnujaf-java) + * Enabled the hardening for the -gcj packages + * Upload to unstable + + -- Emmanuel Bourg <[email protected]> Fri, 17 May 2013 00:10:32 +0200 + bouncycastle (1.48+dfsg-1) experimental; urgency=low * Team upload. Modified: trunk/bouncycastle/debian/control =================================================================== --- trunk/bouncycastle/debian/control 2013-05-16 19:51:44 UTC (rev 16678) +++ trunk/bouncycastle/debian/control 2013-05-16 22:14:22 UTC (rev 16679) @@ -30,7 +30,7 @@ Package: libbcmail-java Architecture: all -Depends: libgnumail-java, libgnujaf-java, ${misc:Depends} +Depends: libgnumail-java, ${misc:Depends} Suggests: libbcmail-java-doc,libbcmail-java-gcj Description: Bouncy Castle generators/processors for S/MIME and CMS The Bouncy Castle Crypto package is a Java implementation of @@ -93,7 +93,7 @@ Package: libbcmail-java-gcj Architecture: any -Depends: libbcmail-java (>= ${source:Version}), libgnumail-java, libgnujaf-java, ${misc:Depends}, ${shlibs:Depends} +Depends: libbcmail-java (>= ${source:Version}), libgnumail-java, ${misc:Depends}, ${shlibs:Depends} Description: Bouncy Castle generators/processors for S/MIME and CMS Native support for gij for the Bouncy Castle Crypto generators and processors for S/MIME and CMS (PKCS7/RFC 3852). Modified: trunk/bouncycastle/debian/patches/01_build.patch =================================================================== --- trunk/bouncycastle/debian/patches/01_build.patch 2013-05-16 19:51:44 UTC (rev 16678) +++ trunk/bouncycastle/debian/patches/01_build.patch 2013-05-16 22:14:22 UTC (rev 16679) @@ -29,7 +29,7 @@ --- a/build15+ +++ b/build15+ -@@ -8,10 +8,10 @@ +@@ -8,10 +8,9 @@ if [ "${JDKPATH}" = "" ] then @@ -39,21 +39,20 @@ - 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 fi JAVA_HOME=$JDKPATH -@@ -20,7 +20,7 @@ +@@ -20,7 +19,7 @@ PATH=$JDKPATH/bin:$PATH export PATH -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 ++CLASSPATH=$JAVA_MAIL_HOME/gnumail.jar:$JUNIT_HOME/junit.jar:$CLASSPATH export CLASSPATH if [ "$1" = "test" ] -@@ -30,7 +30,7 @@ +@@ -30,7 +29,7 @@ if ant -f jdk15+.xml build-provider then ant -f jdk15+.xml build Modified: trunk/bouncycastle/debian/rules =================================================================== --- trunk/bouncycastle/debian/rules 2013-05-16 19:51:44 UTC (rev 16678) +++ trunk/bouncycastle/debian/rules 2013-05-16 22:14:22 UTC (rev 16679) @@ -5,6 +5,12 @@ builddir = build/artifacts/jdk1.5 +# hardening +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +export AOT_GCJFLAGS=$(CFLAGS) +export AOT_LDFLAGS=$(LDFLAGS) + include /usr/share/gcj/debian_defaults #exclude sparc for now as there is a gcj bug which prevents its optimizations from compiling @@ -109,4 +115,4 @@ done ; get-orig-source: - -uscan --download-version `echo $(DEB_UPSTREAM_VERSION) |sed -e 's/\.//g;s/\+dfsg//'` --force-download --debug --rename + -uscan --download-version `echo $(DEB_UPSTREAM_VERSION) |sed -e 's/\.//g;s/\+dfsg//'` --force-download --rename _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
