akurtakov pushed to bouncycastle-pg (master). "Update to 1.52. (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 22 10:38:25 UTC 2015
>From 25f2a4e847912b6a949f13a2263e1e39b2d32303 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed, 22 Apr 2015 13:38:14 +0300
Subject: Update to 1.52.
- Bump source/target to 1.6 as 1.5 is target for removal in Java 9
diff --git a/.gitignore b/.gitignore
index adc2f56..8c3b2e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
/bcpg-jdk15on-148.tar.gz
/bcpg-jdk15on-150.tar.gz
/bcpg-jdk15on-1.50.pom
+/bcpg-jdk15on-1.52.pom
+/bcpg-jdk15on-152.tar.gz
diff --git a/bouncycastle-pg-1.50-01-build.xml b/bouncycastle-pg-1.50-01-build.xml
deleted file mode 100644
index f6e9dcb..0000000
--- a/bouncycastle-pg-1.50-01-build.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- bcpg 1.50 by gil -->
-<!-- ====================================================================== -->
-
-<project name="build-bcpg" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Build environment properties -->
- <!-- ====================================================================== -->
-
-
- <property name="build.version" value="1.50"/>
- <property name="jar.name" value="bcpg"/>
- <property name="build.dir" value="build"/>
- <property name="build.classes" value="${build.dir}/classes"/>
- <property name="build.src" value="src/java"/>
- <property name="build.test.classes" value="${build.dir}/test-classes"/>
- <property name="build.test.src" value="src/test"/>
- <property name="test.reports" value="${build.dir}/test-reports"/>
- <property name="reporting.apis" value="${build.dir}/apidocs"/>
-
- <property name="j2se.api" value="http://java.sun.com/j2se/1.4.2/docs/api/"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath">
- <fileset dir="/usr/share/java">
- <include name="bcprov.jar"/>
- </fileset>
- </path>
- <path id="build.test.classpath">
- <path refid="build.classpath"/>
- <fileset dir="/usr/share/java">
- <include name="junit.jar"/>
- <include name="ant/ant-junit.jar"/>
- </fileset>
- </path>
- <path id="javadoc.classpath">
- <path refid="build.classpath"/>
- <fileset dir="${build.dir}" includes="${jar.name}.jar"/>
- </path>
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${build.dir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" description="Compile the code">
- <mkdir dir="${build.classes}"/>
- <javac destdir="${build.classes}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.5"
- verbose="false"
- fork="false"
- source="1.5">
- <src>
- <pathelement location="${build.src}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="test.skip">
- <mkdir dir="${build.test.classes}"/>
- <javac destdir="${build.test.classes}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.5"
- verbose="false"
- fork="false"
- source="1.5">
- <src>
- <pathelement location="${build.test.src}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${build.classes}"/>
- </classpath>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases">
- <mkdir dir="${test.reports}"/>
- <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
- <sysproperty key="basedir" value="."/>
- <formatter type="xml"/>
- <formatter type="plain" usefile="false"/>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.test.classes}"/>
- </classpath>
- <formatter type="brief" usefile="no"/>
- <batchtest haltonfailure="yes">
- <fileset dir="${build.test.src}">
- <include name="**/AllTests.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="test-junit-present">
- <available file="/usr/share/java/junit.jar" property="junit.present"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING ===================================</echo>
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${build.src}"
- packagenames="*"
- destdir="${reporting.apis}"
- access="protected"
- old="false"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- source="1.4"
- linksource="false"
- breakiterator="false">
- <classpath refid="javadoc.classpath"/>
- <doctitle><![CDATA[<h1>Bouncy Castle Cryptography Library ${build.version} API</h1>]]></doctitle>
- <link href="${j2se.api}"/>
- </javadoc>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <taskdef resource="aQute/bnd/ant/taskdef.properties" >
- <classpath>
- <fileset dir="/usr/share/java" includes="aqute-bnd.jar" />
- </classpath>
- </taskdef>
-
- <target name="package" depends="compile,test" description="Package the application">
- <bnd
- classpath="${build.classes}"
- failok="false"
- exceptions="false"
- files="bcpg.bnd"
- output="${build.dir}/${jar.name}.jar"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-</project>
diff --git a/bouncycastle-pg-1.50-OSGi.bnd b/bouncycastle-pg-1.50-OSGi.bnd
deleted file mode 100644
index 3caf8ec..0000000
--- a/bouncycastle-pg-1.50-OSGi.bnd
+++ /dev/null
@@ -1,51 +0,0 @@
-# BND/OSGI Properties by gil
-Manifest-Version: 1.0
-Import-Package: org.bouncycastle.asn1;version="1.50", \
- org.bouncycastle.asn1.nist;version="1.50", \
- org.bouncycastle.asn1.x509;version="1.50", \
- org.bouncycastle.asn1.x9;version="1.50", \
- org.bouncycastle.crypto;version="1.50", \
- org.bouncycastle.crypto.digests;version="1.50", \
- org.bouncycastle.crypto.encodings;version="1.50", \
- org.bouncycastle.crypto.engines;version="1.50", \
- org.bouncycastle.crypto.generators;version="1.50", \
- org.bouncycastle.crypto.io;version="1.50", \
- org.bouncycastle.crypto.modes;version="1.50", \
- org.bouncycastle.crypto.params;version="1.50", \
- org.bouncycastle.crypto.signers;version="1.50", \
- org.bouncycastle.jcajce;version="1.50", \
- org.bouncycastle.jce.interfaces;version="1.50", \
- org.bouncycastle.jce.provider;version="1.50", \
- org.bouncycastle.jce.spec;version="1.50", \
- org.bouncycastle.math.ec;version="1.50", \
- org.bouncycastle.util;version="1.50", \
- org.bouncycastle.util.encoders;version="1.50", \
- org.bouncycastle.util.io;version="1.50", \
- javax.crypto, \
- javax.crypto.spec
-Export-Package: org.bouncycastle.openpgp;version="1.50", \
- org.bouncycastle.openpgp.examples;version="1.50", \
- org.bouncycastle.openpgp;version="1.50", \
- org.bouncycastle.openpgp.operator;version="1.50", \
- org.bouncycastle.openpgp.operator.bc;version="1.50", \
- org.bouncycastle.openpgp.operator.jcajce;version="1.50", \
- org.bouncycastle.apache.bzip2;version="1.50", \
- org.bouncycastle.bcpg;version="1.50", \
- org.bouncycastle.bcpg.sig;version="1.50", \
- org.bouncycastle.bcpg.attr;version="1.50", \
-Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6, JavaSE-1.7
-Bundle-Version: 1.50
-Bundle-Name: bcpg
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: bcpg
-Extension-Name: org.bouncycastle.bcpg
-Application-Name: Bouncy Castle OpenPGP API
-Implementation-Vendor-Id: org.bouncycastle
-Implementation-Version: 1.50.0
-Implementation-Vendor: BouncyCastle.org
-Created-By: 1.5.0_08 (Sun Microsystems Inc.)
-Specification-Version: 1.1
-Specification-Vendor: BouncyCastle.org
-Trusted-Library: true
-Originally-Created-By: ${java.version} (${java.vendor})
-
diff --git a/bouncycastle-pg-1.52-01-build.xml b/bouncycastle-pg-1.52-01-build.xml
new file mode 100644
index 0000000..9271a42
--- /dev/null
+++ b/bouncycastle-pg-1.52-01-build.xml
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- bcpg 1.50 by gil -->
+<!-- ====================================================================== -->
+
+<project name="build-bcpg" default="package" basedir=".">
+
+ <!-- ====================================================================== -->
+ <!-- Build environment properties -->
+ <!-- ====================================================================== -->
+
+
+ <property name="build.version" value="1.52"/>
+ <property name="jar.name" value="bcpg"/>
+ <property name="build.dir" value="build"/>
+ <property name="build.classes" value="${build.dir}/classes"/>
+ <property name="build.src" value="src/java"/>
+ <property name="build.test.classes" value="${build.dir}/test-classes"/>
+ <property name="build.test.src" value="src/test"/>
+ <property name="test.reports" value="${build.dir}/test-reports"/>
+ <property name="reporting.apis" value="${build.dir}/apidocs"/>
+
+ <property name="j2se.api" value="https://docs.oracle.com/javase/8/docs/api/"/>
+
+ <!-- ====================================================================== -->
+ <!-- Defining classpaths -->
+ <!-- ====================================================================== -->
+
+ <path id="build.classpath">
+ <fileset dir="/usr/share/java">
+ <include name="bcprov.jar"/>
+ </fileset>
+ </path>
+ <path id="build.test.classpath">
+ <path refid="build.classpath"/>
+ <fileset dir="/usr/share/java">
+ <include name="junit.jar"/>
+ <include name="ant/ant-junit.jar"/>
+ </fileset>
+ </path>
+ <path id="javadoc.classpath">
+ <path refid="build.classpath"/>
+ <fileset dir="${build.dir}" includes="${jar.name}.jar"/>
+ </path>
+
+ <!-- ====================================================================== -->
+ <!-- Cleaning up target -->
+ <!-- ====================================================================== -->
+
+ <target name="clean" description="Clean the output directory">
+ <delete dir="${build.dir}"/>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Compilation target -->
+ <!-- ====================================================================== -->
+
+ <target name="compile" description="Compile the code">
+ <mkdir dir="${build.classes}"/>
+ <javac destdir="${build.classes}"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ target="1.6"
+ verbose="false"
+ fork="false"
+ source="1.6">
+ <src>
+ <pathelement location="${build.src}"/>
+ </src>
+ <classpath refid="build.classpath"/>
+ </javac>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Test-compilation target -->
+ <!-- ====================================================================== -->
+
+ <target name="compile-tests"
+ depends="compile"
+ description="Compile the test code"
+ unless="test.skip">
+ <mkdir dir="${build.test.classes}"/>
+ <javac destdir="${build.test.classes}"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ target="1.6"
+ verbose="false"
+ fork="false"
+ source="1.6">
+ <src>
+ <pathelement location="${build.test.src}"/>
+ </src>
+ <classpath>
+ <path refid="build.test.classpath"/>
+ <pathelement location="${build.classes}"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Run all tests -->
+ <!-- ====================================================================== -->
+
+ <target name="test"
+ depends="compile-tests, junit-missing"
+ unless="junit.skipped"
+ description="Run the test cases">
+ <mkdir dir="${test.reports}"/>
+ <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+ <sysproperty key="basedir" value="."/>
+ <formatter type="xml"/>
+ <formatter type="plain" usefile="false"/>
+ <classpath>
+ <path refid="build.test.classpath"/>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.test.classes}"/>
+ </classpath>
+ <formatter type="brief" usefile="no"/>
+ <batchtest haltonfailure="yes">
+ <fileset dir="${build.test.src}">
+ <include name="**/AllTests.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="test-junit-present">
+ <available file="/usr/share/java/junit.jar" property="junit.present"/>
+ </target>
+
+ <target name="test-junit-status"
+ depends="test-junit-present">
+ <condition property="junit.missing">
+ <and>
+ <isfalse value="${junit.present}"/>
+ <isfalse value="${test.skip}"/>
+ </and>
+ </condition>
+ <condition property="junit.skipped">
+ <or>
+ <isfalse value="${junit.present}"/>
+ <istrue value="${test.skip}"/>
+ </or>
+ </condition>
+ </target>
+
+ <target name="junit-missing"
+ depends="test-junit-status"
+ if="junit.missing">
+ <echo>=================================== WARNING ===================================</echo>
+ <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+ <echo>===============================================================================</echo>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Javadoc target -->
+ <!-- ====================================================================== -->
+
+ <target name="javadoc" description="Generates the Javadoc of the application">
+ <javadoc sourcepath="${build.src}"
+ packagenames="*"
+ destdir="${reporting.apis}"
+ access="protected"
+ verbose="false"
+ version="true"
+ use="true"
+ author="true"
+ splitindex="false"
+ nodeprecated="false"
+ nodeprecatedlist="false"
+ notree="false"
+ noindex="false"
+ nohelp="false"
+ nonavbar="false"
+ serialwarn="false"
+ charset="ISO-8859-1"
+ source="1.6"
+ linksource="false"
+ breakiterator="false">
+ <classpath refid="javadoc.classpath"/>
+ <doctitle><![CDATA[<h1>Bouncy Castle Cryptography Library ${build.version} API</h1>]]></doctitle>
+ <link href="${j2se.api}"/>
+ </javadoc>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Package target -->
+ <!-- ====================================================================== -->
+
+ <taskdef resource="aQute/bnd/ant/taskdef.properties" >
+ <classpath>
+ <fileset dir="/usr/share/java" includes="aqute-bnd.jar" />
+ </classpath>
+ </taskdef>
+
+ <target name="package" depends="compile,test" description="Package the application">
+ <bnd
+ classpath="${build.classes}"
+ failok="false"
+ exceptions="false"
+ files="bcpg.bnd"
+ output="${build.dir}/${jar.name}.jar"/>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- A dummy target for the package named after the type it creates -->
+ <!-- ====================================================================== -->
+
+ <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+</project>
diff --git a/bouncycastle-pg-1.52-OSGi.bnd b/bouncycastle-pg-1.52-OSGi.bnd
new file mode 100644
index 0000000..3730169
--- /dev/null
+++ b/bouncycastle-pg-1.52-OSGi.bnd
@@ -0,0 +1,55 @@
+# BND/OSGI Properties by gil
+Manifest-Version: 1.0
+Import-Package: org.bouncycastle.asn1;version="1.50", \
+ org.bouncycastle.asn1.nist;version="1.50", \
+ org.bouncycastle.asn1.x509;version="1.50", \
+ org.bouncycastle.asn1.x9;version="1.50", \
+ org.bouncycastle.crypto;version="1.50", \
+ org.bouncycastle.crypto.digests;version="1.50", \
+ org.bouncycastle.crypto.ec;version="1.50", \
+ org.bouncycastle.crypto.encodings;version="1.50", \
+ org.bouncycastle.crypto.encodings;version="1.50", \
+ org.bouncycastle.crypto.engines;version="1.50", \
+ org.bouncycastle.crypto.generators;version="1.50", \
+ org.bouncycastle.crypto.io;version="1.50", \
+ org.bouncycastle.crypto.modes;version="1.50", \
+ org.bouncycastle.crypto.params;version="1.50", \
+ org.bouncycastle.crypto.signers;version="1.50", \
+ org.bouncycastle.jcajce;version="1.50", \
+ org.bouncycastle.jcajce.util;version="1.50", \
+ org.bouncycastle.jce.interfaces;version="1.50", \
+ org.bouncycastle.jce.provider;version="1.50", \
+ org.bouncycastle.jce.spec;version="1.50", \
+ org.bouncycastle.math.ec;version="1.50", \
+ org.bouncycastle.util;version="1.50", \
+ org.bouncycastle.util.encoders;version="1.50", \
+ org.bouncycastle.util.io;version="1.50", \
+ javax.crypto, \
+ javax.crypto.spec
+Export-Package: org.bouncycastle.openpgp;version="1.50", \
+ org.bouncycastle.openpgp.examples;version="1.50", \
+ org.bouncycastle.openpgp;version="1.50", \
+ org.bouncycastle.openpgp.jcajce;version="1.50", \
+ org.bouncycastle.openpgp.operator;version="1.50", \
+ org.bouncycastle.openpgp.operator.bc;version="1.50", \
+ org.bouncycastle.openpgp.operator.jcajce;version="1.50", \
+ org.bouncycastle.apache.bzip2;version="1.50", \
+ org.bouncycastle.bcpg;version="1.50", \
+ org.bouncycastle.bcpg.sig;version="1.50", \
+ org.bouncycastle.bcpg.attr;version="1.50", \
+Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6, JavaSE-1.7
+Bundle-Version: 1.50
+Bundle-Name: bcpg
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: bcpg
+Extension-Name: org.bouncycastle.bcpg
+Application-Name: Bouncy Castle OpenPGP API
+Implementation-Vendor-Id: org.bouncycastle
+Implementation-Version: 1.50.0
+Implementation-Vendor: BouncyCastle.org
+Created-By: 1.5.0_08 (Sun Microsystems Inc.)
+Specification-Version: 1.1
+Specification-Vendor: BouncyCastle.org
+Trusted-Library: true
+Originally-Created-By: ${java.version} (${java.vendor})
+
diff --git a/bouncycastle-pg.spec b/bouncycastle-pg.spec
index 1933a66..d1f9c7a 100644
--- a/bouncycastle-pg.spec
+++ b/bouncycastle-pg.spec
@@ -1,9 +1,9 @@
-%global ver 150
+%global ver 152
%global archivever jdk15on-%(echo %{ver}|sed 's|\\\.||')
Name: bouncycastle-pg
-Version: 1.50
-Release: 6%{?dist}
+Version: 1.52
+Release: 1%{?dist}
Summary: Bouncy Castle OpenPGP API
# modified BZIP2 library org/bouncycastle/apache/bzip2 ASL 2.0
License: ASL 2.0 and MIT
@@ -100,6 +100,10 @@ install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-bcpg.pom
%license LICENSE.html
%changelog
+* Wed Apr 22 2015 Alexander Kurtakov <akurtako at redhat.com> 1.52-1
+- Update to 1.52.
+- Bump source/target to 1.6 as 1.5 is target for removal in Java 9
+
* Thu Jan 29 2015 gil cattaneo <puntogil at libero.it> 1.50-6
- install license file in main package
diff --git a/sources b/sources
index 53bc26b..8c911f0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5c31e02c90383bb6db8accddbebddf41 bcpg-jdk15on-150.tar.gz
-c6b54efad78b88c1743a470bdea7d914 bcpg-jdk15on-1.50.pom
+dac218085732c0dadd792450d6687a19 bcpg-jdk15on-1.52.pom
+e60bc6c02d6d3ac5d22cf0832f856af8 bcpg-jdk15on-152.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/bouncycastle-pg.git/commit/?h=master&id=25f2a4e847912b6a949f13a2263e1e39b2d32303
More information about the scm-commits
mailing list