msrb pushed to jenkins (f22). "Update to upstream release 1.606 (..more)"

[notifications at fedoraproject.org]

>From 6c1c31f76995d69999179cad88663455be8e2cb5 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Thu, 26 Mar 2015 07:59:52 +0100
Subject: Update to upstream release 1.606

- Resolves: CVE-2015-1806
- Resolves: CVE-2015-1807
- Resolves: CVE-2015-1813
- Resolves: CVE-2015-1812
- Resolves: CVE-2015-1810
- Resolves: CVE-2015-1808
- Resolves: CVE-2015-1809
- Resolves: CVE-2015-1814
- Resolves: CVE-2015-1811

diff --git a/jenkins.spec b/jenkins.spec
index 6809ad0..8467a20 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -10,8 +10,8 @@
 %global juid    175
 
 Name:           jenkins
-Version:        1.598
-Release:        9%{?dist}
+Version:        1.606
+Release:        1%{?dist}
 Summary:        An extendable open source continuous integration server
 
 # The project's primary license is MIT
@@ -39,8 +39,6 @@ Patch1:         remove-animal-sniffer-annotations.patch
 Patch3:         remove-solaris-support-in-su.patch
 # jna-posix library is not in Fedora, we use jnr-posix
 Patch4:         drop-jna-posix-compatibility.patch
-# newer args4j
-Patch6:         use-args4j-2.0.25.patch
 # build against newer guava
 Patch7:         use-guava-13.0.patch
 Patch9:         remove-windows-support-from-processtree.patch
@@ -350,12 +348,11 @@ This package contains API documentation for %{name}.
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
-%patch6 -p1
 %patch7 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch13 -p1 -F1
+%patch13 -p1 -F2
 %patch14 -p1
 
 # Remove bundled JARs and classes
@@ -712,6 +709,18 @@ exit 0
 %doc LICENSE.txt
 
 %changelog
+* Thu Mar 26 2015 Michal Srb <msrb at redhat.com> - 1.606-1
+- Update to upstream release 1.606
+- Resolves: CVE-2015-1806
+- Resolves: CVE-2015-1807
+- Resolves: CVE-2015-1813
+- Resolves: CVE-2015-1812
+- Resolves: CVE-2015-1810
+- Resolves: CVE-2015-1808
+- Resolves: CVE-2015-1809
+- Resolves: CVE-2015-1814
+- Resolves: CVE-2015-1811
+
 * Fri Mar 13 2015 Michal Srb <msrb at redhat.com> - 1.598-9
 - Add BR: springframework-instrument
 
diff --git a/use-args4j-2.0.25.patch b/use-args4j-2.0.25.patch
deleted file mode 100644
index 047266e..0000000
--- a/use-args4j-2.0.25.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 5bd9209743cf2b67570c087abd70c3c7a76f22e1 Mon Sep 17 00:00:00 2001
-From: Michal Srb <msrb at redhat.com>
-Date: Fri, 8 Nov 2013 09:43:04 +0100
-Subject: [PATCH] Port to args4j 2.0.25
-
----
- .../main/java/hudson/cli/declarative/MethodBinder.java    | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/core/src/main/java/hudson/cli/declarative/MethodBinder.java b/core/src/main/java/hudson/cli/declarative/MethodBinder.java
-index 6b13772..d01165c 100644
---- a/core/src/main/java/hudson/cli/declarative/MethodBinder.java
-+++ b/core/src/main/java/hudson/cli/declarative/MethodBinder.java
-@@ -26,14 +26,17 @@ package hudson.cli.declarative;
- import hudson.cli.CLICommand;
- import hudson.util.ReflectionUtils;
- import hudson.util.ReflectionUtils.Parameter;
-+
- import org.kohsuke.args4j.Argument;
- import org.kohsuke.args4j.CmdLineException;
- import org.kohsuke.args4j.CmdLineParser;
- import org.kohsuke.args4j.Option;
-+import org.kohsuke.args4j.spi.FieldSetter;
- import org.kohsuke.args4j.spi.Setter;
- import org.kohsuke.args4j.spi.OptionHandler;
- 
- import java.lang.annotation.Annotation;
-+import java.lang.reflect.AnnotatedElement;
- import java.lang.reflect.InvocationTargetException;
- import java.lang.reflect.Method;
- import java.util.List;
-@@ -79,6 +82,14 @@ class MethodBinder {
-                 public boolean isMultiValued() {
-                     return false;
-                 }
-+
-+                public AnnotatedElement asAnnotatedElement() {
-+                    return null;
-+                }
-+
-+                public FieldSetter asFieldSetter() {
-+                    return null;
-+                }
-             };
-             Option option = p.annotation(Option.class);
-             if (option!=null) {
-@@ -133,6 +144,10 @@ class MethodBinder {
-             return base.required();
-         }
- 
-+        public boolean hidden() {
-+            return false;
-+        }
-+
-         public Class<? extends OptionHandler> handler() {
-             return base.handler();
-         }
--- 
-1.8.3.1
-
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/jenkins.git/commit/?h=f22&id=6c1c31f76995d69999179cad88663455be8e2cb5