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 2a78ec700d4c87f4d39f408a340d8209bc0654e3 Author: Emmanuel Bourg <[email protected]> Date: Thu Jan 30 12:20:44 2014 +0100 Initial packaging --- debian/README.source | 9 ++++ debian/changelog | 5 ++ debian/compat | 1 + debian/control | 21 ++++++++ debian/copyright | 36 ++++++++++++++ debian/libjsch-agent-proxy-java.poms | 37 ++++++++++++++ debian/maven.ignoreRules | 8 +++ debian/maven.properties | 5 ++ debian/maven.rules | 1 + debian/patches/01-remove-maven3-prerequisite.patch | 16 ++++++ debian/patches/02-bundles-to-jars.patch | 47 ++++++++++++++++++ debian/patches/03-disable-connectors.patch | 58 ++++++++++++++++++++++ debian/patches/series | 3 ++ debian/rules | 10 ++++ debian/source/format | 1 + debian/watch | 2 + 16 files changed, 260 insertions(+) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..cfcd650 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,9 @@ +Information about jsch-agent-proxy +---------------------------------- + +This package was debianized using the mh_make command +from the maven-debian-helper package. + +The build system uses Maven but prevents it from downloading +anything from the Internet, making the build compliant with +the Debian policy. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..c1d7883 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +jsch-agent-proxy (0.0.7-1) unstable; urgency=medium + + * Initial release (Closes: #737094) + + -- Emmanuel Bourg <[email protected]> Thu, 30 Jan 2014 12:20:20 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..71770fb --- /dev/null +++ b/debian/control @@ -0,0 +1,21 @@ +Source: jsch-agent-proxy +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-Indep: libmaven-bundle-plugin-java, libjsch-java +Standards-Version: 3.9.5 +Vcs-Git: git://anonscm.debian.org/pkg-java/jsch-agent-proxy.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jsch-agent-proxy.git +Homepage: http://www.jcraft.com/jsch-agent-proxy/ + +Package: libjsch-agent-proxy-java +Architecture: all +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} +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 + programs in authentications. This software has been developed for JSch, but it + is easily applicable to other ssh2 implementations in Java. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..3fe44e8 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,36 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: jsch-agent-proxy +Source: http://www.jcraft.com/jsch-agent-proxy/ + +Files: * +Copyright: 2011-2013 Atsuhiko Yamanaka <[email protected]>, JCraft,Inc. +License: BSD + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + . + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + . + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, + INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, + OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: debian/* +Copyright: 2014, Emmanuel Bourg <[email protected]> +License: Apache-2.0 + On Debian systems, the full text of the Apache-2.0 license + can be found in the file '/usr/share/common-licenses/Apache-2.0' diff --git a/debian/libjsch-agent-proxy-java.poms b/debian/libjsch-agent-proxy-java.poms new file mode 100644 index 0000000..c73a330 --- /dev/null +++ b/debian/libjsch-agent-proxy-java.poms @@ -0,0 +1,37 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +pom.xml --no-parent --has-package-version +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-sshagent/pom.xml --has-package-version --java-lib +jsch-agent-proxy-usocket-jna/pom.xml --ignore +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 new file mode 100644 index 0000000..e1e2d67 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,8 @@ + +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.properties b/debian/maven.properties new file mode 100644 index 0000000..e593715 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,5 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + +maven.test.skip=true diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1 @@ + diff --git a/debian/patches/01-remove-maven3-prerequisite.patch b/debian/patches/01-remove-maven3-prerequisite.patch new file mode 100644 index 0000000..ab56ffd --- /dev/null +++ b/debian/patches/01-remove-maven3-prerequisite.patch @@ -0,0 +1,16 @@ +Description: Removes the prerequisite on Maven 3 +Author: Emmanuel Bourg <[email protected]> +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.7</version> diff --git a/debian/patches/02-bundles-to-jars.patch b/debian/patches/02-bundles-to-jars.patch new file mode 100644 index 0000000..e2331b0 --- /dev/null +++ b/debian/patches/02-bundles-to-jars.patch @@ -0,0 +1,47 @@ +Description: Changes the packaging from 'bundle' to 'jar' +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/jsch-agent-proxy-core/pom.xml ++++ b/jsch-agent-proxy-core/pom.xml +@@ -11,7 +11,7 @@ + + <artifactId>jsch.agentproxy.core</artifactId> + <name>jsch-agent-proxy core library</name> +- <packaging>bundle</packaging> ++ <packaging>jar</packaging> + + <dependencies> + </dependencies> +--- a/jsch-agent-proxy-connector-factory/pom.xml ++++ b/jsch-agent-proxy-connector-factory/pom.xml +@@ -11,7 +11,7 @@ + + <artifactId>jsch.agentproxy.connector-factory</artifactId> + <name>a connector factory</name> +- <packaging>bundle</packaging> ++ <packaging>jar</packaging> + + <dependencies> + <dependency> +--- a/jsch-agent-proxy-sshagent/pom.xml ++++ b/jsch-agent-proxy-sshagent/pom.xml +@@ -11,7 +11,7 @@ + + <artifactId>jsch.agentproxy.sshagent</artifactId> + <name>a connector for ssh-agent</name> +- <packaging>bundle</packaging> ++ <packaging>jar</packaging> + + <dependencies> + <dependency> +--- a/jsch-agent-proxy-usocket-nc/pom.xml ++++ b/jsch-agent-proxy-usocket-nc/pom.xml +@@ -11,7 +11,7 @@ + + <artifactId>jsch.agentproxy.usocket-nc</artifactId> + <name>an implementation of USocketFactory using netcat</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 new file mode 100644 index 0000000..b9aee3d --- /dev/null +++ b/debian/patches/03-disable-connectors.patch @@ -0,0 +1,58 @@ +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 new file mode 100644 index 0000000..1814247 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +01-remove-maven3-prerequisite.patch +02-bundles-to-jars.patch +03-disable-connectors.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..92d3665 --- /dev/null +++ b/debian/rules @@ -0,0 +1,10 @@ +#!/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 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..28309af --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://github.com/ymnk/jsch-agent-proxy/releases .*/([\d\.]+).tar.gz -- 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
