From patchwork Thu Feb 9 16:31:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 3067 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp583244dyk; Thu, 9 Feb 2023 08:32:16 -0800 (PST) X-Google-Smtp-Source: AK7set8IfOC9nike6q2Dw5gIf0Yrd9X26VjNyihu+DjApCz+Fye0rFYaIbRivTQM+AUj3Iw2zZw2 X-Received: by 2002:a05:6a21:2c91:b0:bf:6cd3:9510 with SMTP id ua17-20020a056a212c9100b000bf6cd39510mr8819735pzb.24.1675960335801; Thu, 09 Feb 2023 08:32:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675960335; cv=none; d=google.com; s=arc-20160816; b=rRR6Xgoc+qTtOU1zAoc0sAEFUD3Wx8wI4RiZPMKpXgq+J5Wu/lobv9VMQhhnJ3Jp5E GbGBjbnPClbqvHUsnLZSWfq8PViRgfW1vQLU9JYTwLzMmlX65GwcZ8klI0byWvkTj4UT CFZcxlINn+MF7x7HyvaCNyYf64wuGQj8P5lLr+qLl3W2KUKi3UBE+xaWcZ8iR15oTcu1 tFo/DutxOhmUxCO+dUwOq94n1wRr3NqgrQIpwz6BZm2CGrqfdW2/ElJEOXlQ7niq8OHu P0spmk2SF0RCn221Cixomi4NwYsjtXMoV5RbBE3RzBq6VaKJ5slw3FY3Egtoi3BQ9SGQ LaPA== 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:message-id:date:to:from:dkim-signature:dkim-signature; bh=6B/SoQItic1w3hKAv+Z8ljKHxK/CdaXjbn0ZBIiD5EE=; b=mwouCzr46NlTgV8ARQtAoB0t5o0naWOM5DAHOaMsHWlZO9s1qhrtQWymp4iWFc2bh+ 324LFCrhtHwwlfII43JgWFAwP+cq/Y2ak5m4qsAWjt6RsmGi13jQ9GRDdTccUtCGWNAR pKoVsQ5iwYj0lR4kgecgcN0iXPTZTcG28WMvDX3UYlWd4T7YuDk0MVrMUZKAPjH08Uaq SoHqi4L5giHHh9B51LMPCQCWiiFOZMgJRxvIuWUzig1HojDUK+s7WG5gtJnqninC4N71 qdH4pJQmVmXXBjmGk3ubcDuEslFjDxbHn8LIB4VCh5aS2nHvn0SRobn3FG9d8//2tE9Q dpLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=SMFk0cFL; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=DoQZfi1b; 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 k195-20020a636fcc000000b004deb23c7b5bsi2030754pgc.716.2023.02.09.08.32.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Feb 2023 08:32:15 -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=SMFk0cFL; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=DoQZfi1b; 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 1pQ9pX-000120-Ta; Thu, 09 Feb 2023 16:31:27 +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 1pQ9pT-00011t-5P for openvpn-devel@lists.sourceforge.net; Thu, 09 Feb 2023 16:31:23 +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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=oWJ4Om40Ovx8WL9HKJiOWko99uRLRNNxDB7IKJBZwxs=; b=SMFk0cFLwFch0QyzG5fvK2G0vk c8Sf8DErV45/CamxidyC//KC5+wd/S1+FPPpfkIUDsjnrrLOM+8THEvPq7wM2D5tjvw5ssRToF5S9 zffGALvdgnMY3mpdrTtrDiSWexLsuo6aIvrSaU6U5R8nb7kvnI0wAr6wZLXSwKycEAqY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version: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:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=oWJ4Om40Ovx8WL9HKJiOWko99uRLRNNxDB7IKJBZwxs=; b=D oQZfi1bDCkNkSikmm6rQoc9gg4nOvWHv66/Dy/s146r37DoBah6GWKPI47IwdqaxAT+h5R6iqBz0t XVB3D8GWk1pu2qzjvsFsj21MhKUX+eNS+5qPosy+giEayCyNSdUaS8nesY8geWoTMui/pjwpf9+uO OA1JRB5QSDhpEycY=; 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 1pQ9pS-00GR3h-Eq for openvpn-devel@lists.sourceforge.net; Thu, 09 Feb 2023 16:31:23 +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 1pQ9pL-000Oqm-5A for openvpn-devel@lists.sourceforge.net; Thu, 09 Feb 2023 17:31:15 +0100 Received: (nullmailer pid 465594 invoked by uid 10006); Thu, 09 Feb 2023 16:31:15 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Thu, 9 Feb 2023 17:31:15 +0100 Message-Id: <20230209163115.465548-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Score: 0.3 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.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.3 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 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: update.sh] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1pQ9pS-00GR3h-Eq 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?1757371784927378765?= X-GMAIL-MSGID: =?utf-8?q?1757371784927378765?= 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 Acked-by: Gert Doering --- .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