From patchwork Wed Jul 25 09:51:03 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: 433 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id 6+qwOuXUWFu5dgAAIUCqbw for ; Wed, 25 Jul 2018 15:52:05 -0400 Received: from proxy7.mail.ord1d.rsapps.net ([172.30.191.6]) by director9.mail.ord1d.rsapps.net (Dovecot) with LMTP id c6WBB+XUWFt2IAAAalYnBA ; Wed, 25 Jul 2018 15:52:05 -0400 Received: from smtp21.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy7.mail.ord1d.rsapps.net with LMTP id QNA8OuXUWFunTAAAMe1Fpw ; Wed, 25 Jul 2018 15:52: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: smtp21.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=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: 34459b9a-9044-11e8-ad57-525400a98691-1-1 Received: from [216.105.38.7] ([216.105.38.7:56901] helo=lists.sourceforge.net) by smtp21.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 07/0D-27193-4E4D85B5; Wed, 25 Jul 2018 15:52: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=Ttwhf/KpbDF7U5vxJgiEu83nn/2zSxlUcf0EQSI7CCM=; b=l2xXVrQl3wRLiA4qnFekwAebxZ 9HowpI+N65YxL41dNWe+/9P02MHvSfn9oB4Yz+8iPDTzpbaCdgkM7Aexr5El7cHwQVQzW2ydSpEru AMxWqYV+HxkuZKAc6/WjqsZ5UX3ZhbmeiFQ+dFWjDypBuaJ0GkNQRYaGrCpseRvPyUfA=; 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 1fiPoW-0006Z6-A6; Wed, 25 Jul 2018 19:51:12 +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 1fiPoV-0006Yz-69 for openvpn-devel@lists.sourceforge.net; Wed, 25 Jul 2018 19:51:11 +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:CC:To:From:Sender:Reply-To: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=dfJWZqE3jFBUX5QSCslW2iq4LMW92FAJwXUW57/ytIM=; b=XI5jRxvrZMcxkw6U+iTyh6opao CSrXrekdaDmgVigcw1D+7Or3VxI74/uecDpljcjvfLPdt/8MpesIoyFOc0D91aDTZRCcdTinrPkAK kMuPlhAm6EZgqa/EzbYIqbY0nZAJbkC9mj7wHxNjpegkgRdNgvPxNrVGJkHyTHSVYH3o=; 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:CC:To:From:Sender:Reply-To: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=dfJWZqE3jFBUX5QSCslW2iq4LMW92FAJwXUW57/ytIM=; b=O TIRSh3stOADoiPnOv1ubIfddszc9eh5IKm9okMWGULfoRDCyxXFQXByj1knURz3NhcfVSxdiaKurN hHtmenrLOgjmr88eAutICPXMVuO1LteIhQxiR78YIuoLIBxMglVR0ZqPBfTQ71o1PQbE7L/en4u3h dJS5O58RhLJ7YSLM=; Received: from mail-by2nam03on0109.outbound.protection.outlook.com ([104.47.42.109] helo=NAM03-BY2-obe.outbound.protection.outlook.com) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) (Exim 4.90_1) id 1fiPoU-001Lom-Uy for openvpn-devel@lists.sourceforge.net; Wed, 25 Jul 2018 19:51:11 +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=dfJWZqE3jFBUX5QSCslW2iq4LMW92FAJwXUW57/ytIM=; b=EGJyn9ctJYfqf0wJVrIFRXaZd0G6spnkAqT0DEJw+iQXtq8/m+1ScMvCJaTWPAGOWaVDYK50vZI/Z+XgFkueRE/3BOSjS00SepFxCV3M6x/YUxkvDSkrnUHe5VcDt7X2H859YGyG093jTB7CRmnbnYHQ8H8VuxhSezplude6Gsg= Received: from BL0PR2101MB1058.namprd21.prod.outlook.com (52.132.24.16) by BL0PR2101MB1044.namprd21.prod.outlook.com (52.132.24.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1017.1; Wed, 25 Jul 2018 19:51:03 +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 19:51:03 +0000 To: "openvpn-devel@lists.sourceforge.net" Thread-Topic: [PATCH v2] [openvpn-build] Install/uninstall dialer DLL as part of Windows installer operation Thread-Index: AQHUJFDRmR7DZLhbFUifE6JDooilqg== Date: Wed, 25 Jul 2018 19:51:03 +0000 Message-ID: <20180725195040.27560-1-kkane@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.17.1.windows.2 x-clientproxiedby: CY4PR22CA0064.namprd22.prod.outlook.com (2603:10b6:903:ae::26) To BL0PR2101MB1058.namprd21.prod.outlook.com (2603:10b6:207:37::16) x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BL0PR2101MB1044; 6:f9IzEjvi0kj6yKloR95HvPvRRtP9KT/4vBUVRN6g+PJK67aukeG0rq+CxmjEl4bqibixnHakbo7c2QIbd2TSB6MOUVVTh+kkoaRxYKhRql8w3VJ+T3JnWJ4O4vVwU9hv0a400O0gHCoY1Z469mShHLGh8g3o5NAdgePY8cztdSHuCwJGjS+0qfXy8vkdGU5icf0JzRFe8obi2tM79ALnGcDn8sTg9duNH8h1TPbaVfO/VKQ0B+ZGgL9iql7Creif7hU0Nyp3jWy8aKKvku9rPfFLqwwfNBfgxehzDg5LVVHvU53rpmHkJHkZyVI7S4sGyh29EYWkpBFX9RdUUbJXiWrLP8ObSdSQu9WJZZN5FpZhOmRPhOzaz+BzR0nYRTNxlvE1Odk0x7F4XuKBoQiAGjiCw3yokALHIaJ7j6ZCitjzgPQCOi3SFj+s7iaw2QR+CZzoAw5oxXtAAOK25DEP2A==; 5:QT/1h/Dc1FDq4VGf/fvoR5wTzJt38g9zPsm1rF2qVOn5IEzfwo/lmkRSwvzCNaxm6lfrPc9DbJFF2Dhjt2dTw6Bnfr5hWfr/ctU05ykEL5XgC23ZOPsk2oKLmhwxRYmoY4NHqFyzpvU7xvhjvLe5eGhCVFcPhTJP4Qxypah6yVE=; 7:QxZGD8tjEyE5RqGkJXyWz6idAgSoeARR4O2ZEZtg8CVvz2ci0b4IAMsOODj0jkYgt1XFJlVyqCTgXJ7xmXK2BLrxfkTMORfFI4zwioAqGrYtrgsjYXOMuNBkuPPBFaOaOMJGuxis7adQZHIqQM1snC+CsRkIQHyCQiLbBrnsnX1T6nd19hzFfmX2nghyWjDCqRCsC8t6es3vXjZ5fewAb6/OIgI6ONjQBtdm5uZDP/HXSpk48mGjff1Kg/2k1A7x x-ms-office365-filtering-correlation-id: 0e00ae1c-c942-45ef-7f1f-08d5f267f419 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:BL0PR2101MB1044; x-ms-traffictypediagnostic: BL0PR2101MB1044: x-o365-sonar-daas-pilot: True x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231311)(944501410)(52105095)(2018427008)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:BL0PR2101MB1044; BCL:0; PCL:0; RULEID:; SRVR:BL0PR2101MB1044; x-forefront-prvs: 0744CFB5E8 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(366004)(346002)(136003)(396003)(39860400002)(189003)(199004)(8676002)(186003)(53936002)(6512007)(25786009)(6916009)(14444005)(86612001)(86362001)(46003)(4326008)(81156014)(81166006)(50226002)(6436002)(97736004)(99286004)(476003)(10290500003)(7736002)(8936002)(2906002)(5660300001)(305945005)(5640700003)(107886003)(36756003)(102836004)(5250100002)(256004)(2501003)(6506007)(1076002)(6116002)(486006)(68736007)(2616005)(105586002)(10090500001)(2351001)(22452003)(6486002)(14454004)(386003)(478600001)(52116002)(316002)(2900100001)(106356001)(2004002)(460985005); DIR:OUT; SFP:1102; SCL:1; SRVR:BL0PR2101MB1044; H:BL0PR2101MB1058.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: pNdYtFmMkk4c3sq5xA6zfq99iwOX68OcEDpCMMlfp3HeAqGJVFCr5f03qCT/ErP5r2U56QdC5+ct031C0aZhLmFv1+AP4qQ02ZfVekH8kOYYB9YG3TuUA/bGFOvwNniCFBq38P4yEOtDrzETdPk8qCkTyFlnA/40J228AXLekpp82eMeXfDO7O5FIJjfZ0MsE+OHBy/YuMj2v8r7UeEqQz6CW07YqERT8ThYoRjzQEcLcb/5vxI17uUy7SH7letT6LsWKJ2nQ/edc3L54V5sWVbxQjqDtMtw4pC3Gcps7SyVrvu7p1YauWpJHWx7m/SBmTk0Knip9nVyEkewe6r74iPNvsf+KpKvYvlf0jXxd7k= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e00ae1c-c942-45ef-7f1f-08d5f267f419 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Jul 2018 19:51:03.8121 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR2101MB1044 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. X-Headers-End: 1fiPoU-001Lom-Uy Subject: [Openvpn-devel] [PATCH v2] [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 Signed-off-by: Kevin Kane --- windows-nsis/openvpn.nsi | 4 ++++ 1 file changed, 4 insertions(+) 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"