security/libp11: Fails to build on 13.5-RELEASE

[michaelo]

Summary

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

[michaelo]

Please test thoroughly...

[ale]

security/libp11/Makefile

45

Shouldn't be < 14 ?

[michaelo]

Fix typo

[diizzy]

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

[michaelo]

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?

[michaelo]

@ale, please check again.

[diizzy]

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

[michaelo]

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

[michaelo]

@ale @diizzy is this change fine for you?

[ale]

I cannot test it now, but it looks good to me.

[diizzy]

Yes, that should be fine in most cases.