Patchwork [v3,1/2] libssh2: add package

login
register
mail settings
Submitter Ryan Barnett
Date Aug. 30, 2013, 2:09 p.m.
Message ID <1377871785-4964-2-git-send-email-rjbarnet@rockwellcollins.com>
Download mbox | patch
Permalink /patch/271297/
State Accepted
Headers show

Comments

Ryan Barnett - Aug. 30, 2013, 2:09 p.m.
Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
---

Change from v2 -> v3:
  * Use else when selecting configure and dependancy options with using
    libgcrypt or openssl (suggested by Baruch Siach)

Changes v1 -> v2:
  * removed details from libssh2/Config.in (suggested by Arnout)
  * added libssh2 to select libgcrypt by default (suggested by Arnout)
  * fixed up configuration options libssh2 in libssh.mk 
    (suggested by Arnout)
  * removed removal of documentation and static libraries since the
    target finalize step takes care of this (suggested by Arnout)
  * added check for zlib dependancy

 package/Config.in          |    1 +
 package/libssh2/Config.in  |   11 +++++++++++
 package/libssh2/libssh2.mk |   32 ++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 0 deletions(-)
 create mode 100644 package/libssh2/Config.in
 create mode 100644 package/libssh2/libssh2.mk
Peter Korsgaard - Sept. 8, 2013, 7:52 p.m.
>>>>> "Ryan" == Ryan Barnett <rjbarnet@rockwellcollins.com> writes:

 Ryan> Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
 Ryan> ---

 Ryan> Change from v2 -> v3:
 Ryan>   * Use else when selecting configure and dependancy options with using
 Ryan>     libgcrypt or openssl (suggested by Baruch Siach)

Committed with minor tweaks (see below) - Thanks.

 Ryan> diff --git a/package/libssh2/Config.in b/package/libssh2/Config.in
 Ryan> new file mode 100644
 Ryan> index 0000000..1fb89ff
 Ryan> --- /dev/null
 Ryan> +++ b/package/libssh2/Config.in
 Ryan> @@ -0,0 +1,11 @@
 Ryan> +config BR2_PACKAGE_LIBSSH2
 Ryan> +	bool "libssh2"
 Ryan> +	select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL
 Ryan> +	help
 Ryan> +	  libssh2 is a client-side C library implementing the SSH2 protocol 
 Ryan> +	  as defined by Internet Drafts: SECSH-TRANS(22), SECSH-USERAUTH(25), 
 Ryan> +	  SECSH-CONNECTION(23), SECSH-ARCH(20), SECSH-FILEXFER(06)*, 
 Ryan> +	  SECSH-DHGEX(04), and SECSH-NUMBERS(10)

Trailing spaces.

 Ryan> +
 Ryan> +	  http://www.libssh2.org/
 Ryan> +

You shouldn't have an empty line after the URL.

 Ryan> diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk
 Ryan> new file mode 100644
 Ryan> index 0000000..af93d61
 Ryan> --- /dev/null
 Ryan> +++ b/package/libssh2/libssh2.mk
 Ryan> @@ -0,0 +1,32 @@
 Ryan> +#############################################################

The '####' lines should be 80 chars long.

Patch

diff --git a/package/Config.in b/package/Config.in
index 97cd7da..668f550 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -424,6 +424,7 @@  source "package/libmcrypt/Config.in"
 source "package/libmhash/Config.in"
 source "package/libnss/Config.in"
 source "package/libsha1/Config.in"
+source "package/libssh2/Config.in"
 source "package/nettle/Config.in"
 source "package/openssl/Config.in"
 source "package/polarssl/Config.in"
diff --git a/package/libssh2/Config.in b/package/libssh2/Config.in
new file mode 100644
index 0000000..1fb89ff
--- /dev/null
+++ b/package/libssh2/Config.in
@@ -0,0 +1,11 @@ 
+config BR2_PACKAGE_LIBSSH2
+	bool "libssh2"
+	select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL
+	help
+	  libssh2 is a client-side C library implementing the SSH2 protocol 
+	  as defined by Internet Drafts: SECSH-TRANS(22), SECSH-USERAUTH(25), 
+	  SECSH-CONNECTION(23), SECSH-ARCH(20), SECSH-FILEXFER(06)*, 
+	  SECSH-DHGEX(04), and SECSH-NUMBERS(10)
+
+	  http://www.libssh2.org/
+
diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk
new file mode 100644
index 0000000..af93d61
--- /dev/null
+++ b/package/libssh2/libssh2.mk
@@ -0,0 +1,32 @@ 
+#############################################################
+#
+# libssh2
+#
+#############################################################
+
+LIBSSH2_VERSION = 1.4.3
+LIBSSH2_SITE = http://www.libssh2.org/download/
+LIBSSH2_LICENSE = BSD
+LIBSSH2_LICENSE_FILES = COPYING
+LIBSSH2_INSTALL_STAGING = YES
+LIBSSH2_CONF_OPT = --disable-examples-build
+
+# libssh2 must use either libgcrypt or OpenSSL
+# Only select openssl if libgcrypt is not selected
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+LIBSSH2_DEPENDENCIES += libgcrypt
+LIBSSH2_CONF_OPT += --with-libgcrypt --without-openssl
+else
+LIBSSH2_DEPENDENCIES += openssl
+LIBSSH2_CONF_OPT += --with-openssl --without-libgcrypt
+endif
+
+# Add zlib support if enabled
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+LIBSSH2_DEPENDENCIES += zlib
+LIBSSH2_CONF_OPT += --with-libz
+else
+LIBSSH2_CONF_OPT += --without-libz
+endif
+
+$(eval $(autotools-package))