From 4246ea82d688e5df21a72e51cf7cb53a63a012be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Fri, 11 Nov 2011 10:06:34 +0100
Subject: [PATCH] Create gnutls component, use it in kvm software release
---
component/gnutls/buildout.cfg | 34 ++++++++++++++++++++++++++++++++++
software/kvm/software.cfg | 31 +------------------------------
2 files changed, 35 insertions(+), 30 deletions(-)
create mode 100644 component/gnutls/buildout.cfg
diff --git a/component/gnutls/buildout.cfg b/component/gnutls/buildout.cfg
new file mode 100644
index 000000000..4bb35dd94
--- /dev/null
+++ b/component/gnutls/buildout.cfg
@@ -0,0 +1,34 @@
+[buildout]
+extends =
+ ../readline/buildout.cfg
+ ../ncurses/buildout.cfg
+ ../zlib/buildout.cfg
+
+parts = gnutls
+
+[gpg-error]
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.gz
+md5sum = 7c2710ef439f82ac429b88fec88e9a4c
+
+[gcrypt]
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.6.tar.gz
+md5sum = bfd45922eefb8a24d598af77366220d4
+configure-options =
+ --with-gpg-error-prefix=${gpg-error:location}
+environment =
+ CPPFLAGS=-I${gpg-error:location}/include
+ LDFLAGS=-Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gpg-error:location}/lib/libgpg-error.so.0
+
+[gnutls]
+# XXX-Cedric : update to latest gnutls
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-2.8.6.tar.bz2
+md5sum = eb0a6d7d3cb9ac684d971c14f9f6d3ba
+configure-options =
+ --with-libgcrypt-prefix=${gcrypt:location}
+environment =
+ CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gcrypt:location}/include -I${gpg-error:location}/include
+ LDFLAGS=-L${readline:location}/lib -L${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${gcrypt:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gcrypt:location}/lib/libgcrypt.so.11
+ PKG_CONFIG=${zlib:location}/lib/pkgconfig
diff --git a/software/kvm/software.cfg b/software/kvm/software.cfg
index 8f498a92e..e015c5344 100644
--- a/software/kvm/software.cfg
+++ b/software/kvm/software.cfg
@@ -4,9 +4,7 @@ extends =
../../component/python-2.7/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/git/buildout.cfg
- ../../component/zlib/buildout.cfg
- ../../component/readline/buildout.cfg
- ../../component/ncurses/buildout.cfg
+ ../../component/gnutls/buildout.cfg
../../component/libuuid/buildout.cfg
../../component/noVNC/buildout.cfg
../../component/openssl/buildout.cfg
@@ -42,33 +40,6 @@ allow-hosts =
www.dabeaz.com
www.owlfish.com
-[gpg-error]
-recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.gz
-md5sum = 7c2710ef439f82ac429b88fec88e9a4c
-
-[gcrypt]
-recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.6.tar.gz
-md5sum = bfd45922eefb8a24d598af77366220d4
-configure-options =
- --with-gpg-error-prefix=${gpg-error:location}
-environment =
- CPPFLAGS=-I${gpg-error:location}/include
- LDFLAGS=-Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gpg-error:location}/lib/libgpg-error.so.0
-
-[gnutls]
-# XXX-Cedric : update to latest gnutls
-recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-2.8.6.tar.bz2
-md5sum = eb0a6d7d3cb9ac684d971c14f9f6d3ba
-configure-options =
- --with-libgcrypt-prefix=${gcrypt:location}
-environment =
- CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gcrypt:location}/include -I${gpg-error:location}/include
- LDFLAGS=-L${readline:location}/lib -L${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${gcrypt:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gcrypt:location}/lib/libgcrypt.so.11
- PKG_CONFIG=${zlib:location}/lib/pkgconfig
-
#XXX-Cedric : Currently, one can only access to KVM using noVNC.
# Ideally one should be able to access KVM by using either NoVNC or VNC.
# Problem is : no native crypto support in web browsers. So we have to disable ssl
--
2.30.9