From patchwork Tue Apr 24 16:25:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 317 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 DEHgBmrn31opKwAAIUCqbw for ; Tue, 24 Apr 2018 22:26:50 -0400 Received: from proxy17.mail.ord1d.rsapps.net ([172.30.191.6]) by director10.mail.ord1d.rsapps.net (Dovecot) with LMTP id 88f9Jmrn31pXHQAApN4f7A ; Tue, 24 Apr 2018 22:26:50 -0400 Received: from smtp36.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy17.mail.ord1d.rsapps.net with LMTP id WOCHJmrn31osNQAAWC7mWg ; Tue, 24 Apr 2018 22:26:50 -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: smtp36.gate.ord1c.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: 1b8860f8-4830-11e8-bf62-5452006630bd-1-1 Received: from [216.105.38.7] ([216.105.38.7:32854] helo=lists.sourceforge.net) by smtp36.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id BB/32-04535-967EFDA5; Tue, 24 Apr 2018 22:26:50 -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 1fBA7h-0003zg-Pj; Wed, 25 Apr 2018 02:25:33 +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 1fBA7h-0003za-4w for openvpn-devel@lists.sourceforge.net; Wed, 25 Apr 2018 02:25:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Ogse8RJhHjrGL7ZPnpUKMpQIXc4PS4vQ7XxxtSN0rYI=; b=HZ5Bgcw0T3V5NaRur95Vudfm8j hN3nMIE8IgtL9OAi6vukKiETeVcIWXtMwMleopT8FMWADYr0/Es+Bz0si8RYdW6FsozM8AJ4GTlZW IGfYJdJpy90e/cVfFk2nn5NJwx41xdk6j5k1y/BTPC3b7LJb5n7NkfuxT6PTZKn/pZDw=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=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: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Ogse8RJhHjrGL7ZPnpUKMpQIXc4PS4vQ7XxxtSN0rYI=; b=l48MUwPsB4fQy3ejK3a//mpgKT tope6zOc02AARaHFS1KS48V38RtMDCGQBlijiyGou6gu8KqZ6EBWaBaJVNQdsXKVwiOkuJ0vKnRfg MzNd1Yv6Mq/ZRvayvk9HHR8T7WurZz3uI7jNvKxWznwwq571N9qudDRiw1H3CbSinuKE=; Received: from mail-it0-f68.google.com ([209.85.214.68]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1fBA7f-008B4n-Aq for openvpn-devel@lists.sourceforge.net; Wed, 25 Apr 2018 02:25:33 +0000 Received: by mail-it0-f68.google.com with SMTP id h143-v6so18157082ita.4 for ; Tue, 24 Apr 2018 19:25:31 -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; bh=Ogse8RJhHjrGL7ZPnpUKMpQIXc4PS4vQ7XxxtSN0rYI=; b=H8kysbXx5P2acCBTi1CHsSGS7fKORNvq7PIVqycLfanJTg9ew21pDoRqbwDrQFGJrc 9Uuzw1HmAYafaAKPayPL7+M1Oy9QSgH8MLDufUN7SSFRJB7HbKSuptSqvz6yqkvuFA8l dVe0LO1no29s5gVUrM7s+DE1UMNy0oFiacIHxClzhg1zQTVbXHhPrSIBrazQzJlY0q37 Mmw3f50pXoHA25zwYeLgjS+djt45yqKXvj0gFoOpHHekTiQD2o8Mc7y+pbyUxw6JuLft nRNeK2LGI7c5MSrkAn+7ZyDayHf2eHifhBA6damE4S7EOpdcxiEBzJPFyWRE0TMxCPCr jZDg== 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; bh=Ogse8RJhHjrGL7ZPnpUKMpQIXc4PS4vQ7XxxtSN0rYI=; b=SyvPoU74qB1Bk97Vr/Vo2TH3sKEbcR/lEL5kb6uBYO0P0tf08qiPZJmjYpztA5379B m+ZaHVEZxfm6JS54lpVrOI1r8XLwliKzFgPZRdY6lHQQGsmw+yFrcCxoO7j40gM7XfiB ArIzaohM4KUEub5dfAzZyafZyNvtFEFVAezme4giDFZDW3J/mJqQlWExuId9cVVC+zA1 OoctmrP4HwLzdq37xt8PZK1OxGNTq6xvmQm4OdVnDGjQSrbVNBSYdil7cNCQ7nSB1ibM 5qMOCtzQvMQHkekPkzg8IgogtCXbxn8QzalVx5r4Egya22FQeRxV7V2MfDcVzXYytnk2 PWRQ== X-Gm-Message-State: ALQs6tBQpc383KH5AvUpN0gIXAl8XjHyyZKcD3EhBlEiwL+x4GHsBF4M 36O5tgpnmCwNLjYY09uYttqFzia1 X-Google-Smtp-Source: AB8JxZqL8kH8tj4qOjVbw1wIUk2l1PJaqM/MY2OnJMhbewqlHJifojs1gLBDs7AiqX43WbaTavQ8Rg== X-Received: by 2002:a24:b915:: with SMTP id w21-v6mr14644816ite.53.1524623125500; Tue, 24 Apr 2018 19:25:25 -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 u188-v6sm6129082itb.44.2018.04.24.19.25.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Apr 2018 19:25:24 -0700 (PDT) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Tue, 24 Apr 2018 22:25:20 -0400 Message-Id: <1524623120-23498-1-git-send-email-selva.nair@gmail.com> X-Mailer: git-send-email 2.1.4 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (selva.nair[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.214.68 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.214.68 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: 1fBA7f-008B4n-Aq Subject: [Openvpn-devel] [PATCH tap-windows6] 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 --- 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 | 4 ++-- 4 files changed, 6 insertions(+), 4 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..955b418 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]) @@ -11,4 +11,4 @@ define([PRODUCT_TAP_WIN_BUILD], [601]) define([PRODUCT_TAP_WIN_PROVIDER], [TAP-Windows Provider V9]) define([PRODUCT_TAP_WIN_CHARACTERISTICS], [0x81]) define([PRODUCT_TAP_WIN_DEVICE_DESCRIPTION], [TAP-Windows Adapter V9]) -define([PRODUCT_TAP_WIN_RELDATE], [04/15/2018]) +define([PRODUCT_TAP_WIN_RELDATE], [04/24/2018])