From patchwork Sun Dec 16 17:01:36 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: 206714 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 290AC2C007B for ; Mon, 17 Dec 2012 04:02:56 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5F962A00F4; Sun, 16 Dec 2012 17:02:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 80HXfj3oY47W; Sun, 16 Dec 2012 17:02:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 48ADDA010D; Sun, 16 Dec 2012 17:02:30 +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 551868F74B for ; Sun, 16 Dec 2012 17:02:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BD08080C10 for ; Sun, 16 Dec 2012 17:02:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G6HOQb1-Qgpp for ; Sun, 16 Dec 2012 17:02:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id B4B5180C0E for ; Sun, 16 Dec 2012 17:02:15 +0000 (UTC) Received: by mail-wg0-f43.google.com with SMTP id e12so2204639wge.10 for ; Sun, 16 Dec 2012 09:02:13 -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:in-reply-to:references; bh=AOxjhfvVB1VNgDIJgvYtVmWjTP0ZjQlje8AOiAW/enQ=; b=g5pwWSpd2ME5LtwaAbYnBJE+PzZe/9KVDeIwMRYHnoXqz9sXBh5arIx0JlY6e75lnQ gZyQCip8UUovtw9QCKOXGSrUh7VKQG0Bel6Z7Lp6Tt/drJJ13P3LvhzYtcFcFRkYE5GX /not1FM/Um5GVslz9Dy3gT8Z66ZtrT09eZAH9Iht9ycA8wO7IWDqRbNsM0QN4+bphYix 4+/XAkVl/hx6nG1mEf5XR24n6SzPmUU9vRlpvxZyLiYxR2wD16B9ZL0yv5sNB9cVdqdU oX/lnKE+1IEzTpPVUc1wQc8dive6WKGc0ha3+oZbigMwvQV7TB64BYVlZXaPGWPbBBB/ 9yBw== Received: by 10.194.92.180 with SMTP id cn20mr12742780wjb.51.1355677333880; Sun, 16 Dec 2012 09:02:13 -0800 (PST) Received: from localhost.localdomain (ARennes-256-1-41-119.w90-32.abo.wanadoo.fr. [90.32.24.119]) by mx.google.com with ESMTPS id w5sm7363031wif.11.2012.12.16.09.02.12 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 16 Dec 2012 09:02:13 -0800 (PST) From: "Yann E. MORIN" To: buildroot@busybox.net Date: Sun, 16 Dec 2012 18:01:36 +0100 Message-Id: <3a10c6e9032c9364e4a48708b078b22de28ba6bb.1355677144.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 07/27] 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 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 ca03069..8f3c0e9 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 \