From c00f473402498418528b0dbef743c664e406611b Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Sun, 26 Mar 2017 22:02:51 -0700
Subject: [PATCH] Update bouncy castle libraries for Gerrit 2.13

Gerrit 2.12 and 2.13 supports newer version of bouncy castle libs[1][2],
update to get matching libs.

[1] https://git.openstack.org/cgit/openstack-infra/gerrit/tree/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/libraries.config?h=upstream/stable-2.12
[2] https://git.openstack.org/cgit/openstack-infra/gerrit/tree/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/libraries.config?h=upstream/stable-2.13

Change-Id: I3eb367c23045021127e738d1ee7ab620465cca7d
---
 manifests/init.pp | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index caeeb54..c247135 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -903,7 +903,7 @@ class gerrit(
 
   # Gerrit 2.10 requires libs not available in ubuntu repositories
   # need to download them directly from maven central.
-  if versioncmp($gerrit_war_version, '2.10') > 0 {
+  if (versioncmp($gerrit_war_version, '2.10') > 0) and (versioncmp($gerrit_war_version, '2.12') < 0) {
     exec { 'download bcprov-jdk15on-1.51.jar':
       command => '/usr/bin/wget https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.51/bcprov-jdk15on-1.51.jar -O /home/gerrit2/review_site/lib/bcprov-1.51.jar',
       creates => '/home/gerrit2/review_site/lib/bcprov-1.51.jar',
@@ -916,6 +916,19 @@ class gerrit(
       before  => Exec['gerrit-start'],
       require => File['/home/gerrit2/review_site/lib'],
     }
+  } elsif (versioncmp($gerrit_war_version, '2.12') > 0) {
+    exec { 'download bcprov-jdk15on-1.52.jar':
+      command => '/usr/bin/wget https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.52/bcprov-jdk15on-1.52.jar -O /home/gerrit2/review_site/lib/bcprov-1.52.jar',
+      creates => '/home/gerrit2/review_site/lib/bcprov-1.52.jar',
+      before  => Exec['gerrit-start'],
+      require => File['/home/gerrit2/review_site/lib'],
+    }
+    exec { 'download bcpkix-jdk15on-1.52.jar':
+      command => '/usr/bin/wget https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.52/bcpkix-jdk15on-1.52.jar -O /home/gerrit2/review_site/lib/bcpkix-1.52.jar',
+      creates => '/home/gerrit2/review_site/lib/bcpkix-1.52.jar',
+      before  => Exec['gerrit-start'],
+      require => File['/home/gerrit2/review_site/lib'],
+    }
   } else {
     package { 'libbcprov-java':
       ensure => present,
@@ -950,13 +963,20 @@ class gerrit(
   # Install Bouncy Castle's OpenPGP plugin and populate the contact store
   # public key file if we're using that feature.
   if ($contactstore == true) {
-    if versioncmp($gerrit_war_version, '2.10') > 0 {
+    if (versioncmp($gerrit_war_version, '2.10') > 0) and (versioncmp($gerrit_war_version, '2.12') < 0) {
       exec { 'download bcpgjdk15on-1.51.jar':
         command => '/usr/bin/wget https://repo1.maven.org/maven2/org/bouncycastle/bcpg-jdk15on/1.51/bcpg-jdk15on-1.51.jar -O /home/gerrit2/review_site/lib/bcpg-1.51.jar',
         creates => '/home/gerrit2/review_site/lib/bcpg-1.51.jar',
         before  => Exec['gerrit-start'],
         require => File['/home/gerrit2/review_site/lib'],
       }
+    } elsif (versioncmp($gerrit_war_version, '2.12') > 0) {
+      exec { 'download bcpgjdk15on-1.52.jar':
+        command => '/usr/bin/wget https://repo1.maven.org/maven2/org/bouncycastle/bcpg-jdk15on/1.52/bcpg-jdk15on-1.52.jar -O /home/gerrit2/review_site/lib/bcpg-1.52.jar',
+        creates => '/home/gerrit2/review_site/lib/bcpg-1.52.jar',
+        before  => Exec['gerrit-start'],
+        require => File['/home/gerrit2/review_site/lib'],
+      }
     } else {
       package { 'libbcpg-java':
         ensure => present,