Accepting request 526278 from Java:packages

Update to 1.58

OBS-URL: https://build.opensuse.org/request/show/526278
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bouncycastle?expand=0&rev=18
This commit is contained in:
Dominique Leuenberger 2017-09-18 17:50:32 +00:00 committed by Git OBS Bridge
commit 46cdd8e3da
6 changed files with 31 additions and 12 deletions

11
ambiguous-reseed.patch Normal file
View File

@ -0,0 +1,11 @@
--- bcprov-jdk15on-158/src/org/bouncycastle/jcajce/provider/drbg/DRBG.java 2017-09-15 09:12:43.611044610 +0200
+++ bcprov-jdk15on-158/src/org/bouncycastle/jcajce/provider/drbg/DRBG.java 2017-09-15 09:13:03.059044684 +0200
@@ -259,7 +259,7 @@
if (seedAvailable.getAndSet(false))
{
samples.set(0);
- drbg.reseed(null);
+ drbg.reseed((byte[])null);
}
}

View File

@ -5,7 +5,7 @@
<artifactId>bcprov-jdk15on</artifactId>
<packaging>jar</packaging>
<name>Bouncy Castle Provider</name>
<version>1.54</version>
<version>1.58</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>
@ -19,8 +19,8 @@
<url>https://github.com/bcgit/bc-java</url>
</scm>
<issueManagement>
<system>JIRA</system>
<url>http://www.bouncycastle.org/jira/secure/Dashboard.jspa</url>
<system>GitHub</system>
<url>https://github.com/bcgit/bc-java/issues</url>
</issueManagement>
<developers>
<developer>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6b8fb02c1bca77472459e81382152da87d96ba468f8dcb876211938910ad7146
size 6903567

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:76b8ea38902921c6c09b88236c9d348ff22381159fe70922d26f2f4a4d7af3c1
size 8635229

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Sep 15 07:25:45 UTC 2017 - fstrba@suse.com
- Version update to 1.58
- Added patch:
* ambiguous-reseed.patch
+ Upstream fix for an ambiguous overload
-------------------------------------------------------------------
Thu Sep 7 13:04:44 UTC 2017 - fstrba@suse.com

View File

@ -16,8 +16,8 @@
#
%define ver 1.54
%define shortver 154
%define ver 1.58
%define shortver 158
%define archivever jdk15on-%{shortver}
%define classname org.bouncycastle.jce.provider.BouncyCastleProvider
Name: bouncycastle
@ -29,7 +29,8 @@ Group: Development/Libraries/Java
Url: http://www.bouncycastle.org/
Source0: http://www.bouncycastle.org/download/bcprov-%{archivever}.tar.gz
Source1: http://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/%{ver}/bcprov-jdk15on-%{ver}.pom
BuildRequires: java-devel
Patch0: ambiguous-reseed.patch
BuildRequires: java-devel >= 1.6
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: junit
@ -38,7 +39,6 @@ BuildRequires: mozilla-nss
BuildRequires: unzip
Requires: java
Provides: bcprov = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@ -66,6 +66,8 @@ find . -type f -name "*.jar" -exec rm -f {} \;
mkdir src
unzip -qq src.zip -d src/
%patch0 -p1
%build
pushd src
export CLASSPATH=$(build-classpath junit)
@ -163,7 +165,6 @@ if [ $1 -eq 0 ] ; then
fi
%files
%defattr(0644,root,root,0755)
%doc *.html
%{_javadir}/bcprov.jar
%{_javadir}/bcprov-%{version}.jar
@ -173,7 +174,6 @@ fi
%{_datadir}/maven-metadata/%{name}.xml
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}/
%changelog