libcrypto: move engines and modules to openssl-lib
ClosedPublic
Actions

Authored by ivy on May 4 2025, 10:56 AM.

Details

Reviewers

des
kevans
emaste
manu

Group Reviewers

pkgbase

Commits

rGc853409d69c4: libcrypto: move engines and modules to openssl-lib

Summary

currently, some OpenSSL-related files end up in the utilities package:

/usr/lib/engines-3/capi.so
/usr/lib/engines-3/devcrypto.so
/usr/lib/engines-3/loader_attic.so
/usr/lib/engines-3/padlock.so
/usr/lib/ossl-modules/legacy.so

since these are part of OpenSSL and are not useful without it, move them
to the openssl-lib package.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 63921
Build 60805: arc lint + arc unit

Event Timeline

ivy created this revision.May 4 2025, 10:56 AM

Herald added a subscriber: imp. · View Herald TranscriptMay 4 2025, 10:56 AM

ivy requested review of this revision.May 4 2025, 10:56 AM

Harbormaster completed remote builds in B63866: Diff 154785.May 4 2025, 10:56 AM

emaste accepted this revision.May 4 2025, 7:44 PM

This revision is now accepted and ready to land.May 4 2025, 7:44 PM

manu accepted this revision.May 5 2025, 5:39 AM

I'm uneasy with the name of this new package; it sounds like it should contain the openssl library, but it doesn't. Can we name it openssl-engines instead?

In D50144#1144184, @des wrote:

I'm uneasy with the name of this new package; it sounds like it should contain the openssl library, but it doesn't.

but it does:

% pkg info -l freebsd-openssl-lib
FreeBSD-openssl-lib-15.snap20250504111358:
        /lib/libcrypto.so.30
        /usr/lib/libssl.so.30

i think what happened here is someone added PACKAGE=openssl-lib to secure/lib/libcrypto/Makefile and assumed it would be recursive, but it's not, you have to set it in every subdir as well.

My mistake, I thought this was a new package just for the engines.

kevans added inline comments.May 5 2025, 9:02 PM

secure/lib/libcrypto/engines/capi/Makefile
1 ↗	(On Diff #154785)	We discussed out-of-band moving the default `PACKAGE` to `engines/Makefile.inc` (and the below to `modules/Makefile.inc`) to remove a bit of redundancy.