Date: Tue, 14 Jul 2020 13:27:02 -0700 From: Craig Leres <leres@freebsd.org> To: Hajimu UMEMOTO <ume@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r541879 - head/security/yubico-piv-tool/files Message-ID: <692d14fa-7296-1148-d3fa-ea3600ba9ee0@freebsd.org> In-Reply-To: <yge5zaquyhj.wl-ume@FreeBSD.org> References: <202007101840.06AIe4gl053850@repo.freebsd.org> <6184c89e-8657-62af-7e33-0ed86ed9b417@freebsd.org> <yge5zaquyhj.wl-ume@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------A232C99E015E27716B84F745 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 2020-07-14 04:28, Hajimu UMEMOTO wrote: > leres> This patch breaks building for me with DEFAULT_VERSIONS=ssl=openssl; > leres> the attached solves this on 11.3 with ssl=openssl and 12.1 with > leres> ssl=base. > > Did you actually build it without your patch? > The change is intentional for OpenSSL handling of USES=ssl which > defines $OPENSSLINC and $OPENSSLLIB according to the setting of > DEFAULT_VERSIONS=ssl=XXX. > I confirmed it is buildable with DEFAULT_VERSIONS=ssl=openssl on > 12.1-STABLE. I used my patch on both systems. The difference appears to be that archivers/libarchive has a new OPENSSL option that defaults to on. Also I have OPENSSL enabled for curl (also the default). I think really this boils down to yubico-piv-tool needs to always run the cmake libcrypt checks in case openssl is installed in /usr/local. Attached is a patchset that makes the package checks for libcrypto optional; this should be safe because we have openssl in the base system. I only tested three cases: 11.3 with ssl-openssl and 12.1 with ssl=base and ssl=openssl. Craig --------------A232C99E015E27716B84F745 Content-Type: text/plain; charset=UTF-8; name="patch2.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="patch2.txt" SW5kZXg6IHNlY3VyaXR5L3l1Ymljby1waXYtdG9vbC9maWxlcy9wYXRjaC1DTWFrZUxpc3Rz LnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBzZWN1cml0eS95dWJpY28tcGl2LXRvb2wvZmlsZXMv cGF0Y2gtQ01ha2VMaXN0cy50eHQJKHJldmlzaW9uIDU0MjIwNSkKKysrIHNlY3VyaXR5L3l1 Ymljby1waXYtdG9vbC9maWxlcy9wYXRjaC1DTWFrZUxpc3RzLnR4dAkobm9uZXhpc3RlbnQp CkBAIC0xLDE1ICswLDAgQEAKLS0tLSBDTWFrZUxpc3RzLnR4dC5vcmlnCTIwMjAtMDctMTAg MTM6NDU6MTAgVVRDCi0rKysgQ01ha2VMaXN0cy50eHQKLUBAIC0xMjEsOSArMTIxLDkgQEAg aWYoQ01BS0VfQ09NUElMRVJfSVNfR05VQ0MpCi0gICAgIHNldChDTUFLRV9DX0ZMQUdTICIk e0NNQUtFX0NfRkxBR1N9IC1Xbm8tdW51c2VkLXJlc3VsdCIpCi0gZW5kaWYoKQotIAotLWlu Y2x1ZGUoJHtDTUFLRV9TT1VSQ0VfRElSfS9jbWFrZS9vcGVuc3NsLmNtYWtlKQotLWZpbmRf bGliY3J5cHRvKCkKLS1pbmNsdWRlX2RpcmVjdG9yaWVzKCR7TElCQ1JZUFRPX0lOQ0xVREVf RElSU30pCi0rIyBpbmNsdWRlKCR7Q01BS0VfU09VUkNFX0RJUn0vY21ha2Uvb3BlbnNzbC5j bWFrZSkKLSsjIGZpbmRfbGliY3J5cHRvKCkKLSsjIGluY2x1ZGVfZGlyZWN0b3JpZXMoJHtM SUJDUllQVE9fSU5DTFVERV9ESVJTfSkKLSAKLSBlbmFibGVfdGVzdGluZygpCi0gZmluZF9w YWNrYWdlKGNvZGVjb3YpCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBzZWN1cml0eS95dWJpY28t cGl2LXRvb2wvZmlsZXMvcGF0Y2gtQ01ha2VMaXN0cy50eHQKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpEZWxl dGVkOiBmYnNkOm5va2V5d29yZHMKIyMgLTEgKzAsMCAjIwoteWVzClwgTm8gbmV3bGluZSBh dCBlbmQgb2YgcHJvcGVydHkKRGVsZXRlZDogc3ZuOmVvbC1zdHlsZQojIyAtMSArMCwwICMj Ci1uYXRpdmUKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0eQpEZWxldGVkOiBzdm46 bWltZS10eXBlCiMjIC0xICswLDAgIyMKLXRleHQvcGxhaW4KXCBObyBuZXdsaW5lIGF0IGVu ZCBvZiBwcm9wZXJ0eQpJbmRleDogc2VjdXJpdHkveXViaWNvLXBpdi10b29sL2ZpbGVzL3Bh dGNoLWNtYWtlX29wZW5zc2wuY21ha2UKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc2VjdXJpdHkveXVi aWNvLXBpdi10b29sL2ZpbGVzL3BhdGNoLWNtYWtlX29wZW5zc2wuY21ha2UJKG5vbmV4aXN0 ZW50KQorKysgc2VjdXJpdHkveXViaWNvLXBpdi10b29sL2ZpbGVzL3BhdGNoLWNtYWtlX29w ZW5zc2wuY21ha2UJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwzNiBAQAorLS0tIGNtYWtl L29wZW5zc2wuY21ha2Uub3JpZwkyMDIwLTA3LTE0IDE5OjI3OjMyIFVUQworKysrIGNtYWtl L29wZW5zc2wuY21ha2UKK0BAIC0zMiw3ICszMiw3IEBAIG1hY3JvIChmaW5kX2xpYmNyeXB0 bykKKyAgICAgICAgICAgICBpZihPUEVOU1NMX1NUQVRJQ19MSU5LKQorICAgICAgICAgICAg ICAgICBzZXQoT1BFTlNTTF9VU0VfU1RBVElDX0xJQlMgVFJVRSkgI05lZWQgdG8gYmUgc2V0 IHNvIHRoYXQgZmluZF9wYWNrYWdlIHdvdWxkIGZpbmQgdGhlIHN0YXRpYyBsaWJyYXJ5Cisg ICAgICAgICAgICAgZW5kaWYoT1BFTlNTTF9TVEFUSUNfTElOSykKKy0gICAgICAgICAgICBm aW5kX3BhY2thZ2UoT3BlblNTTCBSRVFVSVJFRCkKKysgICAgICAgICAgICBmaW5kX3BhY2th Z2UoT3BlblNTTCkKKyAKKyAgICAgICAgICAgICBpZihPcGVuU1NMX0ZPVU5EKQorICAgICAg ICAgICAgICAgICBzZXQoTElCQ1JZUFRPX0xERkxBR1MgT3BlblNTTDo6Q3J5cHRvKQorQEAg LTYwLDcgKzYwLDcgQEAgbWFjcm8gKGZpbmRfbGliY3J5cHRvKQorICAgICAgICAgaWYoTk9U IExJQkNSWVBUT19GT1VORCkKKyAKKyAgICAgICAgICAgICBzZXQoRU5We1BLR19DT05GSUdf UEFUSH0gIiR7T1BFTlNTTF9QS0dfUEFUSH06JEVOVntQS0dfQ09ORklHX1BBVEh9IikKKy0g ICAgICAgICAgICBwa2dfY2hlY2tfbW9kdWxlcyhMSUJDUllQVE8gUkVRVUlSRUQgbGliY3J5 cHRvKQorKyAgICAgICAgICAgIHBrZ19jaGVja19tb2R1bGVzKExJQkNSWVBUTyBsaWJjcnlw dG8pCisgICAgICAgICAgICAgaWYoTElCQ1JZUFRPX0ZPVU5EKQorICAgICAgICAgICAgICAg ICBpZihWRVJCT1NFX0NNQUtFKQorICAgICAgICAgICAgICAgICAgICAgbWVzc2FnZSgiTElC Q1JZUFRPX0ZPVU5EOiAke0xJQkNSWVBUT19GT1VORH0iKQorQEAgLTc2LDcgKzc2LDcgQEAg bWFjcm8gKGZpbmRfbGliY3J5cHRvKQorICAgICAgICAgICAgICAgICAgICAgbWVzc2FnZSgi TElCQ1JZUFRPX0xJQkRJUjogJHtMSUJDUllQVE9fTElCRElSfSIpCisgICAgICAgICAgICAg ICAgIGVuZGlmKFZFUkJPU0VfQ01BS0UpCisgICAgICAgICAgICAgZWxzZShMSUJDUllQVE9f Rk9VTkQpCistICAgICAgICAgICAgICAgIG1lc3NhZ2UgKEZBVEFMX0VSUk9SICJsaWJjcnlw dG8gbm90IGZvdW5kLiBBYm9ydGluZy4uLiIpCisrICAgICAgICAgICAgICAgICNtZXNzYWdl IChGQVRBTF9FUlJPUiAibGliY3J5cHRvIG5vdCBmb3VuZC4gQWJvcnRpbmcuLi4iKQorICAg ICAgICAgICAgIGVuZGlmKExJQkNSWVBUT19GT1VORCkKKyAgICAgICAgICAgICBzZXQoT1BF TlNTTF9WRVJTSU9OICR7TElCQ1JZUFRPX1ZFUlNJT059KQorIAorQEAgLTg5LDQgKzg5LDQg QEAgbWFjcm8gKGZpbmRfbGliY3J5cHRvKQorICAgICBsaW5rX2RpcmVjdG9yaWVzKCR7TElC Q1JZUFRPX0xJQlJBUllfRElSU30pCisgICAgIGluY2x1ZGVfZGlyZWN0b3JpZXMoJHtMSUJD UllQVE9fSU5DTFVERV9ESVJTfSkKKyAKKy1lbmRtYWNybygpCitcIE5vIG5ld2xpbmUgYXQg ZW5kIG9mIGZpbGUKKytlbmRtYWNybygpCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBzZWN1cml0 eS95dWJpY28tcGl2LXRvb2wvZmlsZXMvcGF0Y2gtY21ha2Vfb3BlbnNzbC5jbWFrZQpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkFkZGVkOiBmYnNkOm5va2V5d29yZHMKIyMgLTAsMCArMSAjIworeWVzClwg Tm8gbmV3bGluZSBhdCBlbmQgb2YgcHJvcGVydHkKQWRkZWQ6IHN2bjplb2wtc3R5bGUKIyMg LTAsMCArMSAjIworbmF0aXZlClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgcHJvcGVydHkKQWRk ZWQ6IHN2bjptaW1lLXR5cGUKIyMgLTAsMCArMSAjIwordGV4dC9wbGFpbgpcIE5vIG5ld2xp bmUgYXQgZW5kIG9mIHByb3BlcnR5Cg== --------------A232C99E015E27716B84F745--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?692d14fa-7296-1148-d3fa-ea3600ba9ee0>