From patchwork Tue Nov 23 23:08:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 2087 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.27.255.8]) by backend30.mail.ord1d.rsapps.net with LMTP id iAeEFGMPnmF2awAAIUCqbw (envelope-from ) for ; Wed, 24 Nov 2021 05:09:39 -0500 Received: from proxy13.mail.iad3a.rsapps.net ([172.27.255.8]) by director9.mail.ord1d.rsapps.net with LMTP id 6L85FGMPnmGEUQAAalYnBA (envelope-from ) for ; Wed, 24 Nov 2021 05:09:39 -0500 Received: from smtp16.gate.iad3a ([172.27.255.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy13.mail.iad3a.rsapps.net with LMTPS id 8NXkDmMPnmH6BwAAwhxzoA (envelope-from ) for ; Wed, 24 Nov 2021 05:09:39 -0500 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: smtp16.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=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: 97e5d784-4d0e-11ec-8caa-5254004ee196-1-1 Received: from [216.105.38.7] ([216.105.38.7:41994] helo=lists.sourceforge.net) by smtp16.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id A5/60-26865-15F0E916; Wed, 24 Nov 2021 05:09:22 -0500 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.94.2) (envelope-from ) id 1mppCa-0001Gu-I0; Wed, 24 Nov 2021 10:08:33 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mppCX-0001GE-Fh for openvpn-devel@lists.sourceforge.net; Wed, 24 Nov 2021 10:08:30 +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=kQ9cqNMgVlB4oYo08mszVgwnTeoX4h86yNLKqhOMcdk=; b=Ktj8CW0AOA985Sr9tOUAVkSHB9 dSWfpiDQF+jvGokw5UCQxMivr+jD/f3RzeBOcImDfBRjsFTXuLxs4bVvzOwNGD96b4NpcfN8Pcqk0 fXYT/yFUtUOsq2HLRNJVzZt4YLy0/ht6B7Sxs/mrX+gE+fi06hFCHDAZjL4Ekq4+JSPw=; 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=kQ9cqNMgVlB4oYo08mszVgwnTeoX4h86yNLKqhOMcdk=; b=dTqKTIazVLHR5i5dahJQRjsxII zfLll3gJGboNzvF6KtNAuhrhfWASdbQNbFz16QBznQ41ozVc4LLhxBGAMRaEr+hkahH4wHi/5DQlD yiNmyx1pAygaAlLngiNX9WIfmGA2taj6bmzm8z97t6gzqGXXcMABQ39rZ9ttHlMUPfbs=; Received: from mail-wm1-f50.google.com ([209.85.128.50]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.3) id 1mppCX-0001R6-Um for openvpn-devel@lists.sourceforge.net; Wed, 24 Nov 2021 10:08:30 +0000 Received: by mail-wm1-f50.google.com with SMTP id o29so1759050wms.2 for ; Wed, 24 Nov 2021 02:08:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=kQ9cqNMgVlB4oYo08mszVgwnTeoX4h86yNLKqhOMcdk=; b=V+AmyZ5FMfPi0uiISyK6uDP/1R3fs2J2Nbv/zCibDZGpyVxfj6HMI8RZEFpgw4uxaz HNvLCGR2fgKg1EoPfSoBk2qvPovluAy/j6XzCGIffaOoL+pRMhcs41WOI/OI3s5xkruW xPaG0+a9OJqsDThcuxmtgvWDz1oExczLGEPuzxh7CdISGT+Fc9OpMLNp5OgFNKI9KFEd kKvW/Qee5Tevv6DtMRI+D/VkyHNp/s/qeWpOJOlKUlYaAVhqfiWyIRUBt71v/vRnEmAL 5A60Mnf5FA3cP1ZtTn4gvAu19db0K6NbUGNJX6uR5j+ABSsQfuos/6gL6SwZoTe/A5lr gMCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=kQ9cqNMgVlB4oYo08mszVgwnTeoX4h86yNLKqhOMcdk=; b=csSiDoJ2A8vxyNwt2ssqsQAD0ZW4WAeqQqyiwvYHTgpjRIntQx7HCSQwNNtnIb9akP 0tWa9qlcpiZDDtRgk504JBt8WB1yM/DV8tiUlj1RzcMtw1U7vQ5hRqpSIBqTs0gS3Clo S1AB9qW3J5EpPjEqRegEibEmw9C2VM71+aOcAiqnnI563dq5xN0iWuG/FAGfg/utJO9l fQmvZVb1KvEfKkhTXF9qkCjPFVKIPFWMyGvZcBFp9YwOf+ylUWQLe29oFtUgNoGzWwcr 3NkMzIunMa+iKW0VyigQFMN7kXiQOvJ0Z6uxFIypo3GDrCEbjE949U8UbsXAQ3+Lpf7V 8j3Q== X-Gm-Message-State: AOAM532pwAPNcVqAtGGSR60xKVKTU87LSczAVeO29EfWM2fCbGjzcgOM t3IYYyo3ZAg37/lMktVV3R/EjjqDbVs= X-Google-Smtp-Source: ABdhPJwbQ3x2JS3e8AxzNQ9qGLgJgAdxwxVuLBXxdqVafcurjpnzi8YgD0bAzXDxPgoAt/N717Pw6Q== X-Received: by 2002:a1c:90:: with SMTP id 138mr13426032wma.27.1637748503212; Wed, 24 Nov 2021 02:08:23 -0800 (PST) Received: from LAPTOP-4L3N7KFS.localdomain (nat3.panoulu.net. [185.38.2.3]) by smtp.gmail.com with ESMTPSA id d8sm14767345wrm.76.2021.11.24.02.08.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 02:08:22 -0800 (PST) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Wed, 24 Nov 2021 12:08:38 +0200 Message-Id: <20211124100838.861-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Lev Stipakov Starting from commit 21b2dbd3 "[scripts-audit] nmake buildsystem" vcpkg has removed NO_DEBUG support from nmake buildsystem and now builds debug variant unconditionally. Debug flags contradict build o [...] Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.50 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lstipakov[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.50 listed in wl.mailspike.net] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-Headers-End: 1mppCX-0001R6-Um Subject: [Openvpn-devel] [PATCH master+release/2.5] vcpkg/pkcs11-helper: compatibility with latest vcpkg 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: , Cc: Lev Stipakov MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov Starting from commit 21b2dbd3 "[scripts-audit] nmake buildsystem" vcpkg has removed NO_DEBUG support from nmake buildsystem and now builds debug variant unconditionally. Debug flags contradict build options hardcoded in pkcs11 nmake script (like /O2). Remove hardcoded release options and other options which are (also) set by vcpkg nmake buildsystem. Bump vcpkg commit in GitHub actions. Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- .github/workflows/build.yaml | 2 +- ...nmake-compatibility-with-vcpkg-nmake.patch | 38 +++++++++++++++++++ .../vcpkg-ports/pkcs11-helper/portfile.cmake | 10 ++--- 3 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 contrib/vcpkg-ports/pkcs11-helper/0002-nmake-compatibility-with-vcpkg-nmake.patch diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index abf32b14..51d9dd4d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -217,7 +217,7 @@ jobs: - name: Restore artifacts, or run vcpkg, build and cache artifacts uses: lukka/run-vcpkg@v7.4 with: - vcpkgGitCommitId: '71422c627264daedcbcd46f01f1ed0dcd8460f1b' + vcpkgGitCommitId: 'a2fcb03749ff5897b5985092934dc6057680c789' vcpkgArguments: 'openssl lz4 lzo pkcs11-helper tap-windows6' vcpkgTriplet: '${{ matrix.triplet }}-windows-ovpn' cleanAfterBuild: false diff --git a/contrib/vcpkg-ports/pkcs11-helper/0002-nmake-compatibility-with-vcpkg-nmake.patch b/contrib/vcpkg-ports/pkcs11-helper/0002-nmake-compatibility-with-vcpkg-nmake.patch new file mode 100644 index 00000000..a6034f7e --- /dev/null +++ b/contrib/vcpkg-ports/pkcs11-helper/0002-nmake-compatibility-with-vcpkg-nmake.patch @@ -0,0 +1,38 @@ +From 68d12f3e955cc9df435e9289b1244a4c1f24b96b Mon Sep 17 00:00:00 2001 +From: Lev Stipakov +Date: Wed, 24 Nov 2021 11:21:36 +0200 +Subject: [PATCH] nmake: compatibility with vcpkg nmake + +Remove options which contradict or already set +by vcpkg nmake scripts. + +Signed-off-by: Lev Stipakov +--- + lib/Makefile.w32-vc | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/lib/Makefile.w32-vc b/lib/Makefile.w32-vc +index 0e64f42..18af03b 100644 +--- a/lib/Makefile.w32-vc ++++ b/lib/Makefile.w32-vc +@@ -75,15 +75,11 @@ OPENSSL_LIBS=-LIBPATH:$(OPENSSL_LIB) user32.lib advapi32.lib $(OPENSSL_STATIC) + CFLAGS = -I../include $(OPENSSL_CFLAGS) -DWIN32 -DWIN32_LEAN_AND_MEAN -D_MBCS -D_CRT_SECURE_NO_DEPRECATE -D_WIN32_WINNT=0x0400 + CC=cl.exe + RC=rc.exe +-CCPARAMS=/nologo /W3 /O2 /FD /c +- +-CCPARAMS=$(CCPARAMS) /MD +-CFLAGS=$(CFLAGS) -DNDEBUG ++CCPARAMS=/c + + LINK32=link.exe + LIB32=lib.exe +-LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no +-LIB32_FLAGS=/nologo ++LINK32_FLAGS=/dll + + HEADERS = \ + config.h \ +-- +2.23.0.windows.1 + diff --git a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake index 54a0009d..ad19fccb 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake +++ b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake @@ -12,12 +12,12 @@ vcpkg_extract_source_archive_ex( REF ${VERSION} PATCHES 0001-nmake-openssl-1.1.1-support.patch + 0002-nmake-compatibility-with-vcpkg-nmake.patch pkcs11-helper-001-RFC7512.patch ) vcpkg_build_nmake( SOURCE_PATH ${SOURCE_PATH} - NO_DEBUG PROJECT_SUBPATH lib PROJECT_NAME Makefile.w32-vc OPTIONS @@ -26,10 +26,10 @@ vcpkg_build_nmake( ) file(INSTALL ${SOURCE_PATH}/include/pkcs11-helper-1.0 DESTINATION ${CURRENT_PACKAGES_DIR}/include/) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/lib/pkcs11-helper.dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/lib/pkcs11-helper.dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/pkcs11-helper.dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/pkcs11-helper.dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/lib/libpkcs11-helper-1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/lib/libpkcs11-helper-1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) +file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/libpkcs11-helper-1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) +file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/libpkcs11-helper-1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)