[jenkins] Update to upstream version 1.569
Michal Srb
msrb at fedoraproject.org
Fri Jun 27 11:34:14 UTC 2014
commit 78a91cdbfa32c1e7a4b79021d13efd3311cd35e3
Author: Michal Srb <msrb at redhat.com>
Date: Fri Jun 27 11:09:46 2014 +0200
Update to upstream version 1.569
fix-objectweb-asm-namespace.patch | 34 --------------------
jenkins.spec | 14 +++++---
remove-solaris-support-in-su.patch | 14 ++++----
...> remove-windows-support-from-processtree.patch | 32 +++++++++---------
4 files changed, 31 insertions(+), 63 deletions(-)
---
diff --git a/jenkins.spec b/jenkins.spec
index 8d1eb1b..c26ef0b 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -7,8 +7,8 @@
%global juid 175
Name: jenkins
-Version: 1.557
-Release: 14%{?dist}
+Version: 1.569
+Release: 1%{?dist}
Summary: An extendable open source continuous integration server
# The project's primary license is MIT
@@ -34,8 +34,6 @@ Source7: jenkins-conf.zip
Patch1: remove-animal-sniffer-annotations.patch
# remove support for Solaris for now (missing deps and unclear licensing)
Patch3: remove-support-for-solaris.patch
-# fix asm4 namespace
-Patch4: fix-objectweb-asm-namespace.patch
# we don't need support for Solaris in SU
Patch5: remove-solaris-support-in-su.patch
# jna-posix library is not in Fedora, we use jnr-posix
@@ -48,7 +46,7 @@ Patch10: use-args4j-2.0.25.patch
Patch12: use-guava-13.0.patch
# remove windows support (for now)
Patch13: remove-windows-support.patch
-Patch14: remove-windows-support-from-process-tree.patch
+Patch14: remove-windows-support-from-processtree.patch
Patch15: remove-dotnet-support.patch
Patch16: remove-windows-installer-support.patch
@@ -370,7 +368,6 @@ This package contains API documentation for %{name}.
%patch1 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch8 -p1
@@ -385,6 +382,8 @@ This package contains API documentation for %{name}.
find . -name "*.jar" -delete
find . -name "*.class" -delete
+sed -i 's|org.kohsuke.asm5|org.objectweb.asm|g' core/src/main/java/hudson/util/SubClassGenerator.java
+
# Don't add classpath entry to the manifest
%pom_xpath_remove pom:manifest/pom:addClasspath core
@@ -632,6 +631,9 @@ exit 0
%doc LICENSE.txt
%changelog
+* Thu Jun 26 2014 Michal Srb <msrb at redhat.com> - 1.569-1
+- Update to upstream version 1.569
+
* Mon Jun 23 2014 Michal Srb <msrb at redhat.com> - 1.557-14
- Fix FTBFS
diff --git a/remove-solaris-support-in-su.patch b/remove-solaris-support-in-su.patch
index c477111..b14f0b6 100644
--- a/remove-solaris-support-in-su.patch
+++ b/remove-solaris-support-in-su.patch
@@ -1,14 +1,14 @@
-From fb1561f9659d09969b65a2e7a3c8311db0551767 Mon Sep 17 00:00:00 2001
+From 407e85690bf9965cb544ae2b49f27e923449a718 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
-Date: Tue, 8 Oct 2013 12:59:51 +0200
-Subject: [PATCH] Remove solaris support
+Date: Fri, 27 Jun 2014 10:56:40 +0200
+Subject: [PATCH] remove solaris support from SU
---
core/src/main/java/hudson/os/SU.java | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/core/src/main/java/hudson/os/SU.java b/core/src/main/java/hudson/os/SU.java
-index b254f54..929e7eb 100644
+index 6a2b8ab..3a3fe9e 100644
--- a/core/src/main/java/hudson/os/SU.java
+++ b/core/src/main/java/hudson/os/SU.java
@@ -23,7 +23,6 @@
@@ -16,10 +16,10 @@ index b254f54..929e7eb 100644
package hudson.os;
-import com.sun.solaris.EmbeddedSu;
+ import hudson.FilePath;
import hudson.Launcher.LocalLauncher;
import hudson.Util;
- import hudson.model.Computer;
-@@ -94,21 +93,6 @@ public abstract class SU {
+@@ -96,21 +95,6 @@ public abstract class SU {
}
}.start(listener,rootPassword);
@@ -42,5 +42,5 @@ index b254f54..929e7eb 100644
// unsupported platform, take a chance
--
-1.8.3.1
+1.9.3
diff --git a/remove-windows-support-from-process-tree.patch b/remove-windows-support-from-processtree.patch
similarity index 86%
rename from remove-windows-support-from-process-tree.patch
rename to remove-windows-support-from-processtree.patch
index ce388ed..fe014dd 100644
--- a/remove-windows-support-from-process-tree.patch
+++ b/remove-windows-support-from-processtree.patch
@@ -1,18 +1,17 @@
-From 357a2ce1f2cc37f488296b9c63eb8b8a35c444ad Mon Sep 17 00:00:00 2001
+From bcca4c25791fc04eb6a6ed3173416ec9d5af98c7 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
-Date: Thu, 17 Oct 2013 13:23:21 +0200
-Subject: [PATCH 1/4] Remove Windows support from process tree
+Date: Thu, 26 Jun 2014 10:46:36 +0200
+Subject: [PATCH] remove windows support from processtree
-Missing jvnet.winp
---
- core/src/main/java/hudson/util/ProcessTree.java | 91 -------------------------
- 1 file changed, 91 deletions(-)
+ core/src/main/java/hudson/util/ProcessTree.java | 92 -------------------------
+ 1 file changed, 92 deletions(-)
diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
-index 2dd927d..a55dafa 100644
+index 94e034e..7d33344 100644
--- a/core/src/main/java/hudson/util/ProcessTree.java
+++ b/core/src/main/java/hudson/util/ProcessTree.java
-@@ -37,8 +37,6 @@ import hudson.util.ProcessTree.OSProcess;
+@@ -38,8 +38,6 @@ import hudson.util.ProcessTree.OSProcess;
import hudson.util.ProcessTreeRemoting.IOSProcess;
import hudson.util.ProcessTreeRemoting.IProcessTree;
import org.apache.commons.io.FileUtils;
@@ -21,7 +20,7 @@ index 2dd927d..a55dafa 100644
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
-@@ -332,9 +330,6 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
+@@ -333,9 +331,6 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
return DEFAULT;
try {
@@ -31,10 +30,11 @@ index 2dd927d..a55dafa 100644
String os = Util.fixNull(System.getProperty("os.name"));
if(os.equals("Linux"))
return new Linux();
-@@ -392,92 +387,6 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
+@@ -392,93 +387,6 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
+ }
};
-
+-
- private static final class Windows extends Local {
- Windows() {
- for (final WinProcess p : WinProcess.all()) {
@@ -71,15 +71,15 @@ index 2dd927d..a55dafa 100644
- public synchronized EnvVars getEnvironmentVariables() {
- if(env !=null)
- return env;
-- env = new EnvVars();
--
-- try
+- env = new EnvVars();
+-
+- try
- {
- env.putAll(p.getEnvironmentVariables());
- } catch (WinpException e)
- {
- LOGGER.log(FINE, "Failed to get environment variable ", e);
-- }
+- }
- return env;
- }
- });
@@ -125,5 +125,5 @@ index 2dd927d..a55dafa 100644
@Override
public OSProcess get(Process proc) {
--
-1.8.3.1
+1.9.3
More information about the scm-commits
mailing list