[Buildroot] [PATCH v2 0/2] Add package 'remmina' and 'libssh'

[Buildroot] [PATCH v2 0/2] Add package 'remmina' and 'libssh'

[Scott Fan]

Remmina is a remote desktop client written in GTK+, which currently
support RDP, VNC, NX, XDMCP and SSH.

Libssh is a mulitplatform C library implementing the SSHv2 and SSHv1
protocol on client and server side.

Remmina package depends on package libssh, NOT the libssh2 package.

This changeset:
1) fix the dependencies of package remmina.
2) fix the license of package remmina.
3) wrap lines at 72 characters.


Scott Fan (2):
  libssh: new package
  Remmina: new package

 package/Config.in          |  2 ++
 package/libssh/Config.in   |  9 +++++++++
 package/libssh/libssh.hash |  2 ++
 package/libssh/libssh.mk   | 16 ++++++++++++++++
 package/remmina/Config.in  | 24 ++++++++++++++++++++++++
 package/remmina/remmina.mk | 32 ++++++++++++++++++++++++++++++++
 6 files changed, 85 insertions(+)
 create mode 100644 package/libssh/Config.in
 create mode 100644 package/libssh/libssh.hash
 create mode 100644 package/libssh/libssh.mk
 create mode 100644 package/remmina/Config.in
 create mode 100644 package/remmina/remmina.mk

-- 
2.5.0

[Buildroot] [PATCH v2 1/2] libssh: new package

[Scott Fan]

libssh2 and libssh both implement SSH and provide a library API for apps.
Both support SSH, SFTP, auth, channels etc. Both are 25K-30K lines of code.

[libssh2 vs libssh - A comparison]
http://www.libssh2.org/libssh2-vs-libssh.html

Signed-off-by: Scott Fan <fancp2007@gmail.com>
---
 package/Config.in          |  1 +
 package/libssh/Config.in   |  9 +++++++++
 package/libssh/libssh.hash |  2 ++
 package/libssh/libssh.mk   | 16 ++++++++++++++++
 4 files changed, 28 insertions(+)
 create mode 100644 package/libssh/Config.in
 create mode 100644 package/libssh/libssh.hash
 create mode 100644 package/libssh/libssh.mk

diff --git a/package/Config.in b/package/Config.in
index 1e39c74..8d9511c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -748,6 +748,7 @@ menu "Crypto"
 	source "package/libsecret/Config.in"
 	source "package/libsha1/Config.in"
 	source "package/libsodium/Config.in"
+	source "package/libssh/Config.in"
 	source "package/libssh2/Config.in"
 	source "package/nettle/Config.in"
 	source "package/openssl/Config.in"
diff --git a/package/libssh/Config.in b/package/libssh/Config.in
new file mode 100644
index 0000000..f5c4405
--- /dev/null
+++ b/package/libssh/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBSSH
+	bool "libssh"
+	help
+	  libssh is a mulitplatform C library implementing the SSHv2 and SSHv1
+	  protocol on client and server side. With libssh, you can remotely execute
+	  programs, transfer files, use a secure and transparent tunnel for your
+	  remote applications.
+
+	  http://www.libssh.org/
diff --git a/package/libssh/libssh.hash b/package/libssh/libssh.hash
new file mode 100644
index 0000000..81466cc
--- /dev/null
+++ b/package/libssh/libssh.hash
@@ -0,0 +1,2 @@
+# from https://red.libssh.org/projects/libssh/files/
+md5	bffc9dc548c3bae3a3afc5ac1654b272	libssh-0.7.1.tar.xz
diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk
new file mode 100644
index 0000000..9d5422f
--- /dev/null
+++ b/package/libssh/libssh.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+## libssh
+#
+#################################################################################
+
+LIBSSH_VERSION = 0.7.1
+LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
+LIBSSH_SITE = https://red.libssh.org/attachments/download/154
+LIBSSH_LICENSE = LGPLv2.1
+LIBSSH_LICENSE_FILES = COPYING
+LIBSSH_INSTALL_STAGING = YES
+LIBSSH_SUPPORTS_IN_SOURCE_BUILD = NO
+LIBSSH_CONF_OPTS += -DWITH_SERVER=OFF
+
+$(eval $(cmake-package))
-- 
2.5.0

[Buildroot] [PATCH v2 2/2] Remmina: new package

[Scott Fan]

Remmina is a remote desktop client written in GTK+.
Currently RDP, VNC, NX, XDMCP and SSH are supported.

http://remmina.sourceforge.net/

Signed-off-by: Scott Fan <fancp2007@gmail.com>
---
 package/Config.in          |  1 +
 package/remmina/Config.in  | 24 ++++++++++++++++++++++++
 package/remmina/remmina.mk | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 package/remmina/Config.in
 create mode 100644 package/remmina/remmina.mk

diff --git a/package/Config.in b/package/Config.in
index 8d9511c..8ca27f4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -239,6 +239,7 @@ endif
 	source "package/fbterm/Config.in"
 	source "package/fbv/Config.in"
 	source "package/freerdp/Config.in"
+	source "package/remmina/Config.in"
 	source "package/imagemagick/Config.in"
 	source "package/linux-fusion/Config.in"
 	source "package/lite/Config.in"
diff --git a/package/remmina/Config.in b/package/remmina/Config.in
new file mode 100644
index 0000000..4090d31
--- /dev/null
+++ b/package/remmina/Config.in
@@ -0,0 +1,24 @@
+config BR2_PACKAGE_REMMINA
+	bool "remmina"
+	depends on BR2_PACKAGE_LIBGTK3
+	depends on BR2_USE_MMU # libvncserver depends on BR2_USE_MMU
+	depends on BR2_USE_WCHAR # freerdp
+	depends on !BR2_STATIC_LIBS # freerdp
+	depends on BR2_TOOLCHAIN_HAS_THREADS # freerdp
+	select BR2_PACKAGE_LIBGCRYPT
+	select BR2_PACKAGE_LIBSSH
+	select BR2_PACKAGE_LIBVNCSERVER
+	select BR2_PACKAGE_FREERDP
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	help
+	  Remmina is a remote desktop client written in GTK+, aiming to be
+	  useful for system administrators and travellers, who need to work
+	  with lots of remote computers in front of either large monitors
+	  or tiny netbooks.
+
+	  Remmina supports multiple network protocols in an integrated and
+	  consistent user interface.
+
+	  Currently RDP, VNC, NX, XDMCP and SSH are supported.
+
+	  http://remmina.sourceforge.net/
diff --git a/package/remmina/remmina.mk b/package/remmina/remmina.mk
new file mode 100644
index 0000000..a3a690e
--- /dev/null
+++ b/package/remmina/remmina.mk
@@ -0,0 +1,32 @@
+################################################################################
+#
+# remmina
+#
+################################################################################
+
+REMMINA_VERSION = v1.1.2
+REMMINA_SITE = $(call github,FreeRDP,Remmina,$(REMMINA_VERSION))
+REMMINA_LICENSE = GPLv2+ with OpenSSL exception
+REMMINA_LICENSE_FILES = COPYING LICENSE LICENSE.OpenSSL
+
+REMMINA_CONF_OPTS = \
+	-DWITH_AVAHI=OFF \
+	-DWITH_APPINDICATOR=OFF \
+	-DWITH_TELEPATHY=OFF \
+	-DWITH_GNOMEKEYRING=OFF
+
+REMMINA_DEPENDENCIES = \
+	libgtk3 libgcrypt libssh libvncserver freerdp
+
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
+REMMINA_DEPENDENCIES += gettext
+
+define REMMINA_POST_PATCH_FIXINTL
+	$(SED) 's/$${GTK_LIBRARIES}/$${GTK_LIBRARIES} -lintl/' \
+		$(@D)/remmina/CMakeLists.txt
+endef
+
+REMMINA_POST_PATCH_HOOKS += REMMINA_POST_PATCH_FIXINTL
+endif
+
+$(eval $(cmake-package))
-- 
2.5.0

[Buildroot] [PATCH v2 1/2] libssh: new package

[Thomas Petazzoni]

Dear Scott Fan,

Thanks for this patch!

On Tue, 28 Jul 2015 21:17:58 +0800, Scott Fan wrote:
> libssh2 and libssh both implement SSH and provide a library API for apps.
> Both support SSH, SFTP, auth, channels etc. Both are 25K-30K lines of code.
> 
> [libssh2 vs libssh - A comparison]
> http://www.libssh2.org/libssh2-vs-libssh.html
> 
> Signed-off-by: Scott Fan <fancp2007@gmail.com>

I've tried to merge this package, but it really doesn't work:

 * It wants zlib unless -DWITH_LIB=OFF

 * It needs either libgcrypt or OpenSSL

 * It needs to be passed -DHAVE_WORDS_BIGENDIAN=0 or 1 depending on the
   endianness of the platform.

And even with all this fixed, it still fails to build:

Building C object src/CMakeFiles/ssh_shared.dir/bignum.c.o
In file included from /home/thomas/projets/buildroot/output/build/libssh-0.7.1/src/bignum.c:24:0:
/home/thomas/projets/buildroot/output/build/libssh-0.7.1/include/libssh/priv.h:42:4: error: #error "no strtoull function found"
In file included from /home/thomas/projets/buildroot/output/build/libssh-0.7.1/src/buffer.c:34:0:
/home/thomas/projets/buildroot/output/build/libssh-0.7.1/include/libssh/priv.h:42:4: error: #error "no strtoull function found"
In file included from /home/thomas/projets/buildroot/output/build/libssh-0.7.1/src/auth.c:34:0:
/home/thomas/projets/buildroot/output/build/libssh-0.7.1/include/libssh/priv.h:42:4: error: #error "no strtoull function found"
In file included from /home/thomas/projets/buildroot/output/build/libssh-0.7.1/src/buffer.c:34:0:
/home/thomas/projets/buildroot/output/build/libssh-0.7.1/include/libssh/priv.h:154:4: error: #error "Your system must provide a __func__ macro"
In file included from /home/thomas/projets/buildroot/output/build/libssh-0.7.1/src/bignum.c:24:0:
/home/thomas/projets/buildroot/output/build/libssh-0.7.1/include/libssh/priv.h:154:4: error: #error "Your system must provide a __func__ macro"
In file included from /home/thomas/projets/buildroot/output/build/libssh-0.7.1/src/auth.c:34:0:
/home/thomas/projets/buildroot/output/build/libssh-0.7.1/include/libssh/priv.h:154:4: error: #error "Your system must provide a __func__ macro"
src/CMakeFiles/ssh_shared.dir/build.make:123: recipe for target 'src/CMakeFiles/ssh_shared.dir/bignum.c.o' failed
make[4]: *** [src/CMakeFiles/ssh_shared.dir/bignum.c.o] Error 1

I believe you probably haven't tested this package throughly enough.
Please make sure that:

 * You do a Buildroot build with only this package enabled, and nothing
   else. This will make sure you get the dependencies correct.

 * You do a Buildroot build with a uClibc toolchain. You can for
   example use the base configuration
   http://autobuild.buildroot.org/toolchains/configs/br-arm-full.config
   to use a pre-built uClibc external toolchain, which will avoid the
   need for building the toolchain.

For reference, here is the libssh.mk file that I have right now:

################################################################################
#
## libssh
#
#################################################################################

LIBSSH_VERSION = 0.7.1
LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
LIBSSH_SITE = https://red.libssh.org/attachments/download/154
LIBSSH_LICENSE = LGPLv2.1
LIBSSH_LICENSE_FILES = COPYING
LIBSSH_INSTALL_STAGING = YES
LIBSSH_SUPPORTS_IN_SOURCE_BUILD = NO
LIBSSH_CONF_OPTS = \
	-DWITH_SERVER=OFF

ifeq ($(BR2_ENDIAN),"BIG")
LIBSSH_CONF_OPTS += -DHAVE_WORDS_BIGENDIAN=1
else
LIBSSH_CONF_OPTS += -DHAVE_WORDS_BIGENDIAN=0
endif

ifeq ($(BR2_PACKAGE_ZLIB),y)
LIBSSH_CONF_OPTS += -DWITH_ZLIB=ON
LIBSSH_DEPENDENCIES += zlib
else
LIBSSH_CONF_OPTS += -DWITH_ZLIB=OFF
endif

ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
LIBSSH_CONF_OPTS += -DWITH_GCRYPT=ON
LIBSSH_DEPENDENCIES += libgcrypt
else
LIBSSH_CONF_OPTS += -DWITH_GCRYPT=OFF
endif

ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
LIBSSH_CONF_OPTS += -DWITH_OPENSSL=ON
LIBSSH_DEPENDENCIES += openssl
else
LIBSSH_CONF_OPTS += -DWITH_OPENSSL=OFF
endif

$(eval $(cmake-package))

And the Config.in file:

config BR2_PACKAGE_LIBSSH
	bool "libssh"
	# Either OpenSSL or libgcrypt are mandatory
	select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL
	help
	  libssh is a mulitplatform C library implementing the SSHv2
	  and SSHv1 protocol on client and server side. With libssh,
	  you can remotely execute programs, transfer files, use a
	  secure and transparent tunnel for your remote applications.

	  http://www.libssh.org/

Can you resubmit this patch after making sure the package builds
properly?

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v2 1/2] libssh: new package

[Scott Fan]

Dear Thomas,

I've fixed this patch, please see at
http://patchwork.ozlabs.org/patch/512240/

thanks.

Scott Fan

On Fri, Aug 28, 2015 at 6:21 PM, Thomas Petazzoni <
thomas.petazzoni@free-electrons.com> wrote:

> Dear Scott Fan,
>
> Thanks for this patch!
>
> On Tue, 28 Jul 2015 21:17:58 +0800, Scott Fan wrote:
> > libssh2 and libssh both implement SSH and provide a library API for apps.
> > Both support SSH, SFTP, auth, channels etc. Both are 25K-30K lines of
> code.
> >
> > [libssh2 vs libssh - A comparison]
> > http://www.libssh2.org/libssh2-vs-libssh.html
> >
> > Signed-off-by: Scott Fan <fancp2007@gmail.com>
>
> I've tried to merge this package, but it really doesn't work:
>
>  * It wants zlib unless -DWITH_LIB=OFF
>
>  * It needs either libgcrypt or OpenSSL
>
>  * It needs to be passed -DHAVE_WORDS_BIGENDIAN=0 or 1 depending on the
>    endianness of the platform.
>
> And even with all this fixed, it still fails to build:
>
> Building C object src/CMakeFiles/ssh_shared.dir/bignum.c.o
> In file included from
> /home/thomas/projets/buildroot/output/build/libssh-0.7.1/src/bignum.c:24:0:
> /home/thomas/projets/buildroot/output/build/libssh-0.7.1/include/libssh/priv.h:42:4:
> error: #error "no strtoull function found"
> In file included from
> /home/thomas/projets/buildroot/output/build/libssh-0.7.1/src/buffer.c:34:0:
> /home/thomas/projets/buildroot/output/build/libssh-0.7.1/include/libssh/priv.h:42:4:
> error: #error "no strtoull function found"
> In file included from
> /home/thomas/projets/buildroot/output/build/libssh-0.7.1/src/auth.c:34:0:
> /home/thomas/projets/buildroot/output/build/libssh-0.7.1/include/libssh/priv.h:42:4:
> error: #error "no strtoull function found"
> In file included from
> /home/thomas/projets/buildroot/output/build/libssh-0.7.1/src/buffer.c:34:0:
> /home/thomas/projets/buildroot/output/build/libssh-0.7.1/include/libssh/priv.h:154:4:
> error: #error "Your system must provide a __func__ macro"
> In file included from
> /home/thomas/projets/buildroot/output/build/libssh-0.7.1/src/bignum.c:24:0:
> /home/thomas/projets/buildroot/output/build/libssh-0.7.1/include/libssh/priv.h:154:4:
> error: #error "Your system must provide a __func__ macro"
> In file included from
> /home/thomas/projets/buildroot/output/build/libssh-0.7.1/src/auth.c:34:0:
> /home/thomas/projets/buildroot/output/build/libssh-0.7.1/include/libssh/priv.h:154:4:
> error: #error "Your system must provide a __func__ macro"
> src/CMakeFiles/ssh_shared.dir/build.make:123: recipe for target
> 'src/CMakeFiles/ssh_shared.dir/bignum.c.o' failed
> make[4]: *** [src/CMakeFiles/ssh_shared.dir/bignum.c.o] Error 1
>
> I believe you probably haven't tested this package throughly enough.
> Please make sure that:
>
>  * You do a Buildroot build with only this package enabled, and nothing
>    else. This will make sure you get the dependencies correct.
>
>  * You do a Buildroot build with a uClibc toolchain. You can for
>    example use the base configuration
>    http://autobuild.buildroot.org/toolchains/configs/br-arm-full.config
>    to use a pre-built uClibc external toolchain, which will avoid the
>    need for building the toolchain.
>
> For reference, here is the libssh.mk file that I have right now:
>
>
> ################################################################################
> #
> ## libssh
> #
>
> #################################################################################
>
> LIBSSH_VERSION = 0.7.1
> LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
> LIBSSH_SITE = https://red.libssh.org/attachments/download/154
> LIBSSH_LICENSE = LGPLv2.1
> LIBSSH_LICENSE_FILES = COPYING
> LIBSSH_INSTALL_STAGING = YES
> LIBSSH_SUPPORTS_IN_SOURCE_BUILD = NO
> LIBSSH_CONF_OPTS = \
>         -DWITH_SERVER=OFF
>
> ifeq ($(BR2_ENDIAN),"BIG")
> LIBSSH_CONF_OPTS += -DHAVE_WORDS_BIGENDIAN=1
> else
> LIBSSH_CONF_OPTS += -DHAVE_WORDS_BIGENDIAN=0
> endif
>
> ifeq ($(BR2_PACKAGE_ZLIB),y)
> LIBSSH_CONF_OPTS += -DWITH_ZLIB=ON
> LIBSSH_DEPENDENCIES += zlib
> else
> LIBSSH_CONF_OPTS += -DWITH_ZLIB=OFF
> endif
>
> ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
> LIBSSH_CONF_OPTS += -DWITH_GCRYPT=ON
> LIBSSH_DEPENDENCIES += libgcrypt
> else
> LIBSSH_CONF_OPTS += -DWITH_GCRYPT=OFF
> endif
>
> ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
> LIBSSH_CONF_OPTS += -DWITH_OPENSSL=ON
> LIBSSH_DEPENDENCIES += openssl
> else
> LIBSSH_CONF_OPTS += -DWITH_OPENSSL=OFF
> endif
>
> $(eval $(cmake-package))
>
> And the Config.in file:
>
> config BR2_PACKAGE_LIBSSH
>         bool "libssh"
>         # Either OpenSSL or libgcrypt are mandatory
>         select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL
>         help
>           libssh is a mulitplatform C library implementing the SSHv2
>           and SSHv1 protocol on client and server side. With libssh,
>           you can remotely execute programs, transfer files, use a
>           secure and transparent tunnel for your remote applications.
>
>           http://www.libssh.org/
>
> Can you resubmit this patch after making sure the package builds
> properly?
>
> Thanks a lot!
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20150831/52ee93f6/attachment.html>

[Buildroot] [PATCH v2 1/2] libssh: new package

[Thomas Petazzoni]

Dear Scott Fan,

On Mon, 31 Aug 2015 00:09:26 +0800, Scott Fan wrote:
> Dear Thomas,
> 
> I've fixed this patch, please see at
> http://patchwork.ozlabs.org/patch/512240/

Thanks, it has been applied by Peter in the mean time!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com