From patchwork Fri Mar 31 15:42:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lichtenheld X-Patchwork-Id: 3182 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7301:5492:b0:b2:b40d:92f9 with SMTP id ab18csp568725dyc; Fri, 31 Mar 2023 08:43:22 -0700 (PDT) X-Google-Smtp-Source: AK7set+J6M+Kjm1ubPqnmbkGuC8lIV8aa3g5jHL+8QM/OFofyQ2YAEfEHnXO81dNaEZxjWROvbQl X-Received: by 2002:a05:6a20:29a0:b0:dd:f44a:2717 with SMTP id f32-20020a056a2029a000b000ddf44a2717mr22023765pzh.8.1680277402516; Fri, 31 Mar 2023 08:43:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680277402; cv=none; d=google.com; s=arc-20160816; b=OZKou/m3rI8lAAhf+v4sM5RE+Vt0FsWUV+2B7A5NXFqa+fVS4Lgwzpk0ngmvaUAZNi IenNEbEvGsB37GNeb4V5B1LQH/baoUpGrgWv838yMk2/bnTdopT2TGNyaCr2OKcxDIfp 4P8wMCjh3f0bkzGWnDEytHJ/FY2A2M2SIZkUSnDHL5Kvhn9/yzVroyZ3uIsXqOJS8i03 b2JYyKCnArcXHe33SOSWdIpq/NwCZNpWmPzj6vD5IA5FWHPaNK0SIH2gntkJC6C6iW01 m5uTfKFvVP5bzJDq2vIAzH3hnb0L3aFA7IcNk7aOKHlMFVdXi94Hr9JFSiV3yk3TrDOs j2DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature; bh=C//Qz9djw7cWIAqXPISqL3Bo2WInvL3r77dLstcRJc4=; b=eC2BSCyfyJzBWiugMedezW8FMyRaNNE7o1knj+uBVB1CQzh4FXaMXHlbmeLDUofdDI ctp6WKJ8s+h0SWD4KrGqeebSew2/U4VBuwDEhUdwOe6NnfkHVumzZLrWvTpvShetbSIt CC7rcsr68OsSGgMQyC6qK5qvWVvWeiiKJQmXws4qs18guAA5ENxexi3/ej30y0NJQ7LO V3dCYgb8dHX1eRosoVu4newLRjdJJRX55pfIz/qjla45Q4fEBRTjmc+Xj8NH+BQOBAzx rCdoruWNUOEDoDqxMHBafTCqMvyegUDDrkCpIR07y0VgP4iE0GJ6jCC3NV9ta0cjwmI+ XD0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=hYrWyGZB; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ZrNH8Zc3; dkim=neutral (body hash did not verify) header.i=@lichtenheld.com header.s=MBO0001 header.b=IWaKAEIW; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id bv70-20020a632e49000000b00513234112b7si2590541pgb.899.2023.03.31.08.43.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2023 08:43:22 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=hYrWyGZB; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ZrNH8Zc3; dkim=neutral (body hash did not verify) header.i=@lichtenheld.com header.s=MBO0001 header.b=IWaKAEIW; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1piGte-0006w0-3H; Fri, 31 Mar 2023 15:42:34 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1piGtb-0006vh-14 for openvpn-devel@lists.sourceforge.net; Fri, 31 Mar 2023 15:42:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=LHFZ6+ik7YYpwbqKIDcXi9ZRxECTeHmq1GPMsqhzOSo=; b=hYrWyGZBNNZkUthE0ejJYDB4Ik cYIOJpf68wDGtroeDHW5XFwPjR8Gvq8ziP4kkcOWB5lTTDgemi66K3XoEqyK2IxqMQbY1sr9o1Rsh fYsc4EwDK24GWBrU7eDF7y+8LMhpw1dsPcyqwkX/Z1hiPoc4X3U6NmLJfP3fSvSUJJSA=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=LHFZ6+ik7YYpwbqKIDcXi9ZRxECTeHmq1GPMsqhzOSo=; b=ZrNH8Zc3POvPgDPyoy5sIPinyI uWMc4h20ulBbli1FDLmNLvoxIkwrDpS0M8H64LLdwf0aw0y6E0WSLnUHsh8VbzzPTEXOMS4GEdeSz 6GwWY+Yu413eiuA/co5Vqkq6obP9AmqWS8VGZAGtTqyPuNcMVAz3FiMqCf0V0i5flb8M=; Received: from mout-p-202.mailbox.org ([80.241.56.172]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1piGtY-00B1sN-Rh for openvpn-devel@lists.sourceforge.net; Fri, 31 Mar 2023 15:42:31 +0000 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4Pp4Kh0W5Cz9sTt for ; Fri, 31 Mar 2023 17:42:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lichtenheld.com; s=MBO0001; t=1680277336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LHFZ6+ik7YYpwbqKIDcXi9ZRxECTeHmq1GPMsqhzOSo=; b=IWaKAEIWu52aVwXku47F10nLTtmYchDdgL5AWo0ENTuBI4/uxZ3eVuMWKoXohcu+5ERP2t sZ6ySm0Q1yuGMyYJtcIvBB40mOiilGJL/vhVHo5LYolFg2xJBsi5f3tNge2MbjJ0QdpAii eZe9nJcNmkWseT5aeVllNSkSXMVmRalVcBNKSFna5fHMO4ZhxqqYXqhJxicX7J4nRiN+Br cDrXo98BJK+EX7ruuOgoR/r2WCJ7yrOHDdpSFlY/aOk/kBe8iT3pT0LykywNk/Fj29pbFc u7DRQuG6rygJPRt+wyTF++GS7nRw837dNljQZ6hCYrnbzW3EbIu7RB6qJ16Zbw== From: Frank Lichtenheld To: openvpn-devel@lists.sourceforge.net Date: Fri, 31 Mar 2023 17:42:14 +0200 Message-Id: <20230331154214.613245-4-frank@lichtenheld.com> In-Reply-To: <20230331154214.613245-1-frank@lichtenheld.com> References: <20230331154214.613245-1-frank@lichtenheld.com> MIME-Version: 1.0 X-Spam-Score: -0.9 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: So it is easier to check the merge status. Change-Id: Ia1f8a8d26d4752a7dda1a20521c59ded06bc7c52 Signed-off-by: Frank Lichtenheld --- ...1-Allow-the-build-to-succeed-if-configured-with-disabl.patch | 2 ++ .../vcpkg-ports [...] Content analysis details: (-0.9 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.56.172 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1piGtY-00B1sN-Rh Subject: [Openvpn-devel] [PATCH 3/3] vcpkg-ports/pkcs11-helper: reference upstream PRs in patches X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1761898557331700944?= X-GMAIL-MSGID: =?utf-8?q?1761898557331700944?= So it is easier to check the merge status. Change-Id: Ia1f8a8d26d4752a7dda1a20521c59ded06bc7c52 Signed-off-by: Frank Lichtenheld Acked-by: Lev Stipakov --- ...1-Allow-the-build-to-succeed-if-configured-with-disabl.patch | 2 ++ .../vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch | 2 ++ .../pkcs11-helper/pkcs11-helper-002-dynamic_loader_flags.patch | 2 ++ 3 files changed, 6 insertions(+) diff --git a/contrib/vcpkg-ports/pkcs11-helper/0001-Allow-the-build-to-succeed-if-configured-with-disabl.patch b/contrib/vcpkg-ports/pkcs11-helper/0001-Allow-the-build-to-succeed-if-configured-with-disabl.patch index 102be4ec..16fa7042 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/0001-Allow-the-build-to-succeed-if-configured-with-disabl.patch +++ b/contrib/vcpkg-ports/pkcs11-helper/0001-Allow-the-build-to-succeed-if-configured-with-disabl.patch @@ -12,6 +12,8 @@ Signed-off-by: Frank Lichtenheld lib/Makefile.am | 2 ++ 2 files changed, 3 insertions(+) +upstream PR: https://github.com/OpenSC/pkcs11-helper/pull/62 + diff --git a/configure.ac b/configure.ac index a7e9760..f154ae3 100644 --- a/configure.ac diff --git a/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch b/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch index 84fba080..56e3486e 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch +++ b/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch @@ -1,3 +1,5 @@ +upstream PR: https://github.com/OpenSC/pkcs11-helper/pull/4 + commit 90590b02085edc3830bdfe0942a46c4e7bf3f1ab (HEAD -> master) Author: David Woodhouse Date: Thu Apr 30 14:58:24 2015 +0100 diff --git a/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-002-dynamic_loader_flags.patch b/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-002-dynamic_loader_flags.patch index 325dea8b..6d674581 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-002-dynamic_loader_flags.patch +++ b/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-002-dynamic_loader_flags.patch @@ -11,6 +11,8 @@ set original values as defaults, use verbatim (user-supplied) value lib/pkcs11h-core.c | 13 +++++++++++-- 3 files changed, 23 insertions(+), 3 deletions(-) +upstream PR: https://github.com/OpenSC/pkcs11-helper/pull/59 + diff --git a/include/pkcs11-helper-1.0/pkcs11h-core.h b/include/pkcs11-helper-1.0/pkcs11h-core.h index 9028c277..56f87718 100644 --- a/include/pkcs11-helper-1.0/pkcs11h-core.h