Page MenuHomeFreeBSD

samba: Fix comflict of PKGNAME, introduce new SAMBA_*_PORT variables
ClosedPublic

Authored by yasu on Feb 4 2025, 2:18 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 11, 5:59 PM
Unknown Object (File)
Thu, Mar 6, 11:24 PM
Unknown Object (File)
Mon, Mar 3, 11:29 PM
Unknown Object (File)
Sat, Mar 1, 11:27 PM
Unknown Object (File)
Wed, Feb 19, 4:23 PM
Unknown Object (File)
Tue, Feb 18, 8:03 PM
Unknown Object (File)
Sat, Feb 15, 12:04 AM
Unknown Object (File)
Feb 10 2025, 4:07 PM
Subscribers
None

Details

Summary
  • Fix conflict of PKGNAME by adding PKGNAMESUFFIX to the ports below
    • databases/tdb1410
    • devel/talloc242
    • devel/tevent016
  • Set CONFLICTS_INSTALL between different versions of each port.
  • Update dependencies of databases/ldb29 and net/samba420 to reflect change of PKGNAME.
  • Introduce 3 new variable, SAMBA_TALLOC_PORT, SAMBA_TDB_PORT and SAMBA_TEVENT_PORT. Proper port origin ("databases/ldb29" for example) is assigned to them depending on the value of SAMBA_DEFAULT. They are intended to be used by ports that works with Samba to specify proper version of talloc, tdb and/or tevent as dependency.
  • Update some ports that work with Samba and depend on either of them so these variables are used in LIB_DEPENDS.
  • Add item in CHANGES.

Note that there are some other ports that depends on either of talloc,
tdb or tevent. But they just use them as dependencies and have
nothing to do with Samba itself. So I keep them untouched.

Test Plan

Build of all modified ports succeeds with poudriere and 14.2-RELEASE amd64 jail exept www/squid.
As for www/squid, build fails in confiugre phase if TDB option is enabled.
But it also happnes with original one.
So it isn't fault of this change.

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

yasu requested review of this revision.Feb 4 2025, 2:18 AM
yasu created this revision.

Bump PORTREVISION of modified ports.

0mp requested changes to this revision.Feb 4 2025, 10:44 AM

The change is great and very much welcomed. Thank you for working on that.

Here is some feedback:

  • There are some typos in the commit message.
  • It would be better to split this change set into at least 3 different commits:
    1. The samba.mk changes.
    2. Fixes to PKGNAMEs
    3. Updates to consumers of USES=samba
CHANGES
16 ↗(On Diff #150447)

Everything should be indented with 2 spaces.

22 ↗(On Diff #150447)
26 ↗(On Diff #150447)
26 ↗(On Diff #150447)

Style suggestion: Code blocks are usually indented with 4 extra spaces (so 6 in total) instead of being delimited with ----------------------------------------------------------------------.

Mk/Uses/samba.mk
34 ↗(On Diff #150447)

Note: I prefer the previous style as you can clearly see all the final assignments in one code block. Also, for example if needed, a user may depend on a version of ldb of a different Samba version. If there is a good reason to switch to the if statements it's ok, but I'm not a big fan of that.

databases/tdb/Makefile
3

Broken indentation.

databases/tdb1410/Makefile
3

Broken indentation.

devel/talloc/Makefile
3

Broken indentation.

devel/talloc242/Makefile
3

Broken indentation.

devel/tevent/Makefile
3

Broken indentation.

devel/tevent016/Makefile
3

Broken indentation.

net/freeradius3/Makefile
154 ↗(On Diff #150447)

These could probably become SAMBA_INCLUDEDIR and SAMBA_LIBDIR while here.

www/squid/Makefile
3 ↗(On Diff #150447)

If the build failed when the TDB option was enabled and also the TDB option is not default, maybe it does not make sense to bump the port revision here. The package won't change for downstream pkg consumers as Samba 4.16 is still the default, so maybe there is no need to force the regeneration of packages. Just a thought.

261 ↗(On Diff #150447)

Wouldn't the following work?

AUTH_SMB_USES=			samba:run
TDB_USES=                       samba:env
This revision now requires changes to proceed.Feb 4 2025, 10:44 AM

Split original change set into 3 commit and update to the one that fixes conflict of PKGNAME.
Other 2 commits will be submitted as new review.

Fix indentation of PORTREVISION.

yasu marked 6 inline comments as done.Feb 5 2025, 5:45 AM

Thank you!

Reviewed by: 0mp
Approved by: samba (0mp)
This revision is now accepted and ready to land.Feb 5 2025, 9:15 AM

Since 0mp approved I Approve as well

This revision was automatically updated to reflect the committed changes.