From 9bfd3c626192c6f24afc1cd8f4db412f2452a543c449c81fb68e33a44434519b Mon Sep 17 00:00:00 2001
From: Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
Date: Tue, 25 May 2021 11:51:48 +0000
Subject: [PATCH] Accepting request 895363 from
 home:pmonrealgonzalez:branches:Java:packages

- Add bouncycastle_getpoms.sh to get pom files from Maven repos

- Version update to 1.66 [bsc#1186328, CVE-2020-15522]

OBS-URL: https://build.opensuse.org/request/show/895363
OBS-URL: https://build.opensuse.org/package/show/Java:packages/bouncycastle?expand=0&rev=68
---
 bouncycastle.changes    |  7 ++++++-
 bouncycastle.spec       |  7 ++++---
 bouncycastle_getpoms.sh | 11 +++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 bouncycastle_getpoms.sh

diff --git a/bouncycastle.changes b/bouncycastle.changes
index 4bba54b..1fb7396 100644
--- a/bouncycastle.changes
+++ b/bouncycastle.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 25 11:39:46 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
+
+- Add bouncycastle_getpoms.sh to get pom files from Maven repos
+
 -------------------------------------------------------------------
 Wed Jan 13 09:44:54 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
@@ -88,7 +93,7 @@ Mon Dec 21 10:54:33 UTC 2020 - Pedro Monreal <pmonreal@suse.com>
 -------------------------------------------------------------------
 Tue Jul 28 18:50:39 UTC 2020 - Pedro Monreal <pmonreal@suse.com>
 
-- Version update to 1.66
+- Version update to 1.66 [bsc#1186328, CVE-2020-15522]
   * Defects Fixed:
     - EdDSA verifiers now reset correctly after rejecting overly long signatures.
     - BCJSSE: SSLSession.getPeerCertificateChain could throw NullPointerException.
diff --git a/bouncycastle.spec b/bouncycastle.spec
index b22a259..c90279e 100644
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@ -25,7 +25,7 @@ Name:           bouncycastle
 Version:        %{ver}
 Release:        0
 Summary:        Bouncy Castle Cryptography APIs for Java
-License:        MIT AND Apache-2.0
+License:        Apache-2.0 AND MIT
 Group:          Development/Libraries/Java
 URL:            https://www.bouncycastle.org
 Source0:        https://github.com/bcgit/bc-java/archive/%{gittag}.tar.gz
@@ -35,6 +35,7 @@ Source2:        https://repo1.maven.org/maven2/org/%{name}/bcpkix-jdk15on/%{vers
 Source3:        https://repo1.maven.org/maven2/org/%{name}/bcpg-jdk15on/%{version}/bcpg-jdk15on-%{version}.pom
 Source4:        https://repo1.maven.org/maven2/org/%{name}/bcmail-jdk15on/%{version}/bcmail-jdk15on-%{version}.pom
 Source5:        https://repo1.maven.org/maven2/org/%{name}/bctls-jdk15on/%{version}/bctls-jdk15on-%{version}.pom
+Source6:        bouncycastle_getpoms.sh
 Patch0:         bouncycastle-javadoc.patch
 Patch1:         bouncycastle-osgi.patch
 BuildRequires:  ant
@@ -43,7 +44,7 @@ BuildRequires:  fdupes
 BuildRequires:  javamail
 BuildRequires:  javapackages-local
 Requires(post): javapackages-tools
-Requires(postun): javapackages-tools
+Requires(postun):javapackages-tools
 Provides:       bcprov = %{version}-%{release}
 BuildArch:      noarch
 
@@ -66,7 +67,7 @@ provided with the Bouncy Castle Cryptography APIs.
 
 %package pg
 Summary:        Bouncy Castle OpenPGP API
-License:        MIT AND Apache-2.0
+License:        Apache-2.0 AND MIT
 Group:          Development/Libraries/Java
 Requires:       %{name} = %{version}
 
diff --git a/bouncycastle_getpoms.sh b/bouncycastle_getpoms.sh
new file mode 100644
index 0000000..2b928b5
--- /dev/null
+++ b/bouncycastle_getpoms.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [ -z "$1" ]
+then
+    echo "Usage: $0 <version>"
+    exit 1
+fi
+
+for b in bcprov bcpkix bcpg bcmail bctls ; do
+    wget https://repo1.maven.org/maven2/org/bouncycastle/${b}-jdk15on/${1}/${b}-jdk15on-${1}.pom
+done