From patchwork Fri Feb 10 14:27:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 3073 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp1312631dyk; Fri, 10 Feb 2023 06:27:50 -0800 (PST) X-Google-Smtp-Source: AK7set8b3MSsnxVTgrDAMqyI7ir3QaZ7N60hGZSbg7iNdaBdtSvZu8OQdev6rgo/nRzJImJevWnw X-Received: by 2002:a17:90b:4d90:b0:22c:64f3:facd with SMTP id oj16-20020a17090b4d9000b0022c64f3facdmr16683811pjb.21.1676039270644; Fri, 10 Feb 2023 06:27:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676039270; cv=none; d=google.com; s=arc-20160816; b=XPzFuPToK6aTZ5yqvetbWngcAXb4dHgtagPr587FO3BfcyW75OHGjoukjd/3mgiONB IiTjYA+3Z1uLVQPbwPU75GrkUt8WWM3/qHttidH/rc0C9xVUsJQwzWcnnWOVS0HPTUur pmxfMLR4yUdgHsaDXFi4xH/IR6viQUkqocVzAaVjJ/NKPbAyl9TYyREAtXtu07qpBTS/ XKvnjjaQflCLfJBFpif6D5nF8a2JlIfujazImcKVeyzKpwB0Z83DItMANZqtpo98rFQe zXsBYcnBqLwuvPWlC5QJYINzK5SQ0N0sjUZ9B08kCzRgxxNBOOGOP9YK5vTCBp/z7p0/ 6OOQ== 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; bh=6B/SoQItic1w3hKAv+Z8ljKHxK/CdaXjbn0ZBIiD5EE=; b=zhJsmXP289wE4uh+Iebl8cvYDGKcQzstvGYorG1B+eZGDeSMMua1pvNU/Xr4y59rKG 3mmbt5cD4VQ2JrlxLIXDyEjNSMvSRUdE32P8wF2K0rcu7z2l20TYk8ek6CxdQoHpVRfA fiZ+8rYX/M+5fQzoGVMe4LY6sd/wGlBw4gYAudOl8/3u+ryKd4kvA0RJIZet+yZ5O5qL YmS7ibYmFA8i52dQj1OExQQswOT7ZgZfzIb5GtMME/RmEh8saRBG1taWmScc6u4VUCwY l9sEBcDF52RsLN4P6ChXmpOwd3VyEzxV+RYLsjulsSXuUadZwb0XMvBnaF8mOjem0sDZ ljeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=j0n5+0dm; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=BB149IaB; 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 k7-20020a635607000000b004fb1da0e663si4661271pgb.131.2023.02.10.06.27.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Feb 2023 06:27:50 -0800 (PST) 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=j0n5+0dm; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=BB149IaB; 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-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pQUND-0002iX-4A; Fri, 10 Feb 2023 14:27:35 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pQUN4-0002i7-VK for openvpn-devel@lists.sourceforge.net; Fri, 10 Feb 2023 14:27:27 +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=oWJ4Om40Ovx8WL9HKJiOWko99uRLRNNxDB7IKJBZwxs=; b=j0n5+0dmfFLoUVNzb+tZ5uWWDB lMJXDGg0GE3CNM7l18koxznc987vpRhTtHrb8x4i1sGMxPqyy9zn+Kptwryp6GmGNbGk1+hDZgegY EtTmcHbo3ekZRzsEoYFIHMsSeJMabJKlpmQT9+tAjBO0bV5bltnrMxt87oDNQkgZ2HBI=; 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=oWJ4Om40Ovx8WL9HKJiOWko99uRLRNNxDB7IKJBZwxs=; b=BB149IaBsZ3wjywnt7z9LbXuRD kpY6Phfq7IxixpDmkp7rWkwU38G0Xk3cGp3xE5ffcKNRyjavwSHzPoDfsFlAap3k7pTYox3my8YZl C+Q6+DJf3obkobwgMaXNnD/OncwXzNFlFh8HKjnKe8ekH3iJEiZQYhAOdG7Qsltf+j30=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pQUN1-00HHno-9R for openvpn-devel@lists.sourceforge.net; Fri, 10 Feb 2023 14:27:26 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1pQUMq-00051Y-5j for openvpn-devel@lists.sourceforge.net; Fri, 10 Feb 2023 15:27:12 +0100 Received: (nullmailer pid 572357 invoked by uid 10006); Fri, 10 Feb 2023 14:27:12 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Fri, 10 Feb 2023 15:27:07 +0100 Message-Id: <20230210142712.572303-4-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230210142712.572303-1-arne@rfc2549.org> References: <20230210142712.572303-1-arne@rfc2549.org> MIME-Version: 1.0 X-Spam-Score: 0.2 (/) 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: During the build of LibreSSL portable it pulls in a branch from OpenBSD upstream. Unfortunately they use master there instead of a fixed branch. So we work around this issue. Signed-off-by: Arne Schwabe --- .github/workflows/build.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) Content analysis details: (0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1pQUN1-00HHno-9R Subject: [Openvpn-devel] [PATCH] Fix LibreSSL not building in Github Actions 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?1757454554081871430?= X-GMAIL-MSGID: =?utf-8?q?1757454554081871430?= During the build of LibreSSL portable it pulls in a branch from OpenBSD upstream. Unfortunately they use master there instead of a fixed branch. So we work around this issue. Signed-off-by: Arne Schwabe --- .github/workflows/build.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 132624547..5888e91e5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -415,6 +415,14 @@ jobs: path: libressl repository: libressl-portable/portable ref: v3.7.0 + # LibreSSL has master in the OPENBSD_BRANCH by default even in the tagged releases + # Manually use the OpenBSD branch that is more appropiate and remove git pull that + # breaks when checking out a tag instead of branch + - name: "libressl: fix build" + run: | + echo libressl-v3.7.0 > OPENBSD_BRANCH + sed -i -e 's/ git pull --rebase//' update.sh + working-directory: libressl - name: "libressl: autogen.sh" run: ./autogen.sh working-directory: libressl