From nobody Sat Sep 04 23:50:02 2021 X-Original-To: freebsd-hackers@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 AB17017A7055 for ; Sat, 4 Sep 2021 23:50:26 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f41.google.com (mail-io1-f41.google.com [209.85.166.41]) (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 "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H2BHQ4Qqhz4f7Q for ; Sat, 4 Sep 2021 23:50:26 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f41.google.com with SMTP id q3so3764012iot.3 for ; Sat, 04 Sep 2021 16:50:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=a5knL14MFAbx0MOLkaqZSCoyTcdLpHSASwt3RTwoytU=; b=lTdWSgV2pSdOHm4rmKSJCeM9jTpdLIuHMxb83dwCVytgi6zDH2T/pQEvhlAjHZ6t9Q J50Lc8jZONZNP1hgHWUpWSsKSiyS+HwLhhbEu9w3Ybc0lINkYXxKLxCfaf+Uousz/WGa DXHexMhgCKAoksiNqH4lluZIx7pPt9Htbr6AQLOLi/jYk14bOhNakBGbiudWwWZG2+OR ae4Qt+jUT5JJPl52hSgEHA48gDX3QeSlX8ZAQgEqle91n05BSFmn34CjTesHbtHmmsYW IYT9f/oWUMxSXdUME1DgGmgvEOHTeW1hxEAhZpiWcL/yOGwdXLuUWfI7Cd9EUptbkxSD GmJQ== X-Gm-Message-State: AOAM531Vl/IauzDKnkOGyqgriQhGeuDOFhBwRAggA/NJf1X67fXXcwN+ ZWc7bg7UuvY/NS67lBnEmbbgFSYpfnTM/Ss2AyU= X-Google-Smtp-Source: ABdhPJy8qtwWlGJzenck4mmI35r3avt7Dp7nA3L9LeHk2vtfodVCekLyZhnAFyGMN5zKmfY7lN6BvhI4X/FCtOTHNZY= X-Received: by 2002:a6b:24d:: with SMTP id 74mr4538127ioc.134.1630799419922; Sat, 04 Sep 2021 16:50:19 -0700 (PDT) List-Id: Technical discussions relating to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-hackers List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-hackers@freebsd.org MIME-Version: 1.0 References: <20210904182529.75e411b8@ernst.home> In-Reply-To: <20210904182529.75e411b8@ernst.home> From: Ed Maste Date: Sat, 4 Sep 2021 19:50:02 -0400 Message-ID: Subject: Re: OpenSSH 8.7p1 update for the base system To: gljennjohn@gmail.com Cc: FreeBSD Hackers Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4H2BHQ4Qqhz4f7Q X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N On Sat, 4 Sept 2021 at 14:25, Gary Jennejohn wrote: > > > I tried to apply the patch but it resulted in lots of warnings about > modifying an existing file and should a reversion be made. Hrm, I wasn't able to reproduce this -- I just did: % git checkout 7b81e6c7caf23adca6a2cabdfdf29985eab9865d % fetch https://people.freebsd.org/~emaste/openssh/FreeBSD-base-openssh-8.7p1-20210904-114623.diff % patch -p1 < FreeBSD-base-openssh-8.7p1-20210904-114623. and it applied with no errors. The only thing I can think of off hand is to make sure that your working tree is clean before trying to apply the patch (i.e., make sure `git status` doesn't list any modified or added files).