[jenkins] 03/04: Refreshed the patches

Fri Oct 3 15:38:05 UTC 2014

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jenkins.

commit 49005851cdc03f6f16450968f0fc110bba188fdf
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 3 17:19:08 2014 +0200

    Refreshed the patches
---
 debian/changelog                                   |  6 ++++-
 debian/patches/0025-specify-plugins-versions.patch |  2 +-
 .../build/0005-apt-stapler-processing.patch        |  2 +-
 debian/patches/build/0007-remove-findbugs.patch    |  6 ++---
 debian/patches/build/0018-fileupload-compat.patch  | 31 ----------------------
 .../0008-windows-service-disable.patch             |  2 +-
 .../0009-filter-native-integrations.patch          |  2 +-
 debian/patches/series                              |  1 -
 8 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b932ae2..49bc73f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
-jenkins (1.565.2-4) UNRELEASED; urgency=medium
+jenkins (1.565.3-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Fixes multiple security vulnerabilities (Closes: #763899)
+    - Refreshed the patches
+    - Removed 0018-fileupload-compat.patch (applied upstream)
   * Fixed debian/orig-tar.sh
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 03 Oct 2014 17:12:41 +0200
diff --git a/debian/patches/0025-specify-plugins-versions.patch b/debian/patches/0025-specify-plugins-versions.patch
index 7c82028..df5aa22 100644
--- a/debian/patches/0025-specify-plugins-versions.patch
+++ b/debian/patches/0025-specify-plugins-versions.patch
@@ -14,7 +14,7 @@ Forwarded: not-needed
              <dependency>
 --- a/core/pom.xml
 +++ b/core/pom.xml
-@@ -700,7 +700,7 @@
+@@ -696,7 +696,7 @@
        <plugin>
          <groupId>org.kohsuke.stapler</groupId>
          <artifactId>maven-stapler-plugin</artifactId>
diff --git a/debian/patches/build/0005-apt-stapler-processing.patch b/debian/patches/build/0005-apt-stapler-processing.patch
index 771d29b..770ccad 100644
--- a/debian/patches/build/0005-apt-stapler-processing.patch
+++ b/debian/patches/build/0005-apt-stapler-processing.patch
@@ -8,7 +8,7 @@ Subject: apt-stapler-processing
 
 --- a/core/pom.xml
 +++ b/core/pom.xml
-@@ -658,6 +658,24 @@
+@@ -664,6 +664,24 @@
          </executions>
        </plugin>
        <plugin>
diff --git a/debian/patches/build/0007-remove-findbugs.patch b/debian/patches/build/0007-remove-findbugs.patch
index 0f823da..ce24172 100644
--- a/debian/patches/build/0007-remove-findbugs.patch
+++ b/debian/patches/build/0007-remove-findbugs.patch
@@ -141,7 +141,7 @@ Subject: remove-findbugs
                  return classOwnership.ownerOf(clazz);
 --- a/core/src/main/java/jenkins/model/Jenkins.java
 +++ b/core/src/main/java/jenkins/model/Jenkins.java
-@@ -743,10 +743,6 @@
+@@ -744,10 +744,6 @@
       * @param pluginManager
       *      If non-null, use existing plugin manager.  create a new one.
       */
@@ -152,7 +152,7 @@ Subject: remove-findbugs
      protected Jenkins(File root, ServletContext context, PluginManager pluginManager) throws IOException, InterruptedException, ReactorException {
          long start = System.currentTimeMillis();
          
-@@ -2680,7 +2676,6 @@
+@@ -2681,7 +2677,6 @@
      /**
       * Called to shut down the system.
       */
@@ -160,7 +160,7 @@ Subject: remove-findbugs
      public void cleanUp() {
          for (ItemListener l : ItemListener.all())
              l.onBeforeShutdown();
-@@ -3171,7 +3166,6 @@
+@@ -3172,7 +3167,6 @@
      /**
       * For debugging. Expose URL to perform GC.
       */
diff --git a/debian/patches/build/0018-fileupload-compat.patch b/debian/patches/build/0018-fileupload-compat.patch
deleted file mode 100644
index 6d7f52e..0000000
--- a/debian/patches/build/0018-fileupload-compat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Sun, 11 Aug 2013 10:41:39 +0100
-Subject: fileupload-compat
-
----
- core/src/main/java/hudson/model/FileParameterValue.java | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/core/src/main/java/hudson/model/FileParameterValue.java
-+++ b/core/src/main/java/hudson/model/FileParameterValue.java
-@@ -40,6 +40,7 @@
- 
- import org.apache.commons.fileupload.FileItem;
- import org.apache.commons.fileupload.disk.DiskFileItem;
-+import org.apache.commons.fileupload.FileItemHeaders;
- import org.apache.commons.io.FilenameUtils;
- import org.apache.commons.io.IOUtils;
- import org.apache.commons.lang.StringUtils;
-@@ -302,5 +303,12 @@
-         public OutputStream getOutputStream() throws IOException {
-             return new FileOutputStream(file);
-         }
-+
-+        public void setHeaders(FileItemHeaders headers) {
-+        }
-+
-+        public FileItemHeaders getHeaders() {
-+            return null;
-+        }
-     }
- }
diff --git a/debian/patches/native-integration/0008-windows-service-disable.patch b/debian/patches/native-integration/0008-windows-service-disable.patch
index 2d171bb..5b8d804 100644
--- a/debian/patches/native-integration/0008-windows-service-disable.patch
+++ b/debian/patches/native-integration/0008-windows-service-disable.patch
@@ -8,7 +8,7 @@ Subject: windows-service-disable
 
 --- a/core/pom.xml
 +++ b/core/pom.xml
-@@ -740,32 +740,6 @@
+@@ -746,32 +746,6 @@
          </executions>
        </plugin>
        <plugin>
diff --git a/debian/patches/native-integration/0009-filter-native-integrations.patch b/debian/patches/native-integration/0009-filter-native-integrations.patch
index a794e16..95913f0 100644
--- a/debian/patches/native-integration/0009-filter-native-integrations.patch
+++ b/debian/patches/native-integration/0009-filter-native-integrations.patch
@@ -8,7 +8,7 @@ Subject: filter-native-integrations
 
 --- a/core/pom.xml
 +++ b/core/pom.xml
-@@ -682,6 +682,17 @@
+@@ -688,6 +688,17 @@
          <configuration>
            <fork>${staplerFork}</fork><!-- the source code is big enough now that otherwise it fails with OutOfMemoryError -->
            <maxmem>128m</maxmem>
diff --git a/debian/patches/series b/debian/patches/series
index f8eec4c..1a410c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,7 +15,6 @@ ubuntu/0014-ubuntu-font.patch
 build/0015-use-stock-asm.patch
 build/0016-use-debian-jbcrypt.patch
 build/0017-ignore-plugin-pom.xml.patch
-build/0018-fileupload-compat.patch
 build/0019-io-compat.pach.patch
 0020-Drop-use-of-gitsite-extension.patch
 0021-Compatibility-patch-for-guava-0.14.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins.git

