~ubuntu-branches/ubuntu/trusty/jenkins/trusty

« back to all changes in this revision

Viewing changes to debian/patches/build/0016-use-debian-jbcrypt.patch

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-08-13 12:35:19 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20130813123519-tizgfxcr70trl7r0
Tags: 1.509.2+dfsg-1
* New upstream release (Closes: #706725):
  - d/control: Update versioned BD's:
    * jenkins-executable-war >= 1.28.
    * jenkins-instance-identity >= 1.3.
    * libjenkins-remoting-java >= 2.23.
    * libjenkins-winstone-java >= 0.9.10-jenkins-44.
    * libstapler-java >= 1.207.
    * libjenkins-json-java >= 2.4-jenkins-1.
    * libstapler-adjunct-timeline-java >= 1.4.
    * libstapler-adjunct-codemirror-java >= 1.2.
    * libmaven-hpi-plugin-java >= 1.93.
    * libjenkins-xstream-java >= 1.4.4-jenkins-3.
  - d/maven.rules: Map to older version of animal-sniffer-maven-plugin.
  - Add patch for compatibility with guava >= 0.14.
  - Add patch to exclude asm4 dependency via jnr-posix.
  - Fixes the following security vulnerabilities:
    CVE-2013-2034, CVE-2013-2033, CVE-2013-2034, CVE-2013-1808
* d/patches/*: Switch to using git patch-queue for managing patches.
* De-duplicate jars between libjenkins-java and jenkins-external-job-monitor
  (Closes: #701163):
  - d/control: Add dependency between jenkins-external-job-monitor ->
    libjenkins-java.
  - d/rules: 
    Drop installation of jenkins-core in jenkins-external-job-monitor.
  - d/jenkins-external-job-monitor.{links,install}: Link to jenkins-core
    in /usr/share/java instead of included version.
* Wait longer for jenkins to stop during restarts (Closes: #704848):
  - d/jenkins.init: Re-sync init script from upstream codebase.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 
2
Date: Sun, 11 Aug 2013 10:41:39 +0100
 
3
Subject: use-debian-jbcrypt
 
4
 
 
5
---
 
6
 core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java | 2 +-
 
7
 1 file changed, 1 insertion(+), 1 deletion(-)
 
8
 
 
9
diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
 
10
index a656863..c68ae4d 100644
 
11
--- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
 
12
+++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
 
13
@@ -59,7 +59,7 @@ import org.kohsuke.stapler.HttpResponses;
 
14
 import org.kohsuke.stapler.Stapler;
 
15
 import org.kohsuke.stapler.StaplerRequest;
 
16
 import org.kohsuke.stapler.StaplerResponse;
 
17
-import org.mindrot.jbcrypt.BCrypt;
 
18
+import org.mindrot.BCrypt;
 
19
 import org.springframework.dao.DataAccessException;
 
20
 
 
21
 import javax.servlet.Filter;