From patchwork Fri Jul 21 13:55:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "ralf_lici (Code Review)" X-Patchwork-Id: 3296 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:14c5:b0:d7:3b0f:3938 with SMTP id g5csp88823dyh; Fri, 21 Jul 2023 06:56:23 -0700 (PDT) X-Google-Smtp-Source: APBJJlFRAgFBSLO154IPURe24XFBBBpbMLFfnTnl/B8JczI6r84NKsChJWUs53VdrbDW3IAo2x04 X-Received: by 2002:a05:6a00:1a4c:b0:66a:2ff1:dee2 with SMTP id h12-20020a056a001a4c00b0066a2ff1dee2mr147851pfv.10.1689947783404; Fri, 21 Jul 2023 06:56:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689947783; cv=none; d=google.com; s=arc-20160816; b=Fe258k6TJAG4KHHoK4fiJmonw1J2fmiw3g55HzS4Gff8/AkgQAnzZ8CVKjCqz3D+rh dN0IzPbGdZnRiA20ZBDY35DFnELKmD6Fsll6HiCjdWlxZboL46aBvlVT+xQqavPxjwYz 2Fezm7gYwwMkMI2OBwwrYShrtrxxcmpr5aMJHv1FToEVU0pLsT5LD+xMuP+MaKu+NRwA pljv9SReTtNe+DDkQqS+F5q+6XuB1jg0flrZZtfpVZMuqct5SG142lVVLXZjDt7G9EKG 7vGXvE6QpmfmxKKkTBmCdDacSE2b0PVA5rii7cOjDoH0Gey4Lz6sNXR9CJA6J6OtrLNd TyxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:reply-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:user-agent:mime-version :message-id:references:auto-submitted:cc:date:from:dkim-signature :dkim-signature:dkim-signature; bh=/JyJp+5fHp2z9loPjD57XAZdf9w3zhchrhJ2zMk2Yg0=; fh=ejqQk4evxSbcB4TOY987ChV164zUZaeCjiIZ6JGqg/c=; b=eT64Dv53k86iy29zMSe7KmXJjFVkXooH4QrZWgh5N+jbNUySvpAJ9LRIl/F5HsySY0 mrM7tluRUlU64TjLk6celStI7z2QpATuvR7ZkcnHm9SyLI6UgaXbd2odOm+EY27SGYXC qWqpJbFHqag7djKoQ3S9poQTmQ9o/z38a6YlspbeLJAlSYHEpTchtFTKd2ogeCCuHlUa gb3F2kjyidi3R391FAezui61qD831IsXjBpV1TWaqEqO/KZ6Nh5f+GTHDVO/0vuqj0/C /QbEv0ExBF4tK1sNOe7m6y5mOXFBi1NVHTTvHQmYOxiEiFfU9ITAJUS5cEK0ZGR+6SN9 QjmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=NHwLjwZb; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=mJZfdIyY; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=HLsPg3Wd; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id u7-20020a056a00098700b006687ed7b4a5si3286872pfg.140.2023.07.21.06.56.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Jul 2023 06:56:23 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=NHwLjwZb; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=mJZfdIyY; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=HLsPg3Wd; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1qMqbx-0003de-Tz; Fri, 21 Jul 2023 13:56:02 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qMqbt-0003dP-JI for openvpn-devel@lists.sourceforge.net; Fri, 21 Jul 2023 13:55:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:Date:From :Sender:To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Fca+M2AYzUuR21+RcW4cSZWup4pCV6oMtLsBABeFxI8=; b=NHwLjwZbbvqZDg01DA86wxNhZU 36rloh8n/XdNmcrAJTDsk8SqgVy/uV4a9BxnmxD3YINE+BZCBMEk3kL+frcypWWd39U7KvOOatEOj /54h7bxn7pH2CVLQXN4eMB98OeKrhjaBioztOtADubt5yokpMzcUmnFg39r3gDWS6RUk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:Date:From:Sender:To:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=Fca+M2AYzUuR21+RcW4cSZWup4pCV6oMtLsBABeFxI8=; b=m JZfdIyYMp46HgvKBeyTKI8F04Lzu4FtspXK9Y1H/IqOj4nKbWb7hhEUi77VRHmNj4Y/WSPIGahaQb tnwRe1PjmKQ2zyL8IZuDF2OOCbv7Rc71lS1Ce5OmuiwloYY+R48bZHw03mJ+C+/O+tfgArIId6fqQ pr6vnf1oHMTEnBCQ=; Received: from mail-wr1-f47.google.com ([209.85.221.47]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1qMqbl-00FJgB-Av for openvpn-devel@lists.sourceforge.net; Fri, 21 Jul 2023 13:55:57 +0000 Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-3128fcd58f3so1673222f8f.1 for ; Fri, 21 Jul 2023 06:55:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1689947742; x=1690552542; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:date:from:from:to:cc :subject:date:message-id:reply-to; bh=Fca+M2AYzUuR21+RcW4cSZWup4pCV6oMtLsBABeFxI8=; b=HLsPg3WdBpAJKOxqx6cBUPDuVjHPLK9xaYjowgQod2RgjwC2wr6vHvWolP1v85rHO+ usutecb9cruUOzT8szye9MJ+ZJMpYWjlwqbdpdtfqqTGTsgpQjVQ5BuajHM5IbaYjPU/ 3wTn1N1qeAsXCYv40g0ee23WxfrGZhT/vRpiTaC910NS/2YnsK9m0NiNCrx+RxdIX4gp YwHvE1GtPURp3i9ao+zKxJqAv5yyg+NSq5+ea5FiP86oaAeT2/T1yTWl6vc6OOpvCLVS B4KGTc/kCL32JUdTzVxS9nUHc0zJGUyEtO1ISg+Er9yt7GDoKckBO0a+34MvkKhggfYJ OXSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689947742; x=1690552542; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Fca+M2AYzUuR21+RcW4cSZWup4pCV6oMtLsBABeFxI8=; b=UKlIIMjPKKt4/4LRVB9YcMBiMKbebv8CyF1iBeAPev8HDQPrNjIALRk60v5C1RfSb8 bf5fnwlmhedDNZDgw/dQe4EeWOJqpnA/gNa1wZUNXqkmyC2vtjJQITDzDsSWLgMAMBFl hdKRP8PgHR24ifao270wIiCqpg/GMyYxSK3+gj0Rhf2TG+zzNkxjC5G8y9zoL6i0BJcB ZaibCVRUrZO0cICNUAhCZeBDp8VvAK5QLkFfm6uAOANS3OGnDkZ8hKtT8fGdr4o90RmH FvRngMguJBt2K+WWNwBuHQd23sC/hSf5KijOQtE7i+2QnqchUNBNUeLJvAj/eWl2Hebv 6FZw== X-Gm-Message-State: ABy/qLbwKTWoFzO5W2b0fzXhdHjgedXgQclYTREHMLSpVx+Ir+24MsRD 3GS2MXHYDx0Ja3hV8wIN5u4r5G5GO05qgxg7bec= X-Received: by 2002:adf:f20b:0:b0:30e:3caa:971b with SMTP id p11-20020adff20b000000b0030e3caa971bmr1684811wro.51.1689947741932; Fri, 21 Jul 2023 06:55:41 -0700 (PDT) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id e14-20020a5d594e000000b003142eb75724sm4263998wri.24.2023.07.21.06.55.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 06:55:41 -0700 (PDT) From: "flichtenheld (Code Review)" X-Google-Original-From: "flichtenheld (Code Review)" X-Gerrit-PatchSet: 1 Date: Fri, 21 Jul 2023 13:55:40 +0000 Cc: openvpn-devel Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: Ie61fed8758e44576939a8bb0a04bc95245a3ce18 X-Gerrit-Change-Number: 311 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: 8c5acf367f94338d6aafcf714553e0d39344fc62 References: Message-ID: MIME-Version: 1.0 User-Agent: Gerrit/3.8.0 X-Spam-Score: 1.0 (+) 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: flichtenheld has uploaded this change for review. ( http://gerrit.openvpn.net/c/openvpn/+/311?usp=email ) Change subject: vcpkg-ports/pkcs11-helper: Backport MinGW series from master to release/2.6 Content analysis details: (1.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.47 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.47 listed in list.dnswl.org] 1.2 MISSING_HEADERS Missing To: header -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1qMqbl-00FJgB-Av Subject: [Openvpn-devel] [M] Change in openvpn[release/2.6]: vcpkg-ports/pkcs11-helper: Backport MinGW series from master to relea... 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: , Reply-To: frank@lichtenheld.com, openvpn-devel@lists.sourceforge.net Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1772038686728679748?= X-GMAIL-MSGID: =?utf-8?q?1772038686728679748?= flichtenheld has uploaded this change for review. ( http://gerrit.openvpn.net/c/openvpn/+/311?usp=email ) Change subject: vcpkg-ports/pkcs11-helper: Backport MinGW series from master to release/2.6 ...................................................................... vcpkg-ports/pkcs11-helper: Backport MinGW series from master to release/2.6 Contains the following commits: - Make compatible with mingw build (commit 17746e53f65249b42017256056c5415099df288d) - Convert CONTROL to vcpkg.json (commit a2160d3e42a1eff59aee3d984fd3354907f4379f) - reference upstream PRs in patches (commit 9577ffe92f033d8452cff0a3dbdfdc943655c5b8) - rename patches to make file names shorter (commit 0c25a5462e945f537d1836b47a5f147a2132875c) Change-Id: Ie61fed8758e44576939a8bb0a04bc95245a3ce18 Signed-off-by: Frank Lichtenheld --- M .github/workflows/build.yaml D contrib/vcpkg-ports/pkcs11-helper/CONTROL A contrib/vcpkg-ports/pkcs11-helper/Fix-build-with-disable-shared.patch R contrib/vcpkg-ports/pkcs11-helper/config-w32-vc.h.in-indicate-OpenSSL.patch R contrib/vcpkg-ports/pkcs11-helper/nmake-compatibility-with-vcpkg-nmake.patch M contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch M contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-002-dynamic_loader_flags.patch M contrib/vcpkg-ports/pkcs11-helper/portfile.cmake A contrib/vcpkg-ports/pkcs11-helper/vcpkg.json A contrib/vcpkg-triplets/x64-mingw-ovpn.cmake A contrib/vcpkg-triplets/x86-mingw-ovpn.cmake 11 files changed, 104 insertions(+), 13 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/11/311/1 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4766efd..8a80c67 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -441,6 +441,7 @@ uses: lukka/run-vcpkg@v10 with: vcpkgGitCommitId: 'd10d511f25620ca0f315cd83dcef6485efc63010' + vcpkgJsonGlob: '**/openvpn/vcpkg.json' appendedCacheKey: '${{matrix.triplet}}' - name: Run MSBuild consuming vcpkg.json diff --git a/contrib/vcpkg-ports/pkcs11-helper/CONTROL b/contrib/vcpkg-ports/pkcs11-helper/CONTROL deleted file mode 100644 index 1ead697..0000000 --- a/contrib/vcpkg-ports/pkcs11-helper/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: pkcs11-helper -Version: 1.29-1 -Homepage: https://github.com/OpenSC/pkcs11-helper -Description: pkcs11-helper is a library that simplifies the interaction with PKCS#11 providers for end-user applications. diff --git a/contrib/vcpkg-ports/pkcs11-helper/Fix-build-with-disable-shared.patch b/contrib/vcpkg-ports/pkcs11-helper/Fix-build-with-disable-shared.patch new file mode 100644 index 0000000..16fa704 --- /dev/null +++ b/contrib/vcpkg-ports/pkcs11-helper/Fix-build-with-disable-shared.patch @@ -0,0 +1,48 @@ +From 7171396a151a2edb3474c7a321b7ae4ff7e171fc Mon Sep 17 00:00:00 2001 +From: Frank Lichtenheld +Date: Wed, 29 Mar 2023 12:44:44 +0200 +Subject: [PATCH] Allow the build to succeed if configured with + --disable-shared + +Do not try to install a file that does not exist. + +Signed-off-by: Frank Lichtenheld +--- + configure.ac | 1 + + lib/Makefile.am | 2 ++ + 2 files changed, 3 insertions(+) + +upstream PR: https://github.com/OpenSC/pkcs11-helper/pull/62 + +diff --git a/configure.ac b/configure.ac +index a7e9760..f154ae3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -581,6 +581,7 @@ AC_SUBST([LIBPKCS11_HELPER_LT_AGE]) + AC_SUBST([LIBPKCS11_HELPER_LT_OLDEST]) + AC_SUBST([WIN_LIBPREFIX]) + AC_SUBST([PKCS11H_FEATURES]) ++AM_CONDITIONAL([ENABLE_SHARED], [test "${enable_shared}" = "yes" ]) + AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) + AM_CONDITIONAL([CYGWIN], [test "${CYGWIN}" = "yes"]) + AM_CONDITIONAL([ENABLE_DOC], [test "${enable_doc}" = "yes"]) +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 31b928f..3cba32f 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -128,10 +128,12 @@ if ENABLE_PKCS11H_TOKEN + endif + + if WIN32 ++if ENABLE_SHARED + mylibdir=$(libdir) + mylib_DATA=.libs/@WIN_LIBPREFIX@pkcs11-helper-@LIBPKCS11_HELPER_LT_OLDEST@.dll.def + .libs/@WIN_LIBPREFIX@pkcs11-helper-@LIBPKCS11_HELPER_LT_OLDEST@.dll.def: libpkcs11-helper.la + endif ++endif + + RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) +-- +2.34.1 + diff --git a/contrib/vcpkg-ports/pkcs11-helper/0002-config-w32-vc.h.in-indicate-OpenSSL.patch b/contrib/vcpkg-ports/pkcs11-helper/config-w32-vc.h.in-indicate-OpenSSL.patch similarity index 100% rename from contrib/vcpkg-ports/pkcs11-helper/0002-config-w32-vc.h.in-indicate-OpenSSL.patch rename to contrib/vcpkg-ports/pkcs11-helper/config-w32-vc.h.in-indicate-OpenSSL.patch diff --git a/contrib/vcpkg-ports/pkcs11-helper/0001-nmake-compatibility-with-vcpkg-nmake.patch b/contrib/vcpkg-ports/pkcs11-helper/nmake-compatibility-with-vcpkg-nmake.patch similarity index 100% rename from contrib/vcpkg-ports/pkcs11-helper/0001-nmake-compatibility-with-vcpkg-nmake.patch rename to contrib/vcpkg-ports/pkcs11-helper/nmake-compatibility-with-vcpkg-nmake.patch diff --git a/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch b/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch index 84fba08..56e3486 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch +++ b/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch @@ -1,3 +1,5 @@ +upstream PR: https://github.com/OpenSC/pkcs11-helper/pull/4 + commit 90590b02085edc3830bdfe0942a46c4e7bf3f1ab (HEAD -> master) Author: David Woodhouse Date: Thu Apr 30 14:58:24 2015 +0100 diff --git a/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-002-dynamic_loader_flags.patch b/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-002-dynamic_loader_flags.patch index 325dea8..6d67458 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-002-dynamic_loader_flags.patch +++ b/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-002-dynamic_loader_flags.patch @@ -11,6 +11,8 @@ lib/pkcs11h-core.c | 13 +++++++++++-- 3 files changed, 23 insertions(+), 3 deletions(-) +upstream PR: https://github.com/OpenSC/pkcs11-helper/pull/59 + diff --git a/include/pkcs11-helper-1.0/pkcs11h-core.h b/include/pkcs11-helper-1.0/pkcs11h-core.h index 9028c277..56f87718 100644 --- a/include/pkcs11-helper-1.0/pkcs11h-core.h diff --git a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake index 1c6ceda..47919bc 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake +++ b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake @@ -11,26 +11,45 @@ ARCHIVE ${ARCHIVE} REF ${VERSION} PATCHES - 0001-nmake-compatibility-with-vcpkg-nmake.patch - 0002-config-w32-vc.h.in-indicate-OpenSSL.patch + nmake-compatibility-with-vcpkg-nmake.patch + config-w32-vc.h.in-indicate-OpenSSL.patch + Fix-build-with-disable-shared.patch pkcs11-helper-001-RFC7512.patch pkcs11-helper-002-dynamic_loader_flags.patch ) -vcpkg_build_nmake( +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_build_nmake( SOURCE_PATH ${SOURCE_PATH} PROJECT_SUBPATH lib PROJECT_NAME Makefile.w32-vc OPTIONS OPENSSL=1 OPENSSL_HOME=${CURRENT_PACKAGES_DIR}/../openssl_${TARGET_TRIPLET} -) + ) -file(INSTALL ${SOURCE_PATH}/include/pkcs11-helper-1.0 DESTINATION ${CURRENT_PACKAGES_DIR}/include/) -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}-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}-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 ${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}/include/pkcs11-helper-1.0 DESTINATION ${CURRENT_PACKAGES_DIR}/include/) + +else() + find_program(man_to_html man2html REQUIRED) + + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS --disable-crypto-engine-gnutls --disable-crypto-engine-nss + --disable-crypto-engine-polarssl --disable-crypto-engine-mbedtls + ) + vcpkg_install_make() + vcpkg_fixup_pkgconfig() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +endif() + +vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json b/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json new file mode 100644 index 0000000..12f918b --- /dev/null +++ b/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pkcs11-helper", + "version": "1.29.0", + "description": "pkcs11-helper is a library that simplifies the interaction with PKCS#11 providers for end-user applications.", + "homepage": "https://github.com/OpenSC/pkcs11-helper", + "license": "BSD-3-Clause OR GPL-2.0-only" +} diff --git a/contrib/vcpkg-triplets/x64-mingw-ovpn.cmake b/contrib/vcpkg-triplets/x64-mingw-ovpn.cmake new file mode 100644 index 0000000..3676cdb --- /dev/null +++ b/contrib/vcpkg-triplets/x64-mingw-ovpn.cmake @@ -0,0 +1,8 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_ENV_PASSTHROUGH PATH) + +set(VCPKG_CMAKE_SYSTEM_NAME MinGW) + +set(VCPKG_MAKE_BUILD_TRIPLET --host=x86_64-w64-mingw32) diff --git a/contrib/vcpkg-triplets/x86-mingw-ovpn.cmake b/contrib/vcpkg-triplets/x86-mingw-ovpn.cmake new file mode 100644 index 0000000..9e65f67 --- /dev/null +++ b/contrib/vcpkg-triplets/x86-mingw-ovpn.cmake @@ -0,0 +1,8 @@ +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_ENV_PASSTHROUGH PATH) + +set(VCPKG_CMAKE_SYSTEM_NAME MinGW) + +set(VCPKG_MAKE_BUILD_TRIPLET --host=i686-w64-mingw32)