security/libp11: Fails to build on 13.5-RELEASE
ClosedPublic
Actions

Authored by michaelo on Fri, Jun 20, 10:17 PM.

Details

Reviewers

jrm
otis
ale
diizzy

Commits

R11:36493604b0cf: security/libp11: Fails to build on 13.5-RELEASE

Summary

PR: 287671
Approved by: jrm (mentor), otis (mentor), ale (maintainer), diizzy

Diff Detail

Repository

R11 FreeBSD ports repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

michaelo requested review of this revision.Fri, Jun 20, 10:17 PM

michaelo created this revision.

Harbormaster completed remote builds in B65006: Diff 157399.Fri, Jun 20, 10:17 PM

Please test thoroughly...

ale requested changes to this revision.Sat, Jun 21, 4:34 PM

ale added inline comments.

security/libp11/Makefile
45	Shouldn't be < 14 ?

This revision now requires changes to proceed.Sat, Jun 21, 4:34 PM

Fix typo

Harbormaster completed remote builds in B65012: Diff 157412.Sat, Jun 21, 6:45 PM

You can also save a few lines by using PLIST_FILES directly and remove lib/ossl-modules/libpkcs11.so and lib/ossl-modules/pkcs11prov.so from pkg-plist
Something like this perhaps?

.if ${OPSYS} == FreeBSD && ${OSREL:R} >= 14 && ${SSL_DEFAULT} != "openssl111"
PLIST_FILES=	lib/ossl-modules/libpkcs11.so \
		lib/ossl-modules/pkcs11prov.so
.endif

In D50960#1163336, @diizzy wrote:
You can also save a few lines by using PLIST_FILES directly and remove lib/ossl-modules/libpkcs11.so and lib/ossl-modules/pkcs11prov.so from pkg-plist
Something like this perhaps?
.if ${OPSYS} == FreeBSD && ${OSREL:R} >= 14 && ${SSL_DEFAULT} != "openssl111"
PLIST_FILES=	lib/ossl-modules/libpkcs11.so \
		lib/ossl-modules/pkcs11prov.so
.endif

This looks good, but this port is also marked for removal with the EOL of 13: https://www.freshports.org/security/openssl111/
I'd like to keep the pkg-plist line-consistent. When 13 and 1.1.1 are gone one can remove the PLIST_SUB and done.

WDYT?

@ale, please check again.

Either way is fine, if you want minimal impact however.... (a bit hackish) :-)

post-install:
.if ${OPSYS} == FreeBSD && ${OSREL:R} < 14 && ${SSL_DEFAULT} == "base"
        @${REINPLACE_CMD} -i '' -e '/ossl-modules/d' ${TMPPLIST}
.endif

In D50960#1163445, @diizzy wrote:
Either way is fine, if you want minimal impact however.... (a bit hackish) :-)
post-install:
.if ${OPSYS} == FreeBSD && ${OSREL:R} < 14 && ${SSL_DEFAULT} == "base"
        @${REINPLACE_CMD} -i '' -e '/ossl-modules/d' ${TMPPLIST}
.endif

This is too minimalist and feels like Perl :-D It should be visible in the pkg-plist that this file could be removed w/o looking into the Makefile. IMHO

@ale @diizzy is this change fine for you?