From patchwork Fri Apr 27 10:26:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristof Provost via Openvpn-devel X-Patchwork-Id: 330 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id XN+cAdWH41rEIQAAIUCqbw for ; Fri, 27 Apr 2018 16:28:05 -0400 Received: from proxy7.mail.iad3b.rsapps.net ([172.31.255.6]) by director10.mail.ord1d.rsapps.net (Dovecot) with LMTP id CY4iAtWH41qUWAAApN4f7A ; Fri, 27 Apr 2018 16:28:05 -0400 Received: from smtp11.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy7.mail.iad3b.rsapps.net with LMTP id WHlUINWH41oFGAAAQkQ5tQ ; Fri, 27 Apr 2018 16:28:05 -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: smtp11.gate.iad3b.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=pass header.d=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=microsoft.com; dmarc=pass (p=none; dis=none) header.from=lists.sourceforge.net X-Suspicious-Flag: NO X-Classification-ID: 7cf99d90-4a59-11e8-8361-52540070b5bb-1-1 Received: from [216.105.38.7] ([216.105.38.7:59870] helo=lists.sourceforge.net) by smtp11.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 6F/11-23508-5D783EA5; Fri, 27 Apr 2018 16:28:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: Reply-To:From:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:MIME-Version:Message-ID:Date:To:Sender:Cc: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=UiiZMudJpSyAZNQNfNICs9O8wlBYgix+4Q1rEA/FsUs=; b=WmrTkxwhLTy9rN2wQVPVJcKWBS StpgyOKO3829o03myj5oTFVKvBXwcQyc8RkzsnsZ3kWCZ5IGsRZWmEpqU812ldT8lhi0UAgYV4Qg6 NP+TPzdqiMOE5r54b8mRsnqtbmpnxjOyKe3N4MxhW+epn+pcKgGsakiRC43vGe4yBVcY=; 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 1fC9xU-0007tm-3j; Fri, 27 Apr 2018 20:27:08 +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 1fC9xS-0007tg-3m for openvpn-devel@lists.sourceforge.net; Fri, 27 Apr 2018 20:27:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=MIME-Version:Content-Transfer-Encoding:Content-Type :Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc: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=6Tu5ERxGjuF5EYK9wN0+z+L4ZdObjEwURvgxUHpj59o=; b=OL+GN9CChPNVcDWv2VbdN4DsBJ ykQmMqOivvOQC8AHmFcj9+8aUi9J17uoM5gGOrghfuxVXiIEA4HRJjmv3/4sp4mvrdxrxTpF4MW+H EAwJMDuXFxrEvWJEde9alZNI5F/KVH9Fp5seDQMzuptYY8A87pm6375zwa454Am5jDPQ=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=MIME-Version:Content-Transfer-Encoding:Content-Type:Message-ID:Date: Subject:To:From:Sender:Reply-To:Cc: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=6Tu5ERxGjuF5EYK9wN0+z+L4ZdObjEwURvgxUHpj59o=; b=j F+IB6q3sK2W4fvR7KbJVu4EZEGoz2qwKQwAXKai8YTEzOL6kv4b19DBUjjBtVmw2ECpxeQxHlFYxV 5/n+S2yPcyoL2i5r6HpnKfoyuBiQodZ7FrVHgyLQv4AsVc2EU9sNbLBUKiAbu6GwukT1xIU5DQuCd NDKZr3hdPLTkCLNs=; Received: from mail-bl2nam02on0131.outbound.protection.outlook.com ([104.47.38.131] helo=NAM02-BL2-obe.outbound.protection.outlook.com) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) (Exim 4.90_1) id 1fC9xB-00EQFU-0S for openvpn-devel@lists.sourceforge.net; Fri, 27 Apr 2018 20:27:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=6Tu5ERxGjuF5EYK9wN0+z+L4ZdObjEwURvgxUHpj59o=; b=QZdzM2StPKnSp6VlkjNufAaqRBGGsRmKFexUv7xcKJT06bgikZgnxhDHI5vC4POvdghkdCGlpZV80nzVCai77bOOKQ3i32wEMuFQ9zA0C/CI2usVNO3vrkKM620Qb9sK++MM5YPEjrtAAwDCoYkUP9LXh7dT18hTTEfZ80QnX74= Received: from DM5PR21MB0185.namprd21.prod.outlook.com (10.173.173.136) by DM5PR21MB0124.namprd21.prod.outlook.com (10.173.173.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.755.0; Fri, 27 Apr 2018 20:26:42 +0000 Received: from DM5PR21MB0185.namprd21.prod.outlook.com ([fe80::7196:c6f0:2533:8836]) by DM5PR21MB0185.namprd21.prod.outlook.com ([fe80::7196:c6f0:2533:8836%2]) with mapi id 15.20.0735.006; Fri, 27 Apr 2018 20:26:41 +0000 To: "openvpn-devel@lists.sourceforge.net" Thread-Topic: [PATCH: tap-windows6] Fix missing PRODUCT_PUBLISHER field in installer Thread-Index: AdPeZQJNwgTpkdR9R+KBF5RExg/W3A== Date: Fri, 27 Apr 2018 20:26:40 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR21MB0124; 7:4Y49ypV0ErqZVUlfjGBkigmD8PmMwJu05j2avVCPNm6T24rz2PlW1o7MFvvOBn5xh9myZF4tFnkfc2T59FXYz5cMJzI9tKo+fE3WR3aBIGzVvUEacvri6OIMRPl02ZgCwK4npLtrHYrZrGYbxAuARhKx0DFbjaQPnGPORQXkUwG9Wt4tT4xoGfgm6P5GIspayNl7PCR2nqhkRhOxund3T4BpvnFC9g8kihmutDR4FPnrk5wOwpvL0iXr7cyr3d9s; 20:WSWgv/VFspIFxeRlqNqGy/fzRgbioFKWQreCkKhD8hKDYUz3IlSF/qkCXHEzUivd2Cxqz37Dhsp2o7c7UjrQswjBnMz7wHo4kq4gpAA1ihL9SbxaFRPRX7il0OCx1wVcfrYuDAYRFdrRtXQKDNcDj+ydVznX3sbSZlT7lxJDq0I= x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR21MB0124; x-ms-traffictypediagnostic: DM5PR21MB0124: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(166708455590820); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231232)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011); SRVR:DM5PR21MB0124; BCL:0; PCL:0; RULEID:; SRVR:DM5PR21MB0124; x-forefront-prvs: 0655F9F006 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(346002)(396003)(366004)(39380400002)(376002)(53754006)(199004)(189003)(5250100002)(46003)(486006)(2501003)(59450400001)(6506007)(53546011)(10090500001)(102836004)(2351001)(6116002)(68736007)(33656002)(6916009)(7736002)(7696005)(5640700003)(305945005)(6436002)(8990500004)(476003)(99286004)(3280700002)(966005)(25786009)(8936002)(106356001)(10290500003)(86612001)(6306002)(81156014)(81166006)(55016002)(3660700001)(97736004)(14454004)(2906002)(5660300001)(74316002)(316002)(22452003)(105586002)(478600001)(186003)(2900100001)(9686003)(53936002)(86362001)(8676002)(460985005); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR21MB0124; H:DM5PR21MB0185.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: kaEalYbrpoP7VtNlq19KMtbWenbCmgatZpUKGBaVgbiHr95ehR/gKYiR3VAOHERQljDT4bz6EWJWC3XhSuyidiiZcAAZLE0SLncxfnj7jTOtSUoxYrM76IWfplF8kjEvnmFUkLv5qSnBOIINWIAUpzOo4Y0Z51VLkqvuaCQpyWnLelEI9zuxfL1bVY3GD4SQ spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 90c81c77-a414-4b1e-c28c-08d5ac7d2ff0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 90c81c77-a414-4b1e-c28c-08d5ac7d2ff0 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Apr 2018 20:26:41.6689 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR21MB0124 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -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 X-Headers-End: 1fC9xB-00EQFU-0S Subject: [Openvpn-devel] [PATCH: tap-windows6] Fix missing PRODUCT_PUBLISHER field in installer 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: , X-Patchwork-Original-From: Jon Kunkee via Openvpn-devel From: Kristof Provost via Openvpn-devel Reply-To: Jon Kunkee Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox Hi all, While working on ARM64 tap-windows6, I came up with this quick fix for a minor issue recently reported via IRC. This is also a Github PR: https://github.com/OpenVPN/tap-windows6/pull/51 (The ARM64 work is still underway; I'll start a separate thread about its current state in a few hours.) Thanks, Jon From 6eee7713363947083e76dbe5cf2ebf8eaf3936df Mon Sep 17 00:00:00 2001 From: Jon Kunkee Date: Fri, 27 Apr 2018 12:01:07 -0700 Subject: [PATCH: tap-windows6] Fix missing PRODUCT_PUBLISHER field in installer On Windows, the Product Publisher in Programs and Features is listed as `${PRODUCT_PUBLISHER}` instead of "OpenVPN Technologies, Inc." as reported on IRC. This patch adds the `PRODUCT_PUBLISHER` variable to the buildtap.py invocation of MakeNSIS. It also allows for `MakeNSIS` invocations with spaces in them. --- buildtap.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildtap.py b/buildtap.py index 6f506cd..9154ea7 100644 --- a/buildtap.py +++ b/buildtap.py @@ -328,13 +328,14 @@ class BuildTAPWindows(object): installer_type = "-oas" installer_file=os.path.join(self.top, 'tap-windows'+installer_type+'-'+kv['PRODUCT_VERSION']+'-I'+kv['PRODUCT_TAP_WIN_BUILD']+'.exe') - installer_cmd = "\"%s\" -DDEVCON32=%s -DDEVCON64=%s -DDEVCON_BASENAME=%s -DPRODUCT_TAP_WIN_COMPONENT_ID=%s -DPRODUCT_NAME=%s -DPRODUCT_VERSION=%s -DPRODUCT_TAP_WIN_BUILD=%s -DOUTPUT=%s -DIMAGE=%s %s" % \ + installer_cmd = "\"\"%s\" -DDEVCON32=%s -DDEVCON64=%s -DDEVCON_BASENAME=%s -DPRODUCT_TAP_WIN_COMPONENT_ID=%s -DPRODUCT_NAME=%s -DPRODUCT_PUBLISHER=\"%s\" -DPRODUCT_VERSION=%s -DPRODUCT_TAP_WIN_BUILD=%s -DOUTPUT=%s -DIMAGE=%s %s\"" % \ (self.makensis, self.tifile(x64=False), self.tifile(x64=True), 'tapinstall.exe', kv['PRODUCT_TAP_WIN_COMPONENT_ID'], kv['PRODUCT_NAME'], + kv['PRODUCT_PUBLISHER'], kv['PRODUCT_VERSION'], kv['PRODUCT_TAP_WIN_BUILD'], installer_file,