From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 602CBE00924; Mon, 28 Nov 2016 01:31:37 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 X-Spam-HAM-Report: * -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no * trust * [209.85.210.193 listed in list.dnswl.org] * 0.5 RCVD_IN_SORBS_SPAM RBL: SORBS: sender is a spam source * [209.85.210.193 listed in dnsbl.sorbs.net] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mail-wj0-f193.google.com (mail-wj0-f193.google.com [209.85.210.193]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 28C4BE00724 for ; Mon, 28 Nov 2016 01:31:33 -0800 (PST) Received: by mail-wj0-f193.google.com with SMTP id jb2so13225774wjb.3 for ; Mon, 28 Nov 2016 01:31:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gRvgmHUjNijoUTCmUtH8WUjrhWT11g8b0QiYbmgOQN0=; b=CngRzuskzYfktVgHFJQvrF33LXc3ljeH1RP02/dul2DPR2Th8f642ujRf+ia3AusMC C6ay4Tu9YdElmx+D0lBmOQDtB91wMVku/3vaXCiRTWbdc4rmJFC4uYEoqhOvHcznMegi /XxZK9tuZ+qZCksgZp8pKvVSnx4V4MRzM6YesavapDkxe2M/kHAEh89GDUF74rFjBI1R J75AG+xaEbZlelJZJq2ntwvK/Ck2TE2OwXUm8kEs4r8+bWbLsa0WDY/1sXBz2Nr7h3t8 bId96ArbHFlnbTmqwk+2ETQyHMB62NIzxwqEheRfI+17IyHeU5o/NLAR+KkWg8WoFeYq 8OVA== X-Gm-Message-State: AKaTC00aqoJigGMRHob0FUi5+pg25aOswPZKRJic0QgEJsDijarDgGMadWyymmjjv+U0bA== X-Received: by 10.194.7.233 with SMTP id m9mr17473043wja.108.1480325492428; Mon, 28 Nov 2016 01:31:32 -0800 (PST) Received: from tfsielt31850.tycofs.com ([77.107.218.170]) by smtp.gmail.com with ESMTPSA id x5sm61398495wje.36.2016.11.28.01.31.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Nov 2016 01:31:31 -0800 (PST) From: =?UTF-8?q?Andr=C3=A9=20Draszik?= To: yocto@yoctoproject.org Date: Mon, 28 Nov 2016 09:31:30 +0000 Message-Id: <20161128093130.17727-1-git@andred.net> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161125162903.19626-1-git@andred.net> References: <20161125162903.19626-1-git@andred.net> MIME-Version: 1.0 Subject: [meta-security][PATCH v2] trousers: fix musl compilation X-BeenThere: yocto@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Discussion of all things Yocto Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2016 09:31:37 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: André Draszik Backport patches to fix compilation. Signed-off-by: André Draszik --- ...t-getpwent_r-is-available-before-using-it.patch | 85 ++++++++++++++++++++++ ...si_param.c-Include-limits.h-for-POSIX_MAX.patch | 36 +++++++++ recipes-tpm/trousers/trousers_0.3.13.bb | 2 + 3 files changed, 123 insertions(+) create mode 100644 recipes-tpm/trousers/files/0001-Check-that-getpwent_r-is-available-before-using-it.patch create mode 100644 recipes-tpm/trousers/files/0001-tsp_tcsi_param.c-Include-limits.h-for-POSIX_MAX.patch diff --git a/recipes-tpm/trousers/files/0001-Check-that-getpwent_r-is-available-before-using-it.patch b/recipes-tpm/trousers/files/0001-Check-that-getpwent_r-is-available-before-using-it.patch new file mode 100644 index 0000000..e7ba2eb --- /dev/null +++ b/recipes-tpm/trousers/files/0001-Check-that-getpwent_r-is-available-before-using-it.patch @@ -0,0 +1,85 @@ +From bb721b0ae5882992037153e7257791101172556e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?No=C3=A9=20Rubinstein?= +Date: Wed, 24 Aug 2016 18:55:25 +0200 +Subject: [PATCH] Check that getpwent_r is available before using it +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes building trousers with musl + +Signed-off-by: Noé Rubinstein +--- +Upstream-Status: Inappropriate [not author https://git.busybox.net/buildroot/plain/package/trousers/0004-Check-that-getpwent_r-is-available-before-using-it.patch] +Signed-off-by: André Draszik + configure.in | 4 ++++ + src/tspi/ps/tspps.c | 10 +++++----- + 2 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/configure.in b/configure.in +index add23dc..cfdfcaa 100644 +--- a/configure.in ++++ b/configure.in +@@ -144,6 +144,10 @@ else + AC_MSG_ERROR(["gtk", "openssl" and "none" are the only supported gui options for trousers]) + fi + ++# Look for getpwent_r. If it is not found, getpwent will be used instead, with ++# an additional mutex. ++AC_CHECK_FUNC(getpwent_r, [AC_DEFINE(HAVE_GETPWENT_R)]) ++ + # + # The default port that the TCS daemon listens on + # +diff --git a/src/tspi/ps/tspps.c b/src/tspi/ps/tspps.c +index c6f9c3d..9d00d2a 100644 +--- a/src/tspi/ps/tspps.c ++++ b/src/tspi/ps/tspps.c +@@ -45,7 +45,7 @@ + + static int user_ps_fd = -1; + static MUTEX_DECLARE_INIT(user_ps_lock); +-#if (defined (__FreeBSD__) || defined (__OpenBSD__)) ++#ifndef HAVE_GETPWENT_R + static MUTEX_DECLARE_INIT(user_ps_path); + #endif + static struct flock fl; +@@ -60,7 +60,7 @@ get_user_ps_path(char **file) + TSS_RESULT result; + char *file_name = NULL, *home_dir = NULL; + struct passwd *pwp; +-#if (defined (__linux) || defined (linux) || defined(__GLIBC__)) ++#ifdef HAVE_GETPWENT_R + struct passwd pw; + #endif + struct stat stat_buf; +@@ -72,7 +72,7 @@ get_user_ps_path(char **file) + *file = strdup(file_name); + return (*file) ? TSS_SUCCESS : TSPERR(TSS_E_OUTOFMEMORY); + } +-#if (defined (__FreeBSD__) || defined (__OpenBSD__)) ++#ifndef HAVE_GETPWENT_R + MUTEX_LOCK(user_ps_path); + #endif + +@@ -90,7 +90,7 @@ get_user_ps_path(char **file) + #else + setpwent(); + while (1) { +-#if (defined (__linux) || defined (linux) || defined(__GLIBC__)) ++#ifdef HAVE_GETPWENT_R + rc = getpwent_r(&pw, buf, PASSWD_BUFSIZE, &pwp); + if (rc) { + LogDebugFn("USER PS: Error getting path to home directory: getpwent_r: %s", +@@ -99,7 +99,7 @@ get_user_ps_path(char **file) + return TSPERR(TSS_E_INTERNAL_ERROR); + } + +-#elif (defined (__FreeBSD__) || defined (__OpenBSD__)) ++#else + if ((pwp = getpwent()) == NULL) { + LogDebugFn("USER PS: Error getting path to home directory: getpwent: %s", + strerror(rc)); +-- +2.10.2 + diff --git a/recipes-tpm/trousers/files/0001-tsp_tcsi_param.c-Include-limits.h-for-POSIX_MAX.patch b/recipes-tpm/trousers/files/0001-tsp_tcsi_param.c-Include-limits.h-for-POSIX_MAX.patch new file mode 100644 index 0000000..c01040d --- /dev/null +++ b/recipes-tpm/trousers/files/0001-tsp_tcsi_param.c-Include-limits.h-for-POSIX_MAX.patch @@ -0,0 +1,36 @@ +From c1b5f33845c56dc7aef769c99758b4f77a041d43 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Wed, 31 Aug 2016 22:52:58 -0400 +Subject: [PATCH] tsp_tcsi_param.c: Include for POSIX_MAX +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use POSIX instead of glibc-specific header. +Fixes compilation with musl libc. + +Signed-off-by: Felix Janda +Reviewed-by: Hon Ching(Vicky) Lo + +--- +Upstream-Status: Backport [https://sourceforge.net/p/trousers/trousers/ci/59351a56cac1710e89d207dff07eb23bbc644c13/] +Signed-off-by: André Draszik + src/tspi/tsp_tcsi_param.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tspi/tsp_tcsi_param.c b/src/tspi/tsp_tcsi_param.c +index 670f86f..8f2b4e4 100644 +--- a/src/tspi/tsp_tcsi_param.c ++++ b/src/tspi/tsp_tcsi_param.c +@@ -11,7 +11,7 @@ + #include + #include + #include +-#include ++#include + #include "trousers/tss.h" + #include "trousers/trousers.h" + #include "trousers_types.h" +-- +2.10.2 + diff --git a/recipes-tpm/trousers/trousers_0.3.13.bb b/recipes-tpm/trousers/trousers_0.3.13.bb index 6853f18..a69f763 100644 --- a/recipes-tpm/trousers/trousers_0.3.13.bb +++ b/recipes-tpm/trousers/trousers_0.3.13.bb @@ -7,6 +7,8 @@ SECTION = "security/tpm" DEPENDS = "openssl" SRC_URI = "http://sourceforge.net/projects/trousers/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ + file://0001-tsp_tcsi_param.c-Include-limits.h-for-POSIX_MAX.patch \ + file://0001-Check-that-getpwent_r-is-available-before-using-it.patch \ file://07-read_data-not-inline.patch \ file://trousers.init.sh \ file://trousers-udev.rules \ -- 2.10.2