From patchwork Fri Dec 16 09:07:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 2923 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp1026104dyk; Fri, 16 Dec 2022 01:08:38 -0800 (PST) X-Google-Smtp-Source: AA0mqf6ZWTycaGMe1UHIdW1jU/Yf98wWQV7M9bL9LnOaPP2y/+7rZSCDD/0Tq61qF5kSLLWNb/bc X-Received: by 2002:a05:6a20:cb59:b0:ac:3853:cacd with SMTP id hd25-20020a056a20cb5900b000ac3853cacdmr32157308pzb.38.1671181717794; Fri, 16 Dec 2022 01:08:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671181717; cv=none; d=google.com; s=arc-20160816; b=HVFI9xkfvOtAWkT4qBJRnUjDMLszdnms3vs1/7Zi14H1aKrpX3J6TR+Ewg6WeXr0rj UjglC7rENmj6hVklu8eDnvwidiHydBriJppoQGwvgZu88/UbxNiabCfRxdcaadamzrr2 2Tz4Zsu9QHGpkM7hAG6brLbSOIYEKJNvXEK0aaIp3eLE/tavka8oGfNgPHciTgJVm2R0 VyZ2PdkYOXFRjfPLpgQqe6OHyvPnk/9jxsCyvun8mZG89uKPjhLHJMH47QvA/56ckyKP tPdov8mkm88Y69k580pxDexJxOJ31TmbPVYNLFq5urwvAFbWpulkPj2+iN5oMDmlrpAW Ah/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:cc: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 :dkim-signature; bh=T9BPp99EQudfJ34ghLMSQcDMydELpGnwZAFVkwEPzT4=; b=yAGf18cFBM1A/9wQQybZTCbzlRZfjwiK/+276HvVha6uW1sbzERTKCLWuT3BErlKze 6nMxBRs22+Q0sVcfeTZvQMAcVJ2oqNyp5+r6MNfGlqKk3eYPWRt/YvZbQX4B4QgH6FnC QFFuaT8KN7n4PWWdqFyNFIrRVuRo6cAOpRl1dHE3LcusbVTq14iHRvkWdaZ+olj7oU0g VGX45m24V7eOnlm/4/bDtMNFQObijuSntyAPwBWuaC4y5uurZNSgIYpE/XBxF9K8qdLp +TStCeY9c/n0VHQ4KEkkkr325H4Ejbj+8H/iomG79MCRm+FzWXoTaQwdNGvM1MY8sUdx iOLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=bJ6lwB+P; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=dcYmmGRF; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pRJT5oy2; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id w4-20020a656944000000b004772bd7e38esi1971308pgq.868.2022.12.16.01.08.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Dec 2022 01:08:37 -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=bJ6lwB+P; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=dcYmmGRF; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pRJT5oy2; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com 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 1p66gy-0001I4-MA; Fri, 16 Dec 2022 09:07:44 +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 1p66gw-0001Hx-SN for openvpn-devel@lists.sourceforge.net; Fri, 16 Dec 2022 09:07:42 +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:Cc:To:From:Sender:Reply-To: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=VqC2YfuXCOkTHxzGQYFBY4pjwh7pKgvyzk3kjMkaScA=; b=bJ6lwB+PlGQX8/4lNcll+uGdmu 6xjpS1k38NFOB32sqX5v9lxDw8ZlFshBPQItZIYiidq7sMV/usThbf0Rc6vRt0f5F82ttE+I2rAD+ sAd/ScIbXreFylyANE+bXcN+UZYuvQKNWgpwcjH5lcYDJna+2lQ43ifAJnv9Kw0fVwDk=; 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:Cc:To:From :Sender:Reply-To: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=VqC2YfuXCOkTHxzGQYFBY4pjwh7pKgvyzk3kjMkaScA=; b=d cYmmGRFW3TZ+N8GJ6j9gL9vedIpf0ElSxQAWs2yJ2lUYid0P1aLGBRGa3yLB/iTP89SrIKvWkT/s0 8CoHdjJ9vtQ9YHhnuRPyruRXPWYgAbJFN6SXVd7X2jSSFTjA8HZGdSQfzPqzXX/S17q28LW7eOUVI 1c7EYYWXK0LBlRSI=; Received: from mail-wr1-f52.google.com ([209.85.221.52]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1p66gs-001DfW-TQ for openvpn-devel@lists.sourceforge.net; Fri, 16 Dec 2022 09:07:42 +0000 Received: by mail-wr1-f52.google.com with SMTP id h16so1790586wrz.12 for ; Fri, 16 Dec 2022 01:07:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=VqC2YfuXCOkTHxzGQYFBY4pjwh7pKgvyzk3kjMkaScA=; b=pRJT5oy2A9cmbtRwp+WZQxkf/b13R05Bq+DT8ux/34wHoWNx5u3xTMfhgPDaB+UTKO DzFQxUOFU0QOJjxlfZfwA5+rrxfaXGwsfey1MBcNJ734wSAPyjXYpMGtDXSodhODlS0c ngV7e0BWhD7qlfeY4F1K0gpxA4G808dj28Jt8IvqlssO+TkXR8ENbuyV1MDEwMJ0MH3c WS3EILheo/UcaohT+Ye+9aPmlOSbJB3ZjxidArsa23zlTwM32yt1ZTPFCiWP7bjo4mzS Ywo2K+xVppP7MC5Qe3aWDiOb1wgcFs+8NLVAMcdmdRt3gZkHadvRJC010y8LqADXKtvJ 4PJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=VqC2YfuXCOkTHxzGQYFBY4pjwh7pKgvyzk3kjMkaScA=; b=OyYSVWVQJa8bgpCYxrhTioIrlZtHzmFpV2I+LPRrdJa+vj2uGzDoyDKzCX8O6/OZyw yrYc3GGYpDkhjktnuS028UczB5m1QJRBKP9Ft7uxLFRLLyhkhkvE5Yti8vqcH6p0pK+y AKlIvGzzkhIT2oQhw6SupUxO/oyC2XjTsYzq1AJWDE7U/2zgxPlcYlGcz9DIui/QY3Rw yx6MLvLLSWiBw/G2jskgK4lGH098M5wbYdHv1v3BX7gT4tZxcBI59H3JWbAsy10M8l4o mBC8inlVS9jsXWVe/L1ZIbd7OZcEgRAE+QMxKEFd8OOol4x7T4mjYmZjDT379hYuI1Ly myvw== X-Gm-Message-State: ANoB5pk92un3034Uz56vRA/JaFKjY7Q+YGohEk+DMmAA92VkxJfxczc4 DpW43UWRu/edsguhNlISeabQPNE9RnI= X-Received: by 2002:a5d:4537:0:b0:242:4835:8e69 with SMTP id j23-20020a5d4537000000b0024248358e69mr18933891wra.46.1671181652160; Fri, 16 Dec 2022 01:07:32 -0800 (PST) Received: from localhost.localdomain (nat4.panoulu.net. [185.38.2.4]) by smtp.gmail.com with ESMTPSA id g15-20020a5d554f000000b00241da0e018dsm1702950wrw.29.2022.12.16.01.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 01:07:31 -0800 (PST) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Fri, 16 Dec 2022 11:07:17 +0200 Message-Id: <20221216090717.1082-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.38.1.windows.1 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: From: Lev Stipakov Git magic to get branch name git rev-parse --symbolic-full-name HEAD Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lstipakov[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -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_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.52 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.52 listed in list.dnswl.org] X-Headers-End: 1p66gs-001DfW-TQ Subject: [Openvpn-devel] [PATCH] git-version.py: use tag as branch name 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: , Cc: Lev Stipakov Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1752361041006577845?= X-GMAIL-MSGID: =?utf-8?q?1752361041006577845?= From: Lev Stipakov Git magic to get branch name git rev-parse --symbolic-full-name HEAD doesn't work when we're on tag, which is the case when we build releases. In this case, use tag name as branch name with another git magic: git describe --tags This fixes https://github.com/OpenVPN/openvpn/issues/199. Signed-off-by: Lev Stipakov --- build/msvc/msvc-generate/git-version.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/build/msvc/msvc-generate/git-version.py b/build/msvc/msvc-generate/git-version.py index 814dc86a..513f489a 100644 --- a/build/msvc/msvc-generate/git-version.py +++ b/build/msvc/msvc-generate/git-version.py @@ -30,9 +30,16 @@ def get_branch_commit_id(): if not commit_id: raise l = os.popen("git rev-parse --symbolic-full-name HEAD").read().split("/")[2:] - if not l: - l = ["none\n"] - branch = "/" .join(l)[:-1] + if l: + branch = "/" .join(l)[:-1] + else: + # are we on tag? + l = os.popen("git describe --tags").read() + if l: + branch = l[:-1] + else: + branch = "none" + return branch, commit_id def main():