[Buildroot] [PATCH 1/2] libsoup: update to version 2.32.2 and enable SSL support

[Buildroot] [PATCH 1/2] libsoup: update to version 2.32.2 and enable SSL support

[Sven Neumann]

SSL support is enabled if gnutls is enabled.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---
 package/libsoup/libsoup.mk |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 6ec0882..697f426 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBSOUP_MAJOR_VERSION:=2.31
+LIBSOUP_MAJOR_VERSION:=2.32
 LIBSOUP_VERSION:=$(LIBSOUP_MAJOR_VERSION).2
 LIBSOUP_SOURCE:=libsoup-$(LIBSOUP_VERSION).tar.bz2
 LIBSOUP_SITE:=http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION)
@@ -19,9 +19,15 @@ endif
 LIBSOUP_CONF_OPT = \
 	--disable-explicit-deps \
 	--disable-glibtest	\
-	--disable-ssl		\
 	--without-gnome
 
 LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2
 
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+LIBSOUP_DEPENDENCIES += gnutls
+LIBSOUP_CONF_OPT += --enable-ssl
+else
+LIBSOUP_CONF_OPT += --disable-ssl
+endif
+
 $(eval $(call AUTOTARGETS,package,libsoup))
-- 
1.7.1

[Buildroot] [PATCH 2/2] libsoup: explicitly pass gcrypt prefix to the configure script

[Sven Neumann]

The libsoup build failes to pick up gcrypt otherwise.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---
 package/libsoup/libsoup.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 697f426..97b5ef5 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -25,7 +25,8 @@ LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host
 
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 LIBSOUP_DEPENDENCIES += gnutls
-LIBSOUP_CONF_OPT += --enable-ssl
+LIBSOUP_CONF_OPT += --enable-ssl \
+	--with-libgcrypt-prefix=$(STAGING_DIR)/usr
 else
 LIBSOUP_CONF_OPT += --disable-ssl
 endif
-- 
1.7.1

[Buildroot] [PATCH 1/2] libsoup: update to version 2.32.2 and enable SSL support

[Thomas Petazzoni]

Le Wed, 13 Jul 2011 18:58:43 +0200,
Sven Neumann <s.neumann@raumfeld.com> a ?crit :

> +ifeq ($(BR2_PACKAGE_GNUTLS),y)
> +LIBSOUP_DEPENDENCIES += gnutls
> +LIBSOUP_CONF_OPT += --enable-ssl
> +else
> +LIBSOUP_CONF_OPT += --disable-ssl
> +endif
> +

Question not specific to your patch: how are we going to handle openssl
vs. gnutls in Buildroot? Is gnutls a drop-in replacement for openssl?
It'd be a mess to have a portion of our packages using openssl for SSL,
and another portion of our packages using gnutls for SSL, no?

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 1/2] libsoup: update to version 2.32.2 and enable SSL support

[Sven Neumann]

On Wed, 2011-07-13 at 19:12 +0200, Thomas Petazzoni wrote:
> Le Wed, 13 Jul 2011 18:58:43 +0200,
> Sven Neumann <s.neumann@raumfeld.com> a ?crit :
> 
> > +ifeq ($(BR2_PACKAGE_GNUTLS),y)
> > +LIBSOUP_DEPENDENCIES += gnutls
> > +LIBSOUP_CONF_OPT += --enable-ssl
> > +else
> > +LIBSOUP_CONF_OPT += --disable-ssl
> > +endif
> > +
> 
> Question not specific to your patch: how are we going to handle openssl
> vs. gnutls in Buildroot? Is gnutls a drop-in replacement for openssl?
> It'd be a mess to have a portion of our packages using openssl for SSL,
> and another portion of our packages using gnutls for SSL, no?

Honestly, this mess seems hard to avoid. We are using openssl for ssh
and also in our own software stack. And we also need libsoup with
support for HTTPS. And it seems the only way to get that is to depend on
gnutls.


Sven