LICENSE.txt

@@ -249,9 +249,9 @@ The complete text of the Eclipse Public License is as follows:
   Agreement more than one year after the cause of action arose. Each
   party waives its rights to a jury trial in any resulting litigation.
 
-The complete text of the Common Public License is as follows:
+The complete text of the Eclipse Public License is as follows:
 
-  Common Public License - v 1.0
+  Eclipse Public License - v 1.0
 
   THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON
   PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF

debian/changelog

+jnr-posix (3.0.45-1) unstable; urgency=medium
+
+  * New upstream release. (Closes: #900376)
+  * Update Uploaders list. (Closes: #889407)
+    Remove Damien Raude-Morvan since he is unactive these days.
+    Thanks for your work.
+  * Bump DH compat level to 11.
+  * Bump Standards-Version to 4.1.4. No changes were required.
+  * Migrate Vcs-* URLs to salsa.d.o.
+  * Update copyright info.
+  * Remove deprecated get-orig-source target from d/rules.
+
+ -- Miguel Landaeta <nomadium@debian.org>  Wed, 30 May 2018 19:51:48 +0100
+
 jnr-posix (3.0.42-1) unstable; urgency=medium
 
   * New upstream release.

debian/compat

-10
+11

debian/control

@@ -2,12 +2,11 @@ Source: jnr-posix
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib@debian.org>,
-           Jakub Adam <jakub.adam@ktknet.cz>,
+Uploaders: Jakub Adam <jakub.adam@ktknet.cz>,
            Tim Potter <tpot@hp.com>,
            Miguel Landaeta <nomadium@debian.org>
 Build-Depends: bnd (>= 2.1.0),
-               debhelper (>= 10~),
+               debhelper (>= 11~),
                default-jdk,
                javahelper,
                junit4,
@@ -18,10 +17,10 @@ Build-Depends: bnd (>= 2.1.0),
                libmaven-bundle-plugin-java,
                libmaven-javadoc-plugin-java,
                maven-debian-helper
-Standards-Version: 4.1.1
+Standards-Version: 4.1.4
 Homepage: https://github.com/jnr/jnr-posix
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jnr-posix.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jnr-posix.git
+Vcs-Git: https://salsa.debian.org/java-team/jnr-posix.git
+Vcs-Browser: https://salsa.debian.org/java-team/jnr-posix
 
 Package: libjnr-posix-java
 Architecture: all
@@ -40,6 +39,8 @@ Architecture: all
 Section: doc
 Depends: ${maven:DocDepends},
          ${misc:Depends}
+Recommends: libjs-jquery,
+            libjs-jquery-ui
 Suggests: libjnr-posix-java,
           ${maven:DocOptionalDepends}
 Description: Java JNR-POSIX library API documentation

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: jnr-posix
 Upstream-Contact: Charles O Nutter <headius@headius.com>
 Source: https://github.com/jnr/jnr-posix
@@ -10,7 +10,7 @@ License: EPL-1.0 or GPL-2.0 or LGPL-2.1
 Files: debian/*
 Copyright: 2009, 2011 Nicolas Duboc <nduboc@debian.org>
            2015 Tim Potter <tpot@hp.com>
-           2017 Miguel Landaeta <nomadium@debian.org>
+           2017-2018 Miguel Landaeta <nomadium@debian.org>
 License: Expat
 
 License: EPL-1.0

debian/libjnr-posix-java-doc.links

+usr/share/doc/libjnr-posix-java/api/jquery/jquery-ui.js                 usr/share/javascript/jquery-ui/jquery-ui.js
+usr/share/doc/libjnr-posix-java/api/jquery/jquery-ui.min.js             usr/share/javascript/jquery-ui/jquery-ui.min.js
+usr/share/doc/libjnr-posix-java/api/jquery/jquery-ui.structure.min.css  usr/share/javascript/jquery-ui/themes/base/jquery-ui.css
+usr/share/doc/libjnr-posix-java/api/jquery/jquery-ui.structure.css      usr/share/javascript/jquery-ui/themes/base/jquery-ui.css
+usr/share/doc/libjnr-posix-java/api/jquery/jquery-ui.min.css            usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.min.css
+usr/share/doc/libjnr-posix-java/api/jquery/external/jquery/jquery.js    usr/share/javascript/jquery/jquery.js
+usr/share/doc/libjnr-posix-java/api/jquery/jquery-ui.css                usr/share/javascript/jquery-ui/themes/base/jquery-ui.css
+usr/share/doc/libjnr-posix-java/api/jquery/jquery-1.10.2.js             usr/share/javascript/jquery/jquery.js

debian/rules

@@ -14,5 +14,6 @@ override_jh_manifest:
 	bnd wrap --properties debian/jnr-posix.bnd --output $(JAR).tmp $(JAR)
 	mv $(JAR).tmp $(JAR)
 
-get-orig-source:
-	uscan --verbose --download-current-version
+override_jh_installjavadoc:
+	jh_installjavadoc
+	-find debian/libjnr-posix-java-doc/usr/share/doc/libjnr-posix-java -type f -name '*jquery*' -delete

pom.xml

@@ -10,7 +10,7 @@
   <groupId>com.github.jnr</groupId>
   <artifactId>jnr-posix</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.42</version>
+  <version>3.0.45</version>
   <name>jnr-posix</name>
   <description>
     Common cross-project/cross-platform POSIX APIs
@@ -29,7 +29,7 @@
 
   <licenses>
     <license>
-      <name>Common Public License - v 1.0</name>
+      <name>Eclipse Public License - v 1.0</name>
       <url>http://www-128.ibm.com/developerworks/library/os-cpl.html</url>
       <distribution>repo</distribution>
     </license>
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-ffi</artifactId>
-      <version>2.1.7</version>
+      <version>2.1.8</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>

src/main/java/jnr/posix/AixFileStat.java

 /***** BEGIN LICENSE BLOCK *****
- * Version: CPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
- * The contents of this file are subject to the Common Public
- * License Version 1.0 (the "License"); you may not use this file
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/cpl-v10.html
  *

src/main/java/jnr/posix/AixLibC.java

 /***** BEGIN LICENSE BLOCK *****
- * Version: CPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
- * The contents of this file are subject to the Common Public
- * License Version 1.0 (the "License"); you may not use this file
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/cpl-v10.html
  *

src/main/java/jnr/posix/AixPOSIX.java

 /***** BEGIN LICENSE BLOCK *****
- * Version: CPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
- * The contents of this file are subject to the Common Public
- * License Version 1.0 (the "License"); you may not use this file
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/cpl-v10.html
  *

src/main/java/jnr/posix/AixPasswd.java

 /***** BEGIN LICENSE BLOCK *****
- * Version: CPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
- * The contents of this file are subject to the Common Public
- * License Version 1.0 (the "License"); you may not use this file
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/cpl-v10.html
  *

src/main/java/jnr/posix/BaseFileStat.java

 /***** BEGIN LICENSE BLOCK *****
- * Version: CPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
- * The contents of this file are subject to the Common Public
- * License Version 1.0 (the "License"); you may not use this file
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/cpl-v10.html
  *

src/main/java/jnr/posix/BaseNativePOSIX.java

@@ -385,15 +385,15 @@ public abstract class BaseNativePOSIX extends NativePOSIX implements POSIX {
     }
     
     public String readlink(String oldpath) throws IOException {
-        // TODO: this should not be hardcoded to 256 bytes
-        ByteBuffer buffer = ByteBuffer.allocate(256);
+        // TODO: this should not be hardcoded to 1024 bytes
+        ByteBuffer buffer = ByteBuffer.allocate(1024);
         int result = libc().readlink(oldpath, buffer, buffer.capacity());
         
         if (result == -1) return null;
         
         buffer.position(0);
         buffer.limit(result);
-        return Charset.forName("ASCII").decode(buffer).toString();
+        return Charset.defaultCharset().decode(buffer).toString();
     }
 
     public int readlink(CharSequence path, byte[] buf, int bufsize) {
@@ -450,6 +450,34 @@ public abstract class BaseNativePOSIX extends NativePOSIX implements POSIX {
         return libc().lutimes(path, times);
     }
 
+    public int utimensat(int dirfd, String path, long[] atimespec, long[] mtimespec, int flag) {
+        Timespec[] times = null;
+        if (atimespec != null && mtimespec != null) {
+            times = Struct.arrayOf(getRuntime(), DefaultNativeTimespec.class, 2);
+            times[0].setTime(atimespec);
+            times[1].setTime(mtimespec);
+        }
+        return libc().utimensat(dirfd, path, times, flag);
+    }
+
+    public int utimensat(int dirfd, String path, Pointer times, int flag) {
+        return libc().utimensat(dirfd, path, times, flag);
+    }
+
+    public int futimens(int fd, long[] atimespec, long[] mtimespec) {
+        Timespec[] times = null;
+        if (atimespec != null && mtimespec != null) {
+            times = Struct.arrayOf(getRuntime(), DefaultNativeTimespec.class, 2);
+            times[0].setTime(atimespec);
+            times[1].setTime(mtimespec);
+        }
+        return libc().futimens(fd, times);
+    }
+
+    public int futimens(int fd, Pointer times) {
+        return libc().futimens(fd, times);
+    }
+
     public int fork() {
         return libc().fork();
     }

src/main/java/jnr/posix/CheckedPOSIX.java

@@ -369,6 +369,24 @@ final class CheckedPOSIX implements POSIX {
         try { return posix.lutimes(path, atimeval, mtimeval); } catch (UnsatisfiedLinkError ule) { return unimplementedInt(); }
     }
 
+    public int utimensat(int dirfd, String path, long[] atimespec, long[] mtimespec, int flag) {
+        try { return posix.utimensat(dirfd, path, atimespec, mtimespec, flag); } catch (UnsatisfiedLinkError ule) {
+            return unimplementedInt(); }
+    }
+
+    public int utimensat(int dirfd, String path, Pointer times, int flag) {
+        try { return posix.utimensat(dirfd, path, times, flag); } catch (UnsatisfiedLinkError ule) { return unimplementedInt(); }
+    }
+
+    public int futimens(int fd, long[] atimespec, long[] mtimespec) {
+        try { return posix.futimens(fd, atimespec, mtimespec); } catch (UnsatisfiedLinkError ule) {
+            return unimplementedInt(); }
+    }
+
+    public int futimens(int fd, Pointer times) {
+        try { return posix.futimens(fd, times); } catch (UnsatisfiedLinkError ule) { return unimplementedInt(); }
+    }
+
     public int wait(int[] status) {
         try { return posix.wait(status); } catch (UnsatisfiedLinkError ule) { return unimplementedInt(); }
     }

src/main/java/jnr/posix/DefaultNativeGroup.java

 /***** BEGIN LICENSE BLOCK *****
- * Version: CPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
- * The contents of this file are subject to the Common Public
- * License Version 1.0 (the "License"); you may not use this file
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/cpl-v10.html
  *

src/main/java/jnr/posix/DefaultNativeTimespec.java

+package jnr.posix;
+
+public final class DefaultNativeTimespec extends Timespec {
+    public final SignedLong tv_sec = new SignedLong();
+    public final SignedLong tv_nsec = new SignedLong();
+
+    public DefaultNativeTimespec(jnr.ffi.Runtime runtime) {
+        super(runtime);
+    }
+
+    public void setTime(long[] timespec) {
+        assert timespec.length == 2;
+        tv_sec.set(timespec[0]);
+        tv_nsec.set(timespec[1]);
+    }
+
+    public void sec(long sec) {
+        this.tv_sec.set(sec);
+    }
+
+    public void nsec(long usec) {
+        this.tv_nsec.set(usec);
+    }
+
+    public long sec() {
+        return tv_sec.get();
+    }
+
+    public long nsec() {
+        return tv_nsec.get();
+    }
+}

src/main/java/jnr/posix/FreeBSDFileStat.java

 /***** BEGIN LICENSE BLOCK *****
- * Version: CPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
- * The contents of this file are subject to the Common Public
- * License Version 1.0 (the "License"); you may not use this file
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/cpl-v10.html
  *

src/main/java/jnr/posix/FreeBSDPOSIX.java

 /***** BEGIN LICENSE BLOCK *****
- * Version: CPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
- * The contents of this file are subject to the Common Public
- * License Version 1.0 (the "License"); you may not use this file
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/cpl-v10.html
  *

src/main/java/jnr/posix/FreeBSDPasswd.java

 /***** BEGIN LICENSE BLOCK *****
- * Version: CPL 1.0/GPL 2.0/LGPL 2.1
+ * Version: EPL 2.0/GPL 2.0/LGPL 2.1
  *
- * The contents of this file are subject to the Common Public
- * License Version 1.0 (the "License"); you may not use this file
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
  * the License at http://www.eclipse.org/legal/cpl-v10.html
  *