← Back to branch summary

~ubuntu-branches/ubuntu/saucy/jenkins/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/dependency-upgrades/jnr-posix-upgrade.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
http://bugs.debian.org/706725
http://bugs.debian.org/701163
http://bugs.debian.org/704848
* 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:
debian/patches/dependency-upgrades/jnr-posix-upgrade.patch
1
 
Description: Transitional patch from jna-posix to jnr-posix as
2
 
 currently packaged in Debian and Ubuntu.
3
 
Author: James Page <james.page@ubuntu.com>
4
 
Forwarded: not-needed
5
 
 
6
 
--- a/core/src/main/java/hudson/os/PosixAPI.java
7
 
+++ b/core/src/main/java/hudson/os/PosixAPI.java
8
 
@@ -1,10 +1,9 @@
9
 
 package hudson.os;
10
 
 
11
 
-import org.jruby.ext.posix.JavaPOSIX;
12
 
 import org.jruby.ext.posix.POSIX;
13
 
 import org.jruby.ext.posix.POSIXFactory;
14
 
 import org.jruby.ext.posix.POSIXHandler;
15
 
-import org.jruby.ext.posix.POSIX.ERRORS;
16
 
+import com.kenai.constantine.platform.Errno;
17
 
 
18
 
 import java.io.File;
19
 
 import java.io.InputStream;
20
 
@@ -35,11 +34,11 @@ public class PosixAPI {
21
 
      * used a fallback java implementation which does not support many operations.
22
 
      */
23
 
     public static boolean supportsNative() {
24
 
-        return !(posix instanceof JavaPOSIX);
25
 
+        return posix.isNative();
26
 
     }
27
 
     
28
 
     private static final POSIX posix = POSIXFactory.getPOSIX(new POSIXHandler() {
29
 
-        public void error(ERRORS errors, String s) {
30
 
+        public void error(Errno errors, String s) {
31
 
             throw new PosixException(s,errors);
32
 
         }
33
 
 
34
 
--- a/core/src/main/java/hudson/os/PosixException.java
35
 
+++ b/core/src/main/java/hudson/os/PosixException.java
36
 
@@ -1,6 +1,6 @@
37
 
 package hudson.os;
38
 
 
39
 
-import org.jruby.ext.posix.POSIX.ERRORS;
40
 
+import com.kenai.constantine.platform.Errno;
41
 
 
42
 
 /**
43
 
  * Indicates an error during POSIX API call.
44
 
@@ -8,14 +8,14 @@ import org.jruby.ext.posix.POSIX.ERRORS;
45
 
  * @author Kohsuke Kawaguchi
46
 
  */
47
 
 public class PosixException extends RuntimeException {
48
 
-    private final ERRORS errors;
49
 
+    private final Errno errors;
50
 
 
51
 
-    public PosixException(String message, ERRORS errors) {
52
 
+    public PosixException(String message, Errno errors) {
53
 
         super(message);
54
 
         this.errors = errors;
55
 
     }
56
 
 
57
 
-    public ERRORS getErrorCode() {
58
 
+    public Errno getErrorCode() {
59
 
         return errors;
60
 
     }
61
 
 
62
 
--- a/core/pom.xml
63
 
+++ b/core/pom.xml
64
 
@@ -118,6 +118,11 @@ THE SOFTWARE.
65
 
       <version>1.0.3</version>
66
 
     </dependency>
67
 
     <dependency>
68
 
+      <groupId>org.jruby.extras</groupId>
69
 
+      <artifactId>jffi</artifactId>
70
 
+      <version>0.6.5</version>
71
 
+    </dependency>
72
 
+    <dependency>
73
 
       <groupId>org.kohsuke</groupId>
74
 
       <artifactId>trilead-putty-extension</artifactId>
75
 
       <version>1.2</version>