[jenkins-instance-identity] Fix ClassCastException in bouncycastle patch
by Michal Srb
commit 87aa3494a57e0a545e6e0fd661071d0a0bbd51fc
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Mar 31 15:28:44 2014 +0200
Fix ClassCastException in bouncycastle patch
0001-Update-bouncycastle-to-1.50.patch | 25 +++++++++++++++----------
jenkins-instance-identity.spec | 5 ++++-
2 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/0001-Update-bouncycastle-to-1.50.patch b/0001-Update-bouncycastle-to-1.50.patch
index 00208d9..44a6291 100644
--- a/0001-Update-bouncycastle-to-1.50.patch
+++ b/0001-Update-bouncycastle-to-1.50.patch
@@ -1,12 +1,12 @@
-From ae05b90bb0e6aa55b68685de37f2405906558adf Mon Sep 17 00:00:00 2001
+From b778048a262d7bccbb3521c19c627b0d0b944fa5 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb(a)redhat.com>
Date: Tue, 25 Feb 2014 11:02:00 +0100
Subject: [PATCH] Update bouncycastle to 1.50
---
- pom.xml | 2 +-
- .../main/modules/instance_identity/InstanceIdentity.java | 10 +++-------
- 2 files changed, 4 insertions(+), 8 deletions(-)
+ pom.xml | 2 +-
+ .../main/modules/instance_identity/InstanceIdentity.java | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9aabe6f..0cc9e47 100644
@@ -22,19 +22,23 @@ index 9aabe6f..0cc9e47 100644
</dependencies>
</project>
diff --git a/src/main/java/org/jenkinsci/main/modules/instance_identity/InstanceIdentity.java b/src/main/java/org/jenkinsci/main/modules/instance_identity/InstanceIdentity.java
-index 4feedad..9632f30 100644
+index 4feedad..b3e534c 100644
--- a/src/main/java/org/jenkinsci/main/modules/instance_identity/InstanceIdentity.java
+++ b/src/main/java/org/jenkinsci/main/modules/instance_identity/InstanceIdentity.java
-@@ -3,7 +3,7 @@ package org.jenkinsci.main.modules.instance_identity;
+@@ -3,8 +3,11 @@ package org.jenkinsci.main.modules.instance_identity;
import hudson.FilePath;
import hudson.model.Hudson;
import hudson.model.PageDecorator;
-import org.bouncycastle.openssl.PEMReader;
++
++import org.bouncycastle.openssl.PEMKeyPair;
+import org.bouncycastle.openssl.PEMParser;
import org.bouncycastle.openssl.PEMWriter;
++import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
import java.io.File;
-@@ -40,11 +40,7 @@ public class InstanceIdentity {
+ import java.io.FileReader;
+@@ -40,11 +43,8 @@ public class InstanceIdentity {
if (keyFile.exists()) {
FileReader in = new FileReader(keyFile);
try {
@@ -43,11 +47,12 @@ index 4feedad..9632f30 100644
- // but it chokes that I passed in null. Urgh.
- final String provider = KeyPairGenerator.getInstance("RSA").getProvider().getName();
- keys = (KeyPair)new PEMReader(in,null,provider).readObject();
-+ keys = (KeyPair)new PEMParser(in).readObject();
++ PEMKeyPair kp = (PEMKeyPair) new PEMParser(in).readObject();
++ keys = new JcaPEMKeyConverter().getKeyPair(kp);
} finally {
in.close();
}
-@@ -53,7 +49,7 @@ public class InstanceIdentity {
+@@ -53,7 +53,7 @@ public class InstanceIdentity {
gen.initialize(2048,new SecureRandom()); // going beyond 2048 requires crypto extension
keys = gen.generateKeyPair();
@@ -57,5 +62,5 @@ index 4feedad..9632f30 100644
w.writeObject(keys);
} finally {
--
-1.8.5.3
+1.9.0
diff --git a/jenkins-instance-identity.spec b/jenkins-instance-identity.spec
index 54624a9..38f1ea5 100644
--- a/jenkins-instance-identity.spec
+++ b/jenkins-instance-identity.spec
@@ -3,7 +3,7 @@
Name: jenkins-instance-identity
Version: 1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Jenkins identity instance
License: MIT
@@ -54,6 +54,9 @@ This package contains the API documentation for %{name}.
%doc LICENSE.txt
%changelog
+* Mon Mar 31 2014 Michal Srb <msrb(a)redhat.com> - 1.3-2
+- Fix ClassCastException in bouncycastle patch
+
* Fri Nov 08 2013 Michal Srb <msrb(a)redhat.com> - 1.3-1
- Initial packaging
10 years, 1 month
[jenkins-xstream] Update to upstream version 1.4.7-jenkins1
by Michal Srb
commit 0bd811bd20c5f03fdc733255188b03916bd66fb0
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Mar 31 15:20:42 2014 +0200
Update to upstream version 1.4.7-jenkins1
.gitignore | 1 +
jenkins-xstream.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ece45e2..92d5120 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/1.4.4-jenkins-5.tar.gz
+/1.4.7-jenkins-1.tar.gz
diff --git a/jenkins-xstream.spec b/jenkins-xstream.spec
index 2d2a9c3..a9466ba 100644
--- a/jenkins-xstream.spec
+++ b/jenkins-xstream.spec
@@ -1,8 +1,8 @@
-%global patchlvl 5
+%global patchlvl 1
Name: jenkins-xstream
-Version: 1.4.4
-Release: 1.jenkins%{patchlvl}%{?dist}
+Version: 1.4.7
+Release: 2.jenkins%{patchlvl}%{?dist}
Summary: Jenkins XStream library
License: BSD
@@ -100,6 +100,9 @@ API documentation for %{name}.
%doc LICENSE.txt
%changelog
+* Mon Mar 31 2014 Michal Srb <msrb(a)redhat.com> - 1.4.7-2.jenkins1
+- Update to upstream version 1.4.7-jenkins1
+
* Fri Jan 24 2014 Michal Srb <msrb(a)redhat.com> - 1.4.4-1.jenkins5
- Initial packaging
diff --git a/sources b/sources
index adbe6f5..54203f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-103325ed7623d52f1ce1523bdb26cd06 1.4.4-jenkins-5.tar.gz
+02a36c4be09b5c3af9955ae26fbd099f 1.4.7-jenkins-1.tar.gz
10 years, 1 month
[datanucleus-api-jdo] fixup incorrect clog date
by Peter MacKinnon
commit 5714177c1da59cbb8dba19e22f6c4fa615c91ff6
Author: Peter MacKinnon <pmackinn(a)redhat.com>
Date: Mon Mar 31 09:14:53 2014 -0400
fixup incorrect clog date
datanucleus-api-jdo.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/datanucleus-api-jdo.spec b/datanucleus-api-jdo.spec
index 1519ac8..74f3c24 100644
--- a/datanucleus-api-jdo.spec
+++ b/datanucleus-api-jdo.spec
@@ -80,7 +80,7 @@ cp -p META-INF/README.txt .
%doc LICENSE.txt NOTICE.txt
%changelog
-* Fri Mar 31 2014 Peter MacKinnon <pmackinn(a)redhat.com> - 3.2.6-4
+* Mon Mar 31 2014 Peter MacKinnon <pmackinn(a)redhat.com> - 3.2.6-4
- removed wagon-ssh-external extension
* Fri Mar 28 2014 Michael Simacek <msimacek(a)redhat.com> - 3.2.6-3
10 years, 1 month
[datanucleus-api-jdo] removed wagon-ssh-external extension
by Peter MacKinnon
commit 29f5cd697a89a5b020a651ebb1cecf4efdec614d
Author: Peter MacKinnon <pmackinn(a)redhat.com>
Date: Mon Mar 31 09:11:30 2014 -0400
removed wagon-ssh-external extension
datanucleus-api-jdo.spec | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/datanucleus-api-jdo.spec b/datanucleus-api-jdo.spec
index 7067fb0..1519ac8 100644
--- a/datanucleus-api-jdo.spec
+++ b/datanucleus-api-jdo.spec
@@ -1,6 +1,6 @@
Name: datanucleus-api-jdo
Version: 3.2.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: DataNucleus JDO API plugin
License: ASL 2.0
URL: http://www.datanucleus.org
@@ -63,6 +63,8 @@ cp -p META-INF/LICENSE.txt .
cp -p META-INF/NOTICE.txt .
cp -p META-INF/README.txt .
+%pom_xpath_remove "pom:extension[pom:artifactId[text()='wagon-ssh-external']]"
+
%build
%mvn_file : %{name}
@@ -78,6 +80,9 @@ cp -p META-INF/README.txt .
%doc LICENSE.txt NOTICE.txt
%changelog
+* Fri Mar 31 2014 Peter MacKinnon <pmackinn(a)redhat.com> - 3.2.6-4
+- removed wagon-ssh-external extension
+
* Fri Mar 28 2014 Michael Simacek <msimacek(a)redhat.com> - 3.2.6-3
- Use Requires: java-headless rebuild (#1067528)
10 years, 1 month