This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository bouncycastle.
commit d981fa0c518b90c7363fb733964dacb2718de629 Author: Markus Koschany <[email protected]> Date: Sun Dec 6 00:05:10 2015 +0100 Merge bouncycastle 1.51 changes --- debian/changelog | 25 +++++++++++++++++++++ debian/control | 2 +- debian/libbcprov-java-doc.docs | 3 +-- debian/orig-tar.sh | 2 +- debian/patches/01_build.patch | 29 ------------------------ debian/patches/02_index.patch | 26 ++++++++++++++-------- debian/patches/fix-encoding.patch | 46 +++++++++++++++++++++++++++++++++++++++ debian/patches/series | 2 +- debian/poms/bcmail.pom | 14 +++++++----- debian/poms/bcpg.pom | 12 ++++++---- debian/poms/bcpkix.pom | 12 ++++++---- debian/poms/bcprov.pom | 12 ++++++---- debian/rules | 6 ++--- 13 files changed, 128 insertions(+), 63 deletions(-) diff --git a/debian/changelog b/debian/changelog index 575ceab..8ba4fea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +bouncycastle (1.51-2) unstable; urgency=medium + + * Team upload. + * Upload to unstable. (Closes: #799007) + * The new upstream release 1.51 fixes CVE-2015-7940. (Closes: #802671) + * Declare compliance with Debian Policy 3.9.6. + * Vcs-Browser: Use https. + * Add 03_fix-encoding.patch. + This prevents an error when creating javadoc which would otherwise lead to + empty -doc packages. Drop 01_build.patch because it is obsolete now. + Thanks to dean for the report and patch. (Closes: #798343) + + -- Markus Koschany <[email protected]> Sat, 05 Dec 2015 23:06:21 +0100 + bouncycastle (1.49+dfsg-3) unstable; urgency=medium * Replaced the dependency on libgnumail-java with libmail-java @@ -8,6 +22,17 @@ bouncycastle (1.49+dfsg-3) unstable; urgency=medium -- Emmanuel Bourg <[email protected]> Wed, 22 Oct 2014 13:41:01 +0200 +bouncycastle (1.51-1) experimental; urgency=medium + + * New upstream release + - Refreshed the patches + - Updated the Maven poms + * Standards-Version updated to 3.9.5 (no changes) + * Switch to debhelper level 9 + * Use XZ compression for the upstream tarball + + -- Emmanuel Bourg <[email protected]> Thu, 07 Aug 2014 14:07:58 +0200 + bouncycastle (1.49+dfsg-2) unstable; urgency=low * Upload to unstable diff --git a/debian/control b/debian/control index 953b78b..f269d3d 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: ant, maven-repo-helper Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/bouncycastle.git -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/bouncycastle.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/bouncycastle.git Homepage: http://www.bouncycastle.org Package: libbcprov-java diff --git a/debian/libbcprov-java-doc.docs b/debian/libbcprov-java-doc.docs index a9becde..4d313c9 100644 --- a/debian/libbcprov-java-doc.docs +++ b/debian/libbcprov-java-doc.docs @@ -1,4 +1,3 @@ CONTRIBUTORS.html index.html -releasenotes.html -specifications.html +docs/specifications.html diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 5b2f84d..4418fd5 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -3,7 +3,7 @@ # called by uscan with '--upstream-version' <version> <file> DEBIAN_VERSION=$(echo $2 | sed -e 's/^\(.\)/\1./') DIR=bouncycastle-$DEBIAN_VERSION.orig -TAR=../bouncycastle_$DEBIAN_VERSION+dfsg.orig.tar.xz +TAR=../bouncycastle_$DEBIAN_VERSION.orig.tar.xz # clean up the upstream tarball tar zxf $3 diff --git a/debian/patches/01_build.patch b/debian/patches/01_build.patch deleted file mode 100644 index 5ad1d02..0000000 --- a/debian/patches/01_build.patch +++ /dev/null @@ -1,29 +0,0 @@ -Description: Pass unicode flag to javac targets for proper compilation -Author: Brian Thomason <[email protected]> - ---- a/bc-build.xml -+++ b/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" /> -@@ -242,6 +244,7 @@ - srcdir="${lcrypto.target.src.dir}" - destdir="${lcrypto.target.classes.dir}" - debug="${release.debug}"> -+ <compilerarg line="-encoding utf-8"/> - </javac> - </target> - diff --git a/debian/patches/02_index.patch b/debian/patches/02_index.patch index 34a0894..19f54ae 100644 --- a/debian/patches/02_index.patch +++ b/debian/patches/02_index.patch @@ -1,13 +1,21 @@ -Description: Refer to documentation contained in doc package +From: Debian Java Maintainers <[email protected]> +Date: Sat, 5 Dec 2015 23:34:33 +0100 +Subject: _index ---- bouncycastle-1.46+dfsg.orig/index.html -+++ bouncycastle-1.46+dfsg/index.html -@@ -36,7 +36,7 @@ The current specifications for this pack - <a href=specifications.html>here</a>. +--- + index.html | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/index.html b/index.html +index 20afa7b..ea5e698 100644 +--- a/index.html ++++ b/index.html +@@ -41,7 +41,7 @@ + </p> <p> - The current api documentation for this package is --<a href=docs/index.html>here</a>. + The current JavaDoc for the Bouncy Castle APIs can be found +-<a href="javadoc/index.html">here</a>. +in the corresponding libbc*-java-doc Debian package. </p> - </p> - <h2>Examples and Tests</h2> + <p> + Additional documentation on use of the classes can also be found in the <a href="docs/index.html">docs</a> directory. diff --git a/debian/patches/fix-encoding.patch b/debian/patches/fix-encoding.patch new file mode 100644 index 0000000..692e0e6 --- /dev/null +++ b/debian/patches/fix-encoding.patch @@ -0,0 +1,46 @@ +From: Markus Koschany <[email protected]> +Date: Sat, 5 Dec 2015 23:43:32 +0100 +Subject: fix encoding + +Fix file encoding to prevent an error that would otherwise lead to empty doc +packages. + +Bug: https://bugs.debian.org/798343 +--- + ant/bc+-build.xml | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/ant/bc+-build.xml b/ant/bc+-build.xml +index 8b6778f..2f27885 100644 +--- a/ant/bc+-build.xml ++++ b/ant/bc+-build.xml +@@ -101,7 +101,8 @@ + <javac source="${bc.javac.source}" target="${bc.javac.target}" + srcdir="${artifacts.dir}/@{target}/src" + destdir="${build.dir}/@{target}/classes" +- debug="${release.debug}"> ++ debug="${release.debug}" ++ encoding="UTF-8"> + <classpath> + <path refid="project.classpath" /> + <fileset dir="${artifacts.jars.dir}"> +@@ -137,7 +138,8 @@ + <javac source="${bc.javac.source}" target="${bc.javac.target}" + srcdir="${artifacts.dir}/@{target}/src" + destdir="${build.dir}/@{target}/classes" +- debug="${release.debug}"> ++ debug="${release.debug}" ++ encoding="UTF-8"> + <classpath> + <path refid="project.classpath" /> + <fileset dir="${artifacts.jars.dir}"> +@@ -268,7 +270,8 @@ + <javac source="${bc.javac.source}" target="${bc.javac.target}" + srcdir="${lcrypto.target.src.dir}" + destdir="${lcrypto.target.classes.dir}" +- debug="${release.debug}"> ++ debug="${release.debug}" ++ encoding="UTF-8"> + </javac> + </target> + diff --git a/debian/patches/series b/debian/patches/series index b6fda65..d4ffed5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -01_build.patch 02_index.patch +fix-encoding.patch diff --git a/debian/poms/bcmail.pom b/debian/poms/bcmail.pom index b735bfe..a6fa541 100644 --- a/debian/poms/bcmail.pom +++ b/debian/poms/bcmail.pom @@ -5,8 +5,8 @@ <artifactId>bcmail-jdk15on</artifactId> <packaging>jar</packaging> <name>Bouncy Castle S/MIME API</name> - <version>1.49</version> - <description>The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. This jar contains S/MIME APIs for JDK 1.5 to JDK 1.7. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. The JavaMail API and the Java activation framework will also be needed.</description> + <version>1.51</version> + <description>The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. This jar contains S/MIME APIs for JDK 1.5 to JDK 1.8. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. The JavaMail API and the Java activation framework will also be needed.</description> <url>http://www.bouncycastle.org/java.html</url> <licenses> <license> @@ -16,8 +16,12 @@ </license> </licenses> <scm> - <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url> + <url>https://github.com/bcgit/bc-java</url> </scm> + <issueManagement> + <system>JIRA</system> + <url>http://www.bouncycastle.org/jira/secure/Dashboard.jspa</url> + </issueManagement> <developers> <developer> <id>feedback-crypto</id> @@ -29,13 +33,13 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>1.49</version> + <version>1.51</version> <type>jar</type> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> - <version>1.49</version> + <version>1.51</version> <type>jar</type> </dependency> </dependencies> diff --git a/debian/poms/bcpg.pom b/debian/poms/bcpg.pom index 788a712..a5cd150 100644 --- a/debian/poms/bcpg.pom +++ b/debian/poms/bcpg.pom @@ -5,8 +5,8 @@ <artifactId>bcpg-jdk15on</artifactId> <packaging>jar</packaging> <name>Bouncy Castle OpenPGP API</name> - <version>1.49</version> - <description>The Bouncy Castle Java API for handling the OpenPGP protocol. This jar contains the OpenPGP API for JDK 1.5 to JDK 1.7. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.</description> + <version>1.51</version> + <description>The Bouncy Castle Java API for handling the OpenPGP protocol. This jar contains the OpenPGP API for JDK 1.5 to JDK 1.8. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.</description> <url>http://www.bouncycastle.org/java.html</url> <licenses> <license> @@ -21,8 +21,12 @@ </license> </licenses> <scm> - <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url> + <url>https://github.com/bcgit/bc-java</url> </scm> + <issueManagement> + <system>JIRA</system> + <url>http://www.bouncycastle.org/jira/secure/Dashboard.jspa</url> + </issueManagement> <developers> <developer> <id>feedback-crypto</id> @@ -34,7 +38,7 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>1.49</version> + <version>1.51</version> <type>jar</type> </dependency> </dependencies> diff --git a/debian/poms/bcpkix.pom b/debian/poms/bcpkix.pom index 451842f..e3d1369 100644 --- a/debian/poms/bcpkix.pom +++ b/debian/poms/bcpkix.pom @@ -5,8 +5,8 @@ <artifactId>bcpkix-jdk15on</artifactId> <packaging>jar</packaging> <name>Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs</name> - <version>1.49</version> - <description>The Bouncy Castle Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation. This jar contains APIs for JDK 1.5 to JDK 1.7. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.</description> + <version>1.51</version> + <description>The Bouncy Castle Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation. This jar contains APIs for JDK 1.5 to JDK 1.8. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.</description> <url>http://www.bouncycastle.org/java.html</url> <licenses> <license> @@ -16,8 +16,12 @@ </license> </licenses> <scm> - <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url> + <url>https://github.com/bcgit/bc-java</url> </scm> + <issueManagement> + <system>JIRA</system> + <url>http://www.bouncycastle.org/jira/secure/Dashboard.jspa</url> + </issueManagement> <developers> <developer> <id>feedback-crypto</id> @@ -29,7 +33,7 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>1.49</version> + <version>1.51</version> <type>jar</type> </dependency> </dependencies> diff --git a/debian/poms/bcprov.pom b/debian/poms/bcprov.pom index 214c233..d2b076a 100644 --- a/debian/poms/bcprov.pom +++ b/debian/poms/bcprov.pom @@ -5,8 +5,8 @@ <artifactId>bcprov-jdk15on</artifactId> <packaging>jar</packaging> <name>Bouncy Castle Provider</name> - <version>1.49</version> - <description>The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.5 to JDK 1.7.</description> + <version>1.51</version> + <description>The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.5 to JDK 1.8.</description> <url>http://www.bouncycastle.org/java.html</url> <licenses> <license> @@ -16,12 +16,16 @@ </license> </licenses> <scm> - <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url> + <url>https://github.com/bcgit/bc-java</url> </scm> + <issueManagement> + <system>JIRA</system> + <url>http://www.bouncycastle.org/jira/secure/Dashboard.jspa</url> + </issueManagement> <developers> <developer> <id>feedback-crypto</id> - <name>The Legion of the Bouncy Castle</name> + <name>The Legion of the Bouncy Castle Inc.</name> <email>[email protected]</email> </developer> </developers> diff --git a/debian/rules b/debian/rules index ba09cb1..a122487 100755 --- a/debian/rules +++ b/debian/rules @@ -9,10 +9,10 @@ ARTIFACTS = bcprov bcpg bcmail bcpkix BUILD_DIR = build/artifacts/jdk1.5 JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := junit javax.mail -DEB_ANT_BUILDFILE := jdk15+.xml +DEB_JARS := junit gnumail +DEB_ANT_BUILDFILE := ant/jdk15+.xml DEB_ANT_BUILD_TARGET := build-provider build -DEB_INSTALL_CHANGELOGS_ALL := releasenotes.html +DEB_INSTALL_CHANGELOGS_ALL := docs/releasenotes.html clean:: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bouncycastle.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
