From patchwork Wed Jul 25 07:01:38 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: 429 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.27.255.51]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id j7quAD+tWFvPGAAAIUCqbw for ; Wed, 25 Jul 2018 13:02:55 -0400 Received: from proxy4.mail.iad3a.rsapps.net ([172.27.255.51]) by director12.mail.ord1d.rsapps.net (Dovecot) with LMTP id yzcACD+tWFvFHgAAIasKDg ; Wed, 25 Jul 2018 13:02:55 -0400 Received: from smtp31.gate.iad3a ([172.27.255.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy4.mail.iad3a.rsapps.net with LMTP id 6M3vGD+tWFt5dwAA8Zvu4w ; Wed, 25 Jul 2018 13:02:55 -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: smtp31.gate.iad3a.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: 923d5e76-902c-11e8-a826-5254003d9392-1-1 Received: from [216.105.38.7] ([216.105.38.7:3802] helo=lists.sourceforge.net) by smtp31.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id BD/5F-32712-E3DA85B5; Wed, 25 Jul 2018 13:02:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=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-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=+xezWAHbeFvIQlcSWahTJj+UzQ8Eaea/mUaAbCnR9UM=; b=fSWsimUWppAdzmQSOVm5GI35l2 32n+wsV/sxwwzn+wCt5Bgl3D5oxr7k/aduSmjummjPR7LA6pul3VSi+s8OxqELF1/scPqGlAwG7WT 9+DCgC3HwljbDQ+8nITNV4kZFeKXR446/Za3w01DJpGtrHIJILrfw2A4Y9P3GLYJ6Y8E=; Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1fiNAj-0004HA-C4; Wed, 25 Jul 2018 17:01:57 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1fiNAi-0004Gx-9t for openvpn-devel@lists.sourceforge.net; Wed, 25 Jul 2018 17:01:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=MIME-Version:Content-Type:Message-ID:Date:Subject: To:From:Sender:Reply-To:Cc: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=bBFMzqwoMZjXdfldKlqZunpzMqU6OMBcr0ZFoeHbiHM=; b=bVNEbv5hU2sB8HnGxHq4+1bJjR oH6UKnHpzXXmx4KK7hJrexyHG8hLAebVmYPjblzkUh0xP/j8jWZ/6WAPPI2h4gzTXxDo7Yes6Siwr LhxJ4m3KqTv/ltSX1PmNbZ88eZjXsu5TSCHd9Ri2c9WEP0xfrJL14yNTz04D1+fLqKt8=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=MIME-Version:Content-Type:Message-ID:Date:Subject:To:From:Sender:Reply-To :Cc: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=bBFMzqwoMZjXdfldKlqZunpzMqU6OMBcr0ZFoeHbiHM=; b=G 3ZAVmTPKWv+sKyX8MU6vsz2TJY3AIxA/G0KE8rtg1oM57Dw2QwxZhB7UH5POHahW9atb8bxT4lq1f RfVevUMuqkWSKHcj0wliHiumh7gnx4c9FUGzW20qmpySH/zG4mK4v7cBIuaoyJXQX/HZfq8ZDtG2p QqAnCqLY9XMTBHik=; Received: from mail-eopbgr680102.outbound.protection.outlook.com ([40.107.68.102] helo=NAM04-BN3-obe.outbound.protection.outlook.com) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) (Exim 4.90_1) id 1fiNAg-00BUcV-Id for openvpn-devel@lists.sourceforge.net; Wed, 25 Jul 2018 17:01:56 +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:X-MS-Exchange-SenderADCheck; bh=bBFMzqwoMZjXdfldKlqZunpzMqU6OMBcr0ZFoeHbiHM=; b=WA55jO9KldDYkhU456xc130eQjkDF7FjT/vp0QcQSkFI0yf1Q30g4kWcf4Qpe6SHJvx4yVitL8zWjyxedxm8JPWipnEPkFIuMwoCduiIF+CcXGdYalMq2bruvROOJ9cyHk7Pk0jDB5GFIQMepNVsAK6v+wq/R699frcyCwEf0ZE= Received: from BL0PR2101MB1058.namprd21.prod.outlook.com (52.132.24.16) by BL0PR2101MB0914.namprd21.prod.outlook.com (52.132.23.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1017.2; Wed, 25 Jul 2018 17:01:44 +0000 Received: from BL0PR2101MB1058.namprd21.prod.outlook.com ([fe80::178:4c86:5dda:c4db]) by BL0PR2101MB1058.namprd21.prod.outlook.com ([fe80::178:4c86:5dda:c4db%3]) with mapi id 15.20.1017.000; Wed, 25 Jul 2018 17:01:44 +0000 To: openvpn-devel Thread-Topic: [PATCH] [openvpn-build] Install/uninstall dialer DLL as part of Windows installer operation Thread-Index: AdQjeNfZgZ5iHPAeQJqeDSrZqfThXA== Date: Wed, 25 Jul 2018 17:01:38 +0000 Deferred-Delivery: Wed, 25 Jul 2018 17:01:01 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=True; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Owner=kkane@microsoft.com; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2018-07-25T17:00:01.8482764Z; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=General; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Application=Microsoft Azure Information Protection; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Extended_MSFT_Method=Automatic; Sensitivity=General x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BL0PR2101MB0914; 6:Ph+qAyjiU4zFFMoMZxJGVJOaT3h0tntLAoopw9D5uJlIdIxS7V43f9btP7Md7T9QXHeM9kDbNr78OMu5mRRVf+6LHghxlollyrNeqVoZzr0wWG+X9tQkE/mm2+fEzw+oO/8ujefjdSSfNxLi45dzb7u0KYyzPzOfra6wwaL7G0KkqKVZUPLOsy4Ov8vzW2zGXodvQu7eQj2IYkHfwXCIfc4k+ki3VXsst+FeWcPawi1cdUZlIFvSFr7cSiUoS4ArJOT9TBF6Nf4VEtKSK5niC6OO84l4vQDgmTN+N9SR70E4ABgSLc60mohwE6fuDHQ8jRScwbT/Qx7y6SuJAi+ByQdtOPbNHpG/6ZmV25fSqKxYpyYrqCJCDaZ+yLpvRXky/8WxI57U5H++bKyO/pWMQZ1Jb/DfU4nbfwKM2aljZ3p7WcLhgBB2+sXK5pAUBElnx/waYbscLgxvNKVSDELt7A==; 5:B4cUZGkIPPEyYokpURjvxWr3qzHSFAApqVFlU4DXNGVmfVCN8xqPXAwboWJO2bJNBkbaki36WiEVyZUAHZNQFQ88MsXb8oWitpo+4BW9z5y5MBI3m/zDgQJqYnXQNmfiREYo0wNYzaShL4vbf+nFyvvlGm47Ybobhu1pXBTUq+M=; 7:nlEF/AO9lbC4Q7PuZtqWXMF1I7iMD/mjCMYMvvl849b5iMpsrCNgPFYligrp5PePFdMg77rGil/q4HldDlexw/nL8mBWTqYOXgUL7YgHOmfU6q2ehsmLQ/GMlLtfQPeZpxUT3S3KP2dpEAyYkHrP+ej62cE94sruvv/DdM6U70I7hTtsocAFxCUHmFOTLYAWHp4QuQS2jLe4qmUELmJh+NmUXVpHaXU7+fRcZClNSAOmrlscEdophmIrIuq0D806 x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-correlation-id: 735eb751-1345-4ec0-59a2-08d5f2504ca7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600073)(711020)(4618075)(2017052603328)(7193020); SRVR:BL0PR2101MB0914; x-ms-traffictypediagnostic: BL0PR2101MB0914: x-o365-sonar-daas-pilot: True x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(21748063052155); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231311)(944501410)(52105095)(2018427008)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:BL0PR2101MB0914; BCL:0; PCL:0; RULEID:; SRVR:BL0PR2101MB0914; x-forefront-prvs: 0744CFB5E8 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(366004)(346002)(396003)(136003)(39860400002)(199004)(189003)(81166006)(6116002)(9686003)(55016002)(790700001)(8990500004)(54896002)(6306002)(68736007)(14454004)(14444005)(33656002)(2900100001)(316002)(476003)(1857600001)(478600001)(102836004)(7736002)(7696005)(25786009)(10090500001)(22452003)(186003)(10290500003)(53546011)(6506007)(256004)(486006)(46003)(584604001)(97736004)(5250100002)(86612001)(106356001)(5660300001)(105586002)(2906002)(53936002)(74316002)(8936002)(6666003)(6916009)(81156014)(99286004)(6436002)(8676002)(86362001)(2004002)(460985005); DIR:OUT; SFP:1102; SCL:1; SRVR:BL0PR2101MB0914; H:BL0PR2101MB1058.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: 1EKiiFBzpPop/XnYVM3pmK7b48TkibXnPRrJMI5BY32X3VsOndwq5XHdTPvvO2On4DNH5LKTrrpjxtfgDI3Y/S3t6OQtr1glKQ4oBiLeU6ooYvnZAPOdy+eGGgvaOYn35wvVIMOY+d5+IlD14z+6uLOlYwRvU/ufz02dpOCKEIAmV7i17oUUR5xzd7VosKdQATaozdSRtaX5RKeEyV66csNUeFXSuYZYuYQNeuuNo3odPIOYueO/rMoP05CrTX/DZcJrQJPgDUKtiTi4AoIRV2Qxa3u+Vocmuut+QivuFwSEXHmf+sn86tLzNmncwSYxbdjUoLW+bro9YjPPLlIj169iUdB0Y5UJr+6wDEzHdvk= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 735eb751-1345-4ec0-59a2-08d5f2504ca7 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Jul 2018 17:01:42.4813 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR2101MB0914 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 [40.107.68.102 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.0 HTML_MESSAGE BODY: HTML included in message -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 T_DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-Headers-End: 1fiNAg-00BUcV-Id Subject: [Openvpn-devel] [PATCH] [openvpn-build] Install/uninstall dialer DLL as part of Windows installer operation 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: Kevin Kane via Openvpn-devel From: Kristof Provost via Openvpn-devel Reply-To: Kevin Kane Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From 30e851ffafcc9ad76928d796f9b18144c8d79040 Mon Sep 17 00:00:00 2001 From: Kevin Kane Date: Fri, 13 Jul 2018 09:47:43 -0700 Subject: Install/uninstall dialer DLL as part of Windows installer operation Signed-off-by: Kevin Kane --- windows-nsis/openvpn.nsi | 4 ++++ 1 file changed, 4 insertions(+) -- 2.17.1.windows.2 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot diff --git a/windows-nsis/openvpn.nsi b/windows-nsis/openvpn.nsi index e92904d..aff7cb3 100755 --- a/windows-nsis/openvpn.nsi +++ b/windows-nsis/openvpn.nsi @@ -1,6 +1,7 @@ ; **************************************************************************** ; * Copyright (C) 2002-2010 OpenVPN Technologies, Inc. * ; * Copyright (C) 2012 Alon Bar-Lev * +; * Portions Copyright (C) 2018 Microsoft Corporation * ; * This program is free software; you can redistribute it and/or modify * ; * it under the terms of the GNU General Public License version 2 * ; * as published by the Free Software Foundation. * @@ -443,8 +444,10 @@ Section /o "${PACKAGE_NAME} GUI" SecOpenVPNGUI ${If} ${RunningX64} File "${OPENVPN_ROOT_X86_64}\bin\openvpn-gui.exe" + File "${OPENVPN_ROOT_X86_64}\bin\libopenvpndialer-0.dll" ${Else} File "${OPENVPN_ROOT_I686}\bin\openvpn-gui.exe" + File "${OPENVPN_ROOT_I686}\bin\libopenvpndialer-0.dll" ${EndIf} ${If} ${SectionIsSelected} ${SecAddShortcutsWorkaround} @@ -770,6 +773,7 @@ Section "Uninstall" ${EndIf} Delete "$INSTDIR\bin\openvpn-gui.exe" + Delete "$INSTDIR\bin\libopenvpndialer-0.dll" Delete "$DESKTOP\${PACKAGE_NAME} GUI.lnk" Delete "$INSTDIR\bin\openvpn.exe"