From nobody Fri May 23 17:16:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3sK36Sgcz5w2xV; Fri, 23 May 2025 17:16:55 +0000 (UTC) (envelope-from jlduran@gmail.com) Received: from mail-yw1-f177.google.com (mail-yw1-f177.google.com [209.85.128.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3sK330L0z3pFJ; Fri, 23 May 2025 17:16:55 +0000 (UTC) (envelope-from jlduran@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yw1-f177.google.com with SMTP id 00721157ae682-70b684670e7so110967b3.2; Fri, 23 May 2025 10:16:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748020614; x=1748625414; h=content-transfer-encoding:cc:to:subject:message-id:date:from :reply-to:in-reply-to:references:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Sjaq06qjLIpwspsrMrSWbV6h41r+Oc2+IoZMXixDHFU=; b=ORJR6jiAPTExRA/DTYazOAPnx0AzrqOu1Qn9ensvPS6g9JZSenHcD7NyJRpiF18SOq zDau0GDR2yeZqd1va80L8yKXet7SEsP28WrgY99NYxKo3OeaDl4XzAzkps+1deZwqY3s 2wJcftHHfCfjm9Xd8QnvHKIm59UmdUrhWrZGTWJ2RGHtYpVbZJTUHDLS7R5aKds7PBDH UFjvf284Oi9bHEqr68c0YYDitoNIMYnHdr76sXbRpm0ThzlpWQXVbvRB8k1cdAeRkk6A vM8OSlNf4Qp2LBtxhAXVl4zSkWM81cCOJS78bOflj1bpb7zFAXlreUgYWnETz05RwkOZ Kjhw== X-Forwarded-Encrypted: i=1; AJvYcCUDFRwySZIy429C2/iT5J3opwCVoACS5KjWEGuiOuLDDjcOaGDUA9AYIbeyX/V4UPnMZHbZ/pA0w5jsuctqZ7vwm1lM@freebsd.org, AJvYcCVgNo3WSr9XLrRYPn6GP6s8ZBbOmEUyyCZk5X/IIG9oaQH34G/eALUtGAlNxVfrDAiYMgz0QfQFf3IwdNbJvRdYaxt+3Hw=@freebsd.org X-Gm-Message-State: AOJu0YxKr8KIxDjGidi8OjZaaOn5uzMg6o/vPb/NTGzd7lJuXuIzfXv4 b5aWVSY5IJdos1veBNcYeKv4A2lDRt+nNdXbhPD0mBOhLQqXtMeJCf5VtByH/w== X-Gm-Gg: ASbGnctvSAXWBfCYov8qAXqx2B6e5aRj+vAc0GmzjdagdtrvJNKj9ogUmLC7MQ63G8d XHw9aiUBB/jy/8XMMy4OJK5TOSfM/WF4XJqlyufbqoUZr30kVCfiRxyxezOvzQxMHPGOx6hC7CI ETfLoEskmE6+IgpbXHRrxBMcq050AUYhH6bRqChDJPHeYYCdW95RG9+CF5entTNlr16Fbnewlij fRITLc0F+3v1cGSxwFaP4TCLusJa1CAdBDLod9jo00E76BRdBhphVgdhU1v0tl8j/WG47axFBw3 ynRmDvn402+h/AVDss3rbjT35PBI7rm6Ik4lcBXReB0eue4bFDIg2EuSaiXi9mGuHS9QL8Xad6H ZWXb7k8qku66QQarM X-Google-Smtp-Source: AGHT+IEJ/CaroW3YVlYUw7y6WhAWJU3Fs42GEBLBJGtxaS5EP6CPyeaLFkMdLktREdsB2smIDfVquA== X-Received: by 2002:a05:690c:386:b0:70e:d35:fbf7 with SMTP id 00721157ae682-70e1b5c3092mr17409867b3.5.1748020613898; Fri, 23 May 2025 10:16:53 -0700 (PDT) Received: from mail-yb1-f179.google.com (mail-yb1-f179.google.com. [209.85.219.179]) by smtp.gmail.com with ESMTPSA id 00721157ae682-70e1d423473sm3307877b3.22.2025.05.23.10.16.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 23 May 2025 10:16:53 -0700 (PDT) Received: by mail-yb1-f179.google.com with SMTP id 3f1490d57ef6-e7d8f68d5eeso13633276.0; Fri, 23 May 2025 10:16:53 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCVlJuka8cioQbohYSNVXkixquARrAUhTijyKL9ez7RseFLEYdSAjUs+zKVUQmYw9y80C/h6fsrdHt6PXMmn5eglPsZD@freebsd.org, AJvYcCWECZ0cXJo6GFnewL2lBKbwZ05x1RgCm3lGoFJSr01Cb9ni48U9RZyEJOfNI9MracxSWh8k8zRSNv5vHP1k65OxEnQwdvk=@freebsd.org X-Received: by 2002:a05:6902:10c2:b0:e7d:763c:a19f with SMTP id 3f1490d57ef6-e7d91a1b019mr188623276.2.1748020613228; Fri, 23 May 2025 10:16:53 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202505202259.54KMxhl1053598@gitrepo.freebsd.org> <4e0ac4ad-58cf-4ba2-828f-53d5e8179b08@FreeBSD.org> In-Reply-To: <4e0ac4ad-58cf-4ba2-828f-53d5e8179b08@FreeBSD.org> Reply-To: jlduran@freebsd.org From: Jose Luis Duran Date: Fri, 23 May 2025 12:16:41 -0500 X-Gmail-Original-Message-ID: X-Gm-Features: AX0GCFssxRzRAE3DILjg3xR5vJ20lOzoc4ECZZvoKzAL_3cVdubM26sSFaiHpls Message-ID: Subject: Re: git: ac62b97951c2 - main - openssh: Add ${SKSRCS} to libssh To: John Baldwin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4b3sK330L0z3pFJ X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Spamd-Bar: ---- On Fri, May 23, 2025 at 12:06=E2=80=AFPM John Baldwin wro= te: > > On 5/20/25 18:59, Jose Luis Duran wrote: > > The branch main has been updated by jlduran: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dac62b97951c25a33ec0880e5= 74ccff31be7452f7 > > > > commit ac62b97951c25a33ec0880e574ccff31be7452f7 > > Author: Jose Luis Duran > > AuthorDate: 2025-05-20 22:58:23 +0000 > > Commit: Jose Luis Duran > > CommitDate: 2025-05-20 22:58:23 +0000 > > > > openssh: Add ${SKSRCS} to libssh > > > > sshkey.c references sshsk_sign(), which is defined in ${SKSRCS}. > > > > Due to how FreeBSD builds libssh, or put differently, due to upstr= eam > > not building a shared libssh.so, we need to partially revert > > 65d8491719bb ("secure: Adapt Makefile to ssh-sk-client everywhere"= ), and > > add ${SKSRCS} back, to avoid linking problems, especially when bui= lding > > with GCC: > > > > /usr/local/bin/ld: > > /usr/obj/usr/src/amd64.amd64/secure/lib/libssh/libprivatessh.s= o: > > undefined reference to `sshsk_sign' > > collect2: error: ld returned 1 exit status` > > > > Put the sources in a separate line, to maintain line-by-line > > compatibility with upstream Makefile.in > > > > PR: 286580 > > Reviewed by: emaste > > Approved by: emaste (mentor) > > Fixes: 65d8491719bb ("secure: Adapt Makefile to ssh-sk-client eve= rywhere") > > Differential Revision: https://reviews.freebsd.org/D50020 > > Shouldn't we revert all the other Makefile changes that added SKSRCS in t= he > consumers of libssh? I would be inclined to just revert a098111a28ed, and leave the others "as is", just to "match" the SRCS line, which was the underlying original motivation. > -- > John Baldwin > --=20 Jose Luis Duran