[Git][java-team/jsch-agent-proxy][master] 11 commits: Wrap and sort
Emmanuel Bourg
gitlab at salsa.debian.org
Tue Jan 26 17:15:18 GMT 2021
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jsch-agent-proxy
Commits:
8f73db96 by Emmanuel Bourg at 2021-01-26T17:19:55+01:00
Wrap and sort
- - - - -
58b7922e by Emmanuel Bourg at 2021-01-26T17:20:20+01:00
Standards-Version updated to 4.5.1
- - - - -
47184782 by Emmanuel Bourg at 2021-01-26T17:20:25+01:00
Switch to debhelper level 13
- - - - -
dbdc65a7 by Emmanuel Bourg at 2021-01-26T17:21:29+01:00
Use salsa.debian.org Vcs-* URLs
- - - - -
7e7de728 by Emmanuel Bourg at 2021-01-26T17:27:31+01:00
Build with the DH sequencer instead of CDBS
- - - - -
a4408044 by Emmanuel Bourg at 2021-01-26T18:09:23+01:00
New upstream version 0.0.9
- - - - -
cc00d7f8 by Emmanuel Bourg at 2021-01-26T18:09:23+01:00
Update upstream source from tag 'upstream/0.0.9'
Update to upstream version '0.0.9'
with Debian dir 438fe5103d8bfebcfa58aff82f395391447d7175
- - - - -
911d7414 by Emmanuel Bourg at 2021-01-26T18:10:24+01:00
Refreshed the patches
- - - - -
b0760b33 by Emmanuel Bourg at 2021-01-26T18:11:20+01:00
Removed the Maven 2 compatibility patch
- - - - -
189c772b by Emmanuel Bourg at 2021-01-26T18:14:13+01:00
Update the watch file version
- - - - -
0f847035 by Emmanuel Bourg at 2021-01-26T18:15:02+01:00
Upload to unstable
- - - - -
21 changed files:
- debian/changelog
- − debian/compat
- debian/control
- − debian/patches/01-remove-maven3-prerequisite.patch
- debian/patches/series
- debian/rules
- debian/watch
- examples/pom.xml
- jsch-agent-proxy-connector-factory/pom.xml
- jsch-agent-proxy-connector-factory/src/main/java/com/jcraft/jsch/agentproxy/ConnectorFactory.java
- jsch-agent-proxy-core/pom.xml
- jsch-agent-proxy-jsch/pom.xml
- jsch-agent-proxy-pageant/pom.xml
- jsch-agent-proxy-sshagent/pom.xml
- jsch-agent-proxy-sshagent/src/main/java/com/jcraft/jsch/agentproxy/connector/SSHAgentConnector.java
- jsch-agent-proxy-sshj/pom.xml
- jsch-agent-proxy-svnkit-trilead-ssh2/pom.xml
- jsch-agent-proxy-usocket-jna/pom.xml
- jsch-agent-proxy-usocket-junixsocket/pom.xml
- jsch-agent-proxy-usocket-nc/pom.xml
- pom.xml
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+jsch-agent-proxy (0.0.9-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #905546)
+ * Removed the Maven 2 compatibility patch
+ * Build with the DH sequencer instead of CDBS
+ * Standards-Version updated to 4.5.1
+ * Switch to debhelper level 13
+ * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 26 Jan 2021 18:14:25 +0100
+
jsch-agent-proxy (0.0.8-2) unstable; urgency=medium
* Moved libjna-platform-java to the required dependencies.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9
=====================================
debian/control
=====================================
@@ -3,16 +3,21 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.5), libjna-platform-java
-Build-Depends-Indep: libmaven-bundle-plugin-java, libjsch-java
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/jsch-agent-proxy.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/jsch-agent-proxy.git
+Build-Depends:
+ debhelper-compat (= 13),
+ default-jdk,
+ libjna-platform-java,
+ libjsch-java,
+ libmaven-bundle-plugin-java,
+ maven-debian-helper (>= 1.5)
+Standards-Version: 4.5.1
+Vcs-Git: https://salsa.debian.org/java-team/jsch-agent-proxy.git
+Vcs-Browser: https://salsa.debian.org/java-team/jsch-agent-proxy
Homepage: http://www.jcraft.com/jsch-agent-proxy/
Package: libjsch-agent-proxy-java
Architecture: all
-Depends: ${misc:Depends}, libjsch-java, libjna-platform-java
+Depends: libjna-platform-java, libjsch-java, ${misc:Depends}
Description: Proxy to ssh-agent and Pageant in Java
jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent and Pageant included
in Putty. It can be easily integrated into JSch, and users can use those
=====================================
debian/patches/01-remove-maven3-prerequisite.patch deleted
=====================================
@@ -1,16 +0,0 @@
-Description: Removes the prerequisite on Maven 3
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -3,10 +3,6 @@
-
- <modelVersion>4.0.0</modelVersion>
-
-- <prerequisites>
-- <maven>3.0.0</maven>
-- </prerequisites>
--
- <groupId>com.jcraft</groupId>
- <artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
=====================================
debian/patches/series
=====================================
@@ -1,2 +1 @@
-01-remove-maven3-prerequisite.patch
02-bundles-to-jars.patch
=====================================
debian/rules
=====================================
@@ -1,10 +1,4 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET := javadoc:javadoc javadoc:aggregate
-
-get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+%:
+ dh $@
=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
-version=3
+version=4
https://github.com/ymnk/jsch-agent-proxy/releases .*/([\d\.]+).tar.gz
=====================================
examples/pom.xml
=====================================
@@ -5,7 +5,7 @@
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy.examples</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
<name>examples to demonstrate how to use jsch-agent-proxy</name>
<dependencies>
=====================================
jsch-agent-proxy-connector-factory/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.connector-factory</artifactId>
=====================================
jsch-agent-proxy-connector-factory/src/main/java/com/jcraft/jsch/agentproxy/ConnectorFactory.java
=====================================
@@ -42,6 +42,7 @@ public abstract class ConnectorFactory {
protected String connectors = "pageant,ssh-agent";
protected String usocketFactories = "nc,jna";
+ protected String usocketPath = null;
public void setPreferredConnectors(String connectors) {
this.connectors = connectors;
@@ -59,6 +60,14 @@ public abstract class ConnectorFactory {
return usocketFactories;
}
+ public void setUSocketPath(String usocketPath){
+ this.usocketPath = usocketPath;
+ }
+
+ public String getUSocketPath() {
+ return usocketPath;
+ }
+
public Connector createConnector() throws AgentProxyException {
ArrayList<String> trials = new ArrayList<String>();
@@ -75,7 +84,7 @@ public abstract class ConnectorFactory {
}
}
else if(_connectors[i].trim().equals("ssh-agent")) {
- if(!SSHAgentConnector.isConnectorAvailable())
+ if(!SSHAgentConnector.isConnectorAvailable(usocketPath))
continue;
String[] _usocketFactories = usocketFactories.split(",");
@@ -83,7 +92,7 @@ public abstract class ConnectorFactory {
if(_usocketFactories[j].trim().equals("nc")) {
try {
USocketFactory usf = new NCUSocketFactory();
- return new SSHAgentConnector(usf);
+ return new SSHAgentConnector(usf, usocketPath);
}
catch(AgentProxyException e){
trials.add("ssh-agent:nc");
@@ -92,7 +101,7 @@ public abstract class ConnectorFactory {
else if(_usocketFactories[j].trim().equals("jna")) {
try {
USocketFactory usf = new JNAUSocketFactory();
- return new SSHAgentConnector(usf);
+ return new SSHAgentConnector(usf, usocketPath);
}
catch(AgentProxyException e){
trials.add("ssh-agent:jna");
=====================================
jsch-agent-proxy-core/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.core</artifactId>
=====================================
jsch-agent-proxy-jsch/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.jsch</artifactId>
=====================================
jsch-agent-proxy-pageant/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.pageant</artifactId>
=====================================
jsch-agent-proxy-sshagent/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.sshagent</artifactId>
=====================================
jsch-agent-proxy-sshagent/src/main/java/com/jcraft/jsch/agentproxy/connector/SSHAgentConnector.java
=====================================
@@ -38,9 +38,15 @@ import java.io.IOException;
public class SSHAgentConnector implements Connector {
private USocketFactory factory;
+ private String usocketPath;
public SSHAgentConnector(USocketFactory factory) throws AgentProxyException {
+ this(factory, null);
+ }
+
+ public SSHAgentConnector(USocketFactory factory, String usocketPath) throws AgentProxyException {
this.factory = factory;
+ this.usocketPath = usocketPath;
// checking if factory is really functional.
USocketFactory.Socket sock = null;
@@ -65,7 +71,11 @@ public class SSHAgentConnector implements Connector {
}
public static boolean isConnectorAvailable(){
- return System.getenv("SSH_AUTH_SOCK")!=null;
+ return isConnectorAvailable(null);
+ }
+
+ public static boolean isConnectorAvailable(String usocketPath){
+ return System.getenv("SSH_AUTH_SOCK")!=null || usocketPath!=null;
}
public boolean isAvailable(){
@@ -73,8 +83,11 @@ public class SSHAgentConnector implements Connector {
}
private USocketFactory.Socket open() throws IOException {
- String ssh_auth_sock = System.getenv("SSH_AUTH_SOCK");
- if(ssh_auth_sock ==null) {
+ String ssh_auth_sock = usocketPath;
+ if(ssh_auth_sock == null) {
+ ssh_auth_sock = System.getenv("SSH_AUTH_SOCK");
+ }
+ if(ssh_auth_sock == null) {
throw new IOException("SSH_AUTH_SOCK is not defined.");
}
return factory.open(ssh_auth_sock);
=====================================
jsch-agent-proxy-sshj/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.sshj</artifactId>
=====================================
jsch-agent-proxy-svnkit-trilead-ssh2/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.svnkit-trilead-ssh2</artifactId>
=====================================
jsch-agent-proxy-usocket-jna/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.usocket-jna</artifactId>
=====================================
jsch-agent-proxy-usocket-junixsocket/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.usocket-junixsocket</artifactId>
=====================================
jsch-agent-proxy-usocket-nc/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.usocket-nc</artifactId>
=====================================
pom.xml
=====================================
@@ -9,7 +9,7 @@
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
<packaging>pom</packaging>
<name>jsch-agent-proxy: a parent of modules</name>
View it on GitLab: https://salsa.debian.org/java-team/jsch-agent-proxy/-/compare/8b3f3dc0c5402102230e7c410839e78e11c00ae8...0f8470355840d571824b7dc24c0335a513be7118
--
View it on GitLab: https://salsa.debian.org/java-team/jsch-agent-proxy/-/compare/8b3f3dc0c5402102230e7c410839e78e11c00ae8...0f8470355840d571824b7dc24c0335a513be7118
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210126/e9b129f4/attachment.html>
More information about the pkg-java-commits
mailing list