From patchwork Mon Mar 19 06:02:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 132000 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2341456ljb; Sun, 18 Mar 2018 23:04:16 -0700 (PDT) X-Google-Smtp-Source: AG47ELs+kFQMPxLQ1DUdKPl1yjYJ3QbaoghuEWbRXP38UQcQExAT9dirU/Ay+seSSZL0Hs8O4RxY X-Received: by 2002:a17:902:8a4:: with SMTP id 33-v6mr11572375pll.274.1521439456541; Sun, 18 Mar 2018 23:04:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521439456; cv=none; d=google.com; s=arc-20160816; b=WSNtLmjL3FewNyzERUx9JdX3e1l27GKAkz2UpkvfXpMDtn1+e0v0Ygz7OpFmO+WFar M9gEWRmAg2Xg+LiUD0hnF8+NwL+ZmeJq+bORF3dg5dz2Lm6VIhXu22d57l6PA5/4mMmp SkYSFUl/65hb8hWX0rfy248oAp8nsi04qBt1cqQLEneUFvGiABevd9jkjAvTc4a8SAuk NScZQQGXbAIclUClyxNew2eD2/Wose/xc5GSDn010r2fk/a/lWpwAcj5j5baMGl4fp5K YxtdqG3w13xFpL/tqNuubW3aPodF7UaHU0W5VxbwD7WSgb1rr/nGMs+e6Inhgt2yMsOY xymA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=8LUOS0Y95DT1zISoD7gfj0UNRgiNwRcWGhhltJDvppc=; b=hS8o8a3Jjb/n3EjqJZYDaS7tBWZVtKnok+iPTWgLShfPkpB71TM5kZt2hLytCqmmMP 995kDYt/uPvXKhM/G9OrT7avBaByyCqkH17xmr02o14k+Lm/KZE+DCCQxSb0Wi2hnXdl 7d/pljfOowF/DPVqMbJx3hVIplX0672GkJLLYMz/YHys3aeUJJ3lwSNUE1FaKthsyw0j fH+wkAkVSOBKwRR1J3armEqD+zcQVUW6HpEn6WPpd+E+eVqeJkXaTo52DM+vI0l8mSIS 6xp4+EDPh5ZB3YG+cfwyUne2HPlSx7eVz+sLXbyBw25d+n6+0B60LMHXmOf5LpdS6eg8 oTIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=uJ7yMNmh; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w5-v6si11294655plz.239.2018.03.18.23.04.16; Sun, 18 Mar 2018 23:04:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=uJ7yMNmh; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E484C7895F; Mon, 19 Mar 2018 06:03:53 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by mail.openembedded.org (Postfix) with ESMTP id 70417788F7 for ; Mon, 19 Mar 2018 06:03:18 +0000 (UTC) Received: by mail-pl0-f65.google.com with SMTP id n15-v6so1896109plp.12 for ; Sun, 18 Mar 2018 23:03:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3+MG1MwSms0eII7124PUAk2gkBc4VbYPtvdjsJ/5j5Q=; b=uJ7yMNmhNvOlTWHKml15McyJf1QR6J/vMTCX0tSTGqYDW66VtSyx4M8T7AqXJwVLtJ T0fKXPam6xlr8/oqJX4LqvlxummpLPHBXt6UlJt9vwYucpEzTVG+gSMu+2mANoW5cm3r L1mJg80e2RSpkZ1Y615NWvatAs6mggM4PpdElQX0w+FwAhw6FkW+NhpCSO6jKIjWB9EY NtvnaVZrbY6TQ5YtTkS+CxE3h24ZrQNUL37zxXKrap/uT5dEgnl6GWIkwJx1378a4wMt NsTH0kjwMVbFQ4CmbWjRcaLKueV1dBSBYZOexn+2ikxdqpIvNWtCOZeBPG8nw9pwRgPf Lvqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3+MG1MwSms0eII7124PUAk2gkBc4VbYPtvdjsJ/5j5Q=; b=GIGQ6+eR+hy+9AEQqH1Br8A+gvoGCcNDwOh08eTH+BB8llBuKFPNdqD9rhi7/5lQ/v YPx8mnbPJI+c7/G+p0JOol2pk2ZHpSgPvqYBYUrzX6ez0ajpoObLih7P3x0b0VDRUXtL 1K0KDjfad4qOYYTZIyHumPLOgEq/Wc8tUD3DE5hYlDfVns684hopzjxeik963GrkeKQe 03ogQa/+W3Odph5lZ98qxlW5rnWQlb10p7Pt8dj2gTGflLVy0U9wRp7OjOPwIxGQYBG6 ontzVGCTakyEqe8GaerfKJZE1RcWQRxoeyQGzNgxj9PEG/66ts7kYlT1zRH9fmPrN0UV N2aw== X-Gm-Message-State: AElRT7ESzZmsXdRXoiTAh3hS1gda6jyQ0p6DZB4sSziubULwNhSSUUs/ MOcAUCtIKAvGfqa5WV/AZ8mg1g== X-Received: by 2002:a17:902:10d:: with SMTP id 13-v6mr10965326plb.266.1521439399571; Sun, 18 Mar 2018 23:03:19 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8880:466c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id a22sm5047426pgw.10.2018.03.18.23.03.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Mar 2018 23:03:18 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 18 Mar 2018 23:02:47 -0700 Message-Id: <20180319060300.5366-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319060300.5366-1-raj.khem@gmail.com> References: <20180319060300.5366-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 05/18] samba: Refresh musl pam patch X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org last update left the musl builds broken since the patch was not forward ported Signed-off-by: Khem Raj --- .../{samba-4.2.7-pam.patch => samba-pam.patch} | 21 +++++++++++---------- .../recipes-connectivity/samba/samba_4.7.0.bb | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) rename meta-networking/recipes-connectivity/samba/samba/{samba-4.2.7-pam.patch => samba-pam.patch} (73%) -- 2.16.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch similarity index 73% rename from meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch rename to meta-networking/recipes-connectivity/samba/samba/samba-pam.patch index 6b9ade920..0cbacb6c0 100644 --- a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch +++ b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch @@ -4,12 +4,11 @@ http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch Signed-off-by: Khem Raj - -Index: samba-4.4.5/source3/wscript +Index: samba-4.7.0/source3/wscript =================================================================== ---- samba-4.4.5.orig/source3/wscript -+++ samba-4.4.5/source3/wscript -@@ -873,7 +873,7 @@ msg.msg_accrightslen = sizeof(fd); +--- samba-4.7.0.orig/source3/wscript ++++ samba-4.7.0/source3/wscript +@@ -875,7 +875,7 @@ msg.msg_accrightslen = sizeof(fd); if conf.env.with_iconv: conf.DEFINE('HAVE_ICONV', 1) @@ -18,10 +17,10 @@ Index: samba-4.4.5/source3/wscript use_pam=True conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): -@@ -945,6 +945,15 @@ int i; i = PAM_RADIO_TYPE; - if use_pam: - conf.DEFINE('WITH_PAM', 1) - conf.DEFINE('WITH_PAM_MODULES', 1) +@@ -952,6 +952,17 @@ int i; i = PAM_RADIO_TYPE; + "or headers not found. Use --without-pam to disable " + "PAM support."); + + else: + Logs.warn("PAM disabled") + use_pam=False @@ -31,6 +30,8 @@ Index: samba-4.4.5/source3/wscript + conf.undefine('PAM_RHOST') + conf.undefine('PAM_TTY') + conf.undefine('HAVE_PAM_PAM_APPL_H') - ++ ++ seteuid = False + # diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb b/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb index 27918d2a0..a50b24de5 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb @@ -26,7 +26,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://volatiles.03_samba \ " SRC_URI_append_libc-musl = " \ - file://samba-4.2.7-pam.patch \ + file://samba-pam.patch \ file://samba-4.3.9-remove-getpwent_r.patch \ "