From patchwork Wed Apr 25 06:03:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 319 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id MLAnABOn4FohZQAAIUCqbw for ; Wed, 25 Apr 2018 12:04:35 -0400 Received: from proxy8.mail.ord1d.rsapps.net ([172.30.191.6]) by director10.mail.ord1d.rsapps.net (Dovecot) with LMTP id tf9PAROn4Fr+NQAApN4f7A ; Wed, 25 Apr 2018 12:04:35 -0400 Received: from smtp9.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy8.mail.ord1d.rsapps.net with LMTP id +LQXIhOn4FoECwAAGdz6CA ; Wed, 25 Apr 2018 12:04:35 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp9.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 58a1e3fc-48a2-11e8-a930-525400bd3b1f-1-1 Received: from [216.105.38.7] ([216.105.38.7:26656] helo=lists.sourceforge.net) by smtp9.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id CB/A9-07488-217A0EA5; Wed, 25 Apr 2018 12:04:35 -0400 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.90_1) (envelope-from ) id 1fBMtC-0007A9-Dn; Wed, 25 Apr 2018 16:03:26 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1fBMtA-00079y-Jk for openvpn-devel@lists.sourceforge.net; Wed, 25 Apr 2018 16:03:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=YtQBDlSvyv7Omgq4J7rsE219LuSBqTH35NR1Wl0RoTI=; b=NyUNvkfMn6q4iylzt45I/pTwBs v+RFiP6dVSBmuZWWzspTAYRHZIMrSGjlQ3IYdOngftAdaEjyyO+0KYgRh8cqnOlTI5+SboxGjJMRR 0UwjQJnH7RbF2NWpUJjouZdn3t5rHIf6rgdilqJhYaoUN1U1oLkKD0G/mUdEMeQfERXc=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To :MIME-Version:Content-Type:Content-Transfer-Encoding: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=YtQBDlSvyv7Omgq4J7rsE219LuSBqTH35NR1Wl0RoTI=; b=R0dg4bu0P7G6jRkt4tPwE9Cvpb CHo5NjFqBpAPSSadP4w2sq018FX9VPFUb0AGLAsz6PBSnSE3qsTNI/w/ArMp7/Axrnn95B1iugj9p klGJ/IW57rUqH9wKizEJR/egLU8zBgu9dWEHC7RyWXAbbA9qVQIxkBNCsosvIh2YPlbI=; Received: from mail-it0-f66.google.com ([209.85.214.66]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1fBMt8-0077tM-U6 for openvpn-devel@lists.sourceforge.net; Wed, 25 Apr 2018 16:03:24 +0000 Received: by mail-it0-f66.google.com with SMTP id e20-v6so19987914itc.1 for ; Wed, 25 Apr 2018 09:03:22 -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=YtQBDlSvyv7Omgq4J7rsE219LuSBqTH35NR1Wl0RoTI=; b=iauuujbHUVpmI8h+JRQ6Li07lW5zY/+HDytKu4WTQTe+XT6W1DYdat/MDxVDPF2bJ1 ZcMxhZIBRswW7hdqKssSxEpGieeKHAiMPih1/RlXu8lH1ArhsjVKw9SyXO/wI0yK842s 0eGEoznmko2HcE96ivdDNYnDqYm9NAEU1oFywuqnoECD+fJ5BwcxZZqrkfOG4ltTWsoo Zn/n6447CVydlbFI4gHFnuz1jy1L4ofe1q5MwlNaHgmBZlGZfSh6o8sVFVtFIYEPqrns NqpwhPQmHK1Hjn2HegSIfavOgDBWrO/xzMTobRCTIO0Hdnafz3rnVt6Wom1O0HYqMLYv 3LUQ== 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=YtQBDlSvyv7Omgq4J7rsE219LuSBqTH35NR1Wl0RoTI=; b=bvAm3RvufJTCUXO7cDfyeNdgWemYhVdGUZdEVY8gBt56jaIzJ91RCu4av6SgCaZoNV 1JgJPeWKKqvyBlBMaxBynQ+oGZ8+cDzINgvFN628X1gnhRTdIgxkWblj/eqeDgBp/DKd CvTMBdEYEK1BTS0F3WiK3DOXuEpEGap5UY9cCLdT7IfUrURqCkfCjZwziGBw/inoyt8i rARibh6HQYN9goO08H+6cI7k0bV44zmmFlbaKB1ArPbhfn2T1GrOJbnx8K9TZnbRvhBc a/yf7sgTg1jN0k9Rw4t8YqxJU2G/SMjY8jGoiWQuckv1BekBVjqamzajvABxe3EqYDf3 kKhg== X-Gm-Message-State: ALQs6tDeu7xDk5c5TkmsdmNYfYkcIxhYr27YOOb5boyG2Ah5dtfDbC49 1HqSdC3jhMWj+XPC31r/PZZX4W0b X-Google-Smtp-Source: AIpwx4+Siz0/ZSYTEgfGkJtlkz61JyoHAn5hH7dsgfY1bUmDh1diAupJkJRgqpcaZrbSJ6s4+CvHlQ== X-Received: by 2002:a24:d8f:: with SMTP id 137-v6mr24661818itx.30.1524672195662; Wed, 25 Apr 2018 09:03:15 -0700 (PDT) Received: from saturn.home.sansel.ca (CPE40167ea0e1c2-CM788df74daaa0.cpe.net.cable.rogers.com. [99.228.215.92]) by smtp.gmail.com with ESMTPSA id b66-v6sm6822211itb.3.2018.04.25.09.03.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Apr 2018 09:03:15 -0700 (PDT) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Wed, 25 Apr 2018 12:03:11 -0400 Message-Id: <1524672191-25259-1-git-send-email-selva.nair@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1524623120-23498-1-git-send-email-selva.nair@gmail.com> References: <1524623120-23498-1-git-send-email-selva.nair@gmail.com> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.214.66 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (selva.nair[at]gmail.com) -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.214.66 listed in wl.mailspike.net] -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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Headers-End: 1fBMt8-0077tM-U6 Subject: [Openvpn-devel] [PATCH tap-windows6, v2] Have the driver version display as major.minor.revision.build 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Selva Nair The driver version (taken from the INF) and the file version of tap0901.sys file (from its resource) will now display like 9.22.1.601. The driver details tab will continue to show the text form of the version as "major.minor.revision major/minor". Eg., "9.22.1 9/22" Signed-off-by: Selva Nair --- v2: reverted the date back to 04/15/2018 assuming both version and date will be changed at release time Note: PRODUCT_VERSION_RESOURCE in version.m4 appears to be unused, so it may be an unnecessary burden to keep it up to date? FWIW, I've updated it to the 9,22,1,601 form. Not sure this should be submitted as a PR or like this.. An image showing the version is here https://user-images.githubusercontent.com/3981391/39222715-29500c5a-480c-11e8-823a-73328baf69dd.PNG But I would like to test again using a properly signed version src/OemVista.inf.in | 2 +- src/config.h.in | 2 ++ src/resource.rc | 2 +- version.m4 | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/OemVista.inf.in b/src/OemVista.inf.in index 004ed62..26152f5 100644 --- a/src/OemVista.inf.in +++ b/src/OemVista.inf.in @@ -55,7 +55,7 @@ ; This version number should match the version ; number given in SOURCES. - DriverVer=@PRODUCT_TAP_WIN_RELDATE@,@PRODUCT_TAP_WIN_MAJOR@.00.00.@PRODUCT_TAP_WIN_MINOR@ + DriverVer=@PRODUCT_TAP_WIN_RELDATE@,@PRODUCT_TAP_WIN_MAJOR@.@PRODUCT_TAP_WIN_MINOR@.@PRODUCT_TAP_WIN_REVISION@.@PRODUCT_TAP_WIN_BUILD@ [Strings] DeviceDescription = "@PRODUCT_TAP_WIN_DEVICE_DESCRIPTION@" diff --git a/src/config.h.in b/src/config.h.in index 322afa8..c013348 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -7,3 +7,5 @@ #define PRODUCT_TAP_WIN_PROVIDER "@PRODUCT_TAP_WIN_PROVIDER@" #define PRODUCT_TAP_WIN_DEVICE_DESCRIPTION "@PRODUCT_TAP_WIN_DEVICE_DESCRIPTION@" #define PRODUCT_TAP_WIN_RELDATE "@PRODUCT_TAP_WIN_RELDATE@" +#define PRODUCT_TAP_WIN_REVISION @PRODUCT_TAP_WIN_REVISION@ +#define PRODUCT_TAP_WIN_BUILD @PRODUCT_TAP_WIN_BUILD@ diff --git a/src/resource.rc b/src/resource.rc index 3c40d03..229e437 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -44,7 +44,7 @@ #define VER_PRODUCTNAME_STR VER_FILEDESCRIPTION_STR -#define VER_PRODUCTVERSION PRODUCT_TAP_WIN_MAJOR,00,00,PRODUCT_TAP_WIN_MINOR +#define VER_PRODUCTVERSION PRODUCT_TAP_WIN_MAJOR,PRODUCT_TAP_WIN_MINOR,PRODUCT_TAP_WIN_REVISION,PRODUCT_TAP_WIN_BUILD #define XSTR(s) STR(s) #define STR(s) #s diff --git a/version.m4 b/version.m4 index 1d7f92e..027167c 100644 --- a/version.m4 +++ b/version.m4 @@ -2,7 +2,7 @@ dnl define the TAP version define([PRODUCT_NAME], [TAP-Windows]) define([PRODUCT_PUBLISHER], [OpenVPN Technologies, Inc.]) define([PRODUCT_VERSION], [9.22.1]) -define([PRODUCT_VERSION_RESOURCE], [9,0,0,22]) +define([PRODUCT_VERSION_RESOURCE], [9,22,1,601]) define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901]) define([PRODUCT_TAP_WIN_MAJOR], [9]) define([PRODUCT_TAP_WIN_MINOR], [22])