From patchwork Sun Dec 9 16:35:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 204732 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id BB3A22C01C2 for ; Mon, 10 Dec 2012 03:40:23 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8549FA0152; Sun, 9 Dec 2012 16:40:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vEH3VuYY5AI0; Sun, 9 Dec 2012 16:40:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 9AA7DA01ED; Sun, 9 Dec 2012 16:37:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id BDEF48F74B for ; Sun, 9 Dec 2012 16:36:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AADE7884E1 for ; Sun, 9 Dec 2012 16:36:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R43sxIMSSdFN for ; Sun, 9 Dec 2012 16:36:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by whitealder.osuosl.org (Postfix) with ESMTPS id A7E5F81BA8 for ; Sun, 9 Dec 2012 16:36:07 +0000 (UTC) Received: by mail-wg0-f41.google.com with SMTP id ds1so464860wgb.4 for ; Sun, 09 Dec 2012 08:36:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=IUSYsAVWE/ePQvXKfxUJhl9tdF01jX8qAkKmiHtAyVM=; b=wqFm7z6yZdghzYvTyo0so+pmt/uwd32KoTYzf82vZtRLOGE8636kz8kpsHcZiJoRhn sW4D/ygBCIAcLKWKbABVu3yipTXFstR0+Ym0W2qo8Cp5R7bXWjw9ifD12Dk6FfvwqcmX daBMdir2HbjB8g2kfUQllch/uofEeoPjfcZeEWfdJCdfHj545lOXBWJrnUoQh1l1Fp1t 9SU5Paz9rO6Jc/DjR3yr++coIIMzgGTm4UEfZKqFYMrNVYG69cpl2xYWiEl6TJi8jL+Z rWX3aejea3kxdk+rwA/F2THKRZHmdirRuiQc/IttrMREtarRa+VrknqmcZ80WCLQctDg UN+g== Received: by 10.180.95.169 with SMTP id dl9mr6914726wib.20.1355070965780; Sun, 09 Dec 2012 08:36:05 -0800 (PST) Received: from localhost.localdomain (ARennes-256-1-76-30.w90-32.abo.wanadoo.fr. [90.32.155.30]) by mx.google.com with ESMTPS id fv2sm6587947wib.4.2012.12.09.08.36.04 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Dec 2012 08:36:05 -0800 (PST) From: "Yann E. MORIN" To: buildroot@busybox.net Date: Sun, 9 Dec 2012 17:35:02 +0100 Message-Id: <1355070924-8009-30-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1355070924-8009-1-git-send-email-yann.morin.1998@free.fr> References: <1355070924-8009-1-git-send-email-yann.morin.1998@free.fr> Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 29/51] package/qemu: add VNC TLS-encryption X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 c52568c..c85568d 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -97,6 +97,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 2513109..eb95611 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 \