Paths

Table of Contentst

Differential D49795

secure: Adapt Makefile to ssh-sk-client everywhere
ClosedPublic
Actions

Authored by jlduran on Apr 12 2025, 2:35 AM.

Tags

None

Referenced Files

	F151063823: D49795.id.diff
	Sun, Apr 5, 5:57 PM

	Unknown Object (File)
	Sat, Apr 4, 1:49 AM

	Unknown Object (File)
	Mon, Mar 30, 4:35 PM

	Unknown Object (File)
	Sat, Mar 28, 7:15 AM

	Unknown Object (File)
	Thu, Mar 26, 10:39 PM

	Unknown Object (File)
	Wed, Mar 25, 5:07 AM

	Unknown Object (File)
	Wed, Mar 18, 1:18 PM

	Unknown Object (File)
	Wed, Mar 18, 9:35 AM

Subscribers

Details

Reviewers

Commits

rG65d8491719bb: secure: Adapt Makefile to ssh-sk-client everywhere

Summary

Upstream commit 7b47b40b1 ("adapt Makefile to ssh-sk-client everywhere")
adapted the Makefiles to ssh-sk-client. Do the same here.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

jlduran created this revision.Apr 12 2025, 2:35 AM

Herald added a subscriber: imp. · View Herald TranscriptApr 12 2025, 2:35 AM

jlduran requested review of this revision.Apr 12 2025, 2:35 AM

Harbormaster completed remote builds in B63476: Diff 153563.Apr 12 2025, 2:35 AM

jlduran added a parent revision: D49794: secure: Match SRCS with upstream Makefile.in.Apr 12 2025, 2:35 AM

emaste added inline comments.Apr 12 2025, 1:13 PM

secure/libexec/ssh-keysign/Makefile
6 ↗	(On Diff #153563)	Do we want to also use `${SKOBJS}` as upstream (and have that set in secure/ssh.mk)?

jlduran added inline comments.Apr 12 2025, 1:40 PM

secure/libexec/ssh-keysign/Makefile
6 ↗	(On Diff #153563)	I'd like that, but the name should not indicate it's an object (theirs is). So `${SKSRCS}` perhaps?

emaste added inline comments.Apr 12 2025, 2:50 PM

secure/libexec/ssh-keysign/Makefile
6 ↗	(On Diff #153563)	I'd like that, but the name should not indicate it's an object (theirs is). So `${SKSRCS}` perhaps? Hrmph I copy and pasted it without paying close enough attention. `${SKSRCS}` makes sense.

Address suggestions:

Move $(SKSRCS) to our central location (secure/ssh.mk), matching upstream Makefile.in as close as possible

jlduran added a child revision: D49800: secure: Match upstream mode for ssh-keysign socket.Apr 12 2025, 2:56 PM

jlduran added a child revision: D49801: secure: Declare gss-genr sources in libssh.Apr 12 2025, 3:39 PM

emaste accepted this revision.Apr 12 2025, 4:56 PM

This revision is now accepted and ready to land.Apr 12 2025, 4:56 PM

Closed by commit rG65d8491719bb: secure: Adapt Makefile to ssh-sk-client everywhere (authored by jlduran). · Explain WhyApr 17 2025, 7:20 PM

This revision was automatically updated to reflect the committed changes.

jlduran added a commit: rG65d8491719bb: secure: Adapt Makefile to ssh-sk-client everywhere.

jlduran mentioned this in D49793: secure: Rearrange Makefile SRCS to match upstream Makefile.in.Apr 17 2025, 7:20 PM

jlduran added a reverting change: D50020: openssh: Add ${SKSRCS} to libssh.May 6 2025, 6:17 PM

Push the right branch

jlduran added a reverting change: rGac62b97951c2: openssh: Add ${SKSRCS} to libssh.May 20 2025, 11:00 PM

Revision Contents
Changeset List

Path

Size

secure/

lib/

libssh/

3 lines

Diff 154989

secure/lib/libssh/Makefile

Loading...