From patchwork Mon Dec 10 23:44:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [30/52] package/qemu: add VNC TLS-encryption Date: Mon, 10 Dec 2012 13:44:50 -0000 From: "Yann E. MORIN" X-Patchwork-Id: 205085 Message-Id: <1355183112-10735-31-git-send-email-yann.morin.1998@free.fr> To: buildroot@busybox.net Cc: "Yann E. MORIN" Only TLS is supported, as buildroot has no package for the SASL library. Signed-off-by: "Yann E. MORIN" --- package/qemu/Config.in | 11 +++++++++++ package/qemu/qemu.mk | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 74d207c..14c3704 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -94,6 +94,17 @@ config BR2_PACKAGE_QEMU_VNC_JPEG depends on BR2_PACKAGE_QEMU_VNC select BR2_PACKAGE_JPEG +# TLS does not work with static link, because the gnutls .pc is missing a +# dependency on libintl... :-( +config BR2_PACKAGE_QEMU_VNC_TLS + bool "TLS encryption" + depends on BR2_PACKAGE_QEMU_VNC + depends on !BR2_PREFER_STATIC_LIB + select BR2_PACKAGE_GNUTLS + +comment "VNC TLS encryption does not work for static link" + depends on BR2_PACKAGE_QEMU_VNC && BR2_PREFER_STATIC_LIB + config BR2_PACKAGE_QEMU_SDL bool "Enable SDL frontend" select BR2_PACKAGE_SDL diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 29e1315..61509ec 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -134,6 +134,13 @@ else QEMU_OPTS += --disable-vnc-jpeg endif +ifeq ($(BR2_PACKAGE_QEMU_VNC_TLS),y) +QEMU_OPTS += --enable-vnc-tls +QEMU_DEPENDENCIES += gnutls +else +QEMU_OPTS += --disable-vnc-tls +endif + ifeq ($(BR2_PACKAGE_QEMU_SDL),y) QEMU_OPTS += --enable-sdl QEMU_DEPENDENCIES += sdl @@ -165,7 +172,6 @@ define QEMU_CONFIGURE_CMDS --disable-bsd-user \ --disable-xen \ --disable-slirp \ - --disable-vnc-tls \ --disable-vnc-sasl \ --disable-virtfs \ --disable-brlapi \