This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jsch-agent-proxy.
commit b2c8777e21049286e2d71c36a0283fcc02ee9d59 Author: Emmanuel Bourg <[email protected]> Date: Mon Jun 15 23:09:09 2015 +0200 Enabled the pageant and usocket-jna modules (Closes: #788854) --- debian/changelog | 6 ++++ debian/control | 2 +- debian/libjsch-agent-proxy-java.poms | 4 +-- debian/maven.ignoreRules | 2 -- debian/maven.rules | 1 + debian/patches/02-bundles-to-jars.patch | 22 ++++++++++++ debian/patches/03-disable-connectors.patch | 58 ------------------------------ debian/patches/series | 1 - 8 files changed, 32 insertions(+), 64 deletions(-) diff --git a/debian/changelog b/debian/changelog index c1d7883..8a50383 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +jsch-agent-proxy (0.0.7-2) UNRELEASED; urgency=medium + + * Enabled the pageant and usocket-jna modules (Closes: #788854) + + -- Emmanuel Bourg <[email protected]> Mon, 15 Jun 2015 23:08:19 +0200 + jsch-agent-proxy (0.0.7-1) unstable; urgency=medium * Initial release (Closes: #737094) diff --git a/debian/control b/debian/control index 71770fb..fc3e8e9 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Emmanuel Bourg <[email protected]> -Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.5) +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.5 Vcs-Git: git://anonscm.debian.org/pkg-java/jsch-agent-proxy.git diff --git a/debian/libjsch-agent-proxy-java.poms b/debian/libjsch-agent-proxy-java.poms index c73a330..96bd5e4 100644 --- a/debian/libjsch-agent-proxy-java.poms +++ b/debian/libjsch-agent-proxy-java.poms @@ -30,8 +30,8 @@ jsch-agent-proxy-core/pom.xml --has-package-version --java-lib jsch-agent-proxy-connector-factory/pom.xml --has-package-version --java-lib jsch-agent-proxy-jsch/pom.xml --has-package-version --java-lib jsch-agent-proxy-sshj/pom.xml --ignore -jsch-agent-proxy-pageant/pom.xml --ignore +jsch-agent-proxy-pageant/pom.xml --has-package-version --java-lib jsch-agent-proxy-sshagent/pom.xml --has-package-version --java-lib -jsch-agent-proxy-usocket-jna/pom.xml --ignore +jsch-agent-proxy-usocket-jna/pom.xml --has-package-version --java-lib jsch-agent-proxy-usocket-nc/pom.xml --has-package-version --java-lib jsch-agent-proxy-svnkit-trilead-ssh2/pom.xml --ignore diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index e1e2d67..cdbe3b2 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -1,8 +1,6 @@ -com.jcraft jsch.agentproxy.pageant * * * * com.jcraft jsch.agentproxy.sshj * * * * com.jcraft jsch.agentproxy.svnkit-trilead-ssh2 * * * * -com.jcraft jsch.agentproxy.usocket-jna * * * * org.apache.maven.plugins maven-javadoc-plugin * * * * org.apache.maven.plugins maven-source-plugin * * * * org.apache.maven.wagon wagon-ssh-external * * * * diff --git a/debian/maven.rules b/debian/maven.rules index 8b13789..e52e50d 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1 +1,2 @@ +net.java.dev.jna s/platform/jna-platform/ * s/.*/debian/ * * diff --git a/debian/patches/02-bundles-to-jars.patch b/debian/patches/02-bundles-to-jars.patch index e2331b0..1ba021e 100644 --- a/debian/patches/02-bundles-to-jars.patch +++ b/debian/patches/02-bundles-to-jars.patch @@ -45,3 +45,25 @@ Forwarded: not-needed <dependencies> <dependency> +--- a/jsch-agent-proxy-pageant/pom.xml ++++ b/jsch-agent-proxy-pageant/pom.xml +@@ -11,7 +11,7 @@ + + <artifactId>jsch.agentproxy.pageant</artifactId> + <name>a connector for Pageant using JNA</name> +- <packaging>bundle</packaging> ++ <packaging>jar</packaging> + + <dependencies> + <dependency> +--- a/jsch-agent-proxy-usocket-jna/pom.xml ++++ b/jsch-agent-proxy-usocket-jna/pom.xml +@@ -11,7 +11,7 @@ + + <artifactId>jsch.agentproxy.usocket-jna</artifactId> + <name>an implementation of USocketFactory using JNA</name> +- <packaging>bundle</packaging> ++ <packaging>jar</packaging> + + <dependencies> + <dependency> diff --git a/debian/patches/03-disable-connectors.patch b/debian/patches/03-disable-connectors.patch deleted file mode 100644 index b9aee3d..0000000 --- a/debian/patches/03-disable-connectors.patch +++ /dev/null @@ -1,58 +0,0 @@ -Description: Do not use the unsupported connectors in ConnectorFactory -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/jsch-agent-proxy-connector-factory/src/main/java/com/jcraft/jsch/agentproxy/ConnectorFactory.java -+++ b/jsch-agent-proxy-connector-factory/src/main/java/com/jcraft/jsch/agentproxy/ConnectorFactory.java -@@ -33,15 +33,13 @@ - import com.jcraft.jsch.agentproxy.AgentProxyException; - import com.jcraft.jsch.agentproxy.USocketFactory; - import com.jcraft.jsch.agentproxy.connector.SSHAgentConnector; --import com.jcraft.jsch.agentproxy.connector.PageantConnector; - import com.jcraft.jsch.agentproxy.usocket.NCUSocketFactory; --import com.jcraft.jsch.agentproxy.usocket.JNAUSocketFactory; - import java.util.ArrayList; - - public abstract class ConnectorFactory { - -- protected String connectors = "pageant,ssh-agent"; -- protected String usocketFactories = "nc,jna"; -+ protected String connectors = "ssh-agent"; -+ protected String usocketFactories = "nc"; - - public void setPreferredConnectors(String connectors) { - this.connectors = connectors; -@@ -64,17 +62,7 @@ - - String[] _connectors = connectors.split(","); - for(int i = 0; i < _connectors.length; i++) { -- if(_connectors[i].trim().equals("pageant")) { -- if(PageantConnector.isConnectorAvailable()) { -- try { -- return new PageantConnector(); -- } -- catch(AgentProxyException e){ -- trials.add("pageant"); -- } -- } -- } -- else if(_connectors[i].trim().equals("ssh-agent")) { -+ if(_connectors[i].trim().equals("ssh-agent")) { - if(!SSHAgentConnector.isConnectorAvailable()) - continue; - -@@ -89,15 +77,6 @@ - trials.add("ssh-agent:nc"); - } - } -- else if(_usocketFactories[j].trim().equals("jna")) { -- try { -- USocketFactory usf = new JNAUSocketFactory(); -- return new SSHAgentConnector(usf); -- } -- catch(AgentProxyException e){ -- trials.add("ssh-agent:jna"); -- } -- } - } - } - } diff --git a/debian/patches/series b/debian/patches/series index 1814247..eee1b96 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 01-remove-maven3-prerequisite.patch 02-bundles-to-jars.patch -03-disable-connectors.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jsch-agent-proxy.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
