From nobody Sun Sep 05 00:52:24 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 EFBF11798D19 for ; Sun, 5 Sep 2021 00:52:33 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) (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 4H2Cg568gXz3Bsb; Sun, 5 Sep 2021 00:52:33 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: by mail-ej1-x630.google.com with SMTP id u14so5788686ejf.13; Sat, 04 Sep 2021 17:52:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=Nu9DyVlxixH7l7XysjiFRL/1OnUksRim3iGXWieif6A=; b=LUXOuMbExR7K2XBvuhgMqgEYyRXM77xmgxmgkGIIOJx5PW2VpZNeJh8LSMCUw1xYi9 YysQF8oxiUdLbTTj3orysY8+/BRzbagAnqmvPgDv1pOoOp1ACPwokj/uTW+A8MC6/tgV aGQmSEvtJ9X8AwPIs9I99OPARxsWEBapSFv+YnTGhDmw7emrFwfDkRhMOQhkv55Y2+ft dtfv7pydDxvpHwHJrS+r+m5FUyUd6p7CE3lMCuvu/BcfMMqygCFP/MP2phM6Nrt80OW5 1/7v3RQ5AIHaDPfwFjB7K/cXM2Yme4UzfBPNPWgY5UQcO8gZv0iBF4GH0OBwUwo1M1/X azRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=Nu9DyVlxixH7l7XysjiFRL/1OnUksRim3iGXWieif6A=; b=EIb5XYjJwhpewp6YtVPPuSUsV2/ehiRnVWaSWsfWOeThYhP/GaIL9xkxTWl+1V2QvZ RTQ3+VKH//Evm2qv7AFeodxT2QxKi6FSXEC0dvlyPFbIgOwsh0vFJQiqjKnDuGlVyle6 jtISFpwjPcy53UeDi2DjqWP2sb9D8hghkI1xIh6RX11BwLs+dClprwyfoT+sQd6QjieQ jm0jRPKh3osNXq+3WkeZ05zMRgn/5OElNpy5PWydd7jnHVo4mdYoAPv+FEHBrM1A7Rjp rWg6VtPkS5VnhQa2Knl6wRRYsypR734JeO+eIyQyJDXHBiAq9DOrI2EPsWYRxrcAlFrN B/Gw== X-Gm-Message-State: AOAM5301qaR0812/iDFyEQ6EcznTiHccNc7hxpTcTAD08nUX1sxA2iOx M16iXERoK8XibPZ2tuppdNTSOCeXYTg= X-Google-Smtp-Source: ABdhPJwez7M85Hj+Bkkel9xjc0okvr7HID2I/hxjjHmjJrJFDKhXws+vxT+TsoIa8GL95iGOuvXE/g== X-Received: by 2002:a17:906:4cc1:: with SMTP id q1mr6340994ejt.415.1630803146753; Sat, 04 Sep 2021 17:52:26 -0700 (PDT) Received: from ernst.home (p5b023517.dip0.t-ipconnect.de. [91.2.53.23]) by smtp.gmail.com with ESMTPSA id gl2sm1651777ejb.110.2021.09.04.17.52.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Sep 2021 17:52:26 -0700 (PDT) Date: Sun, 5 Sep 2021 02:52:24 +0200 From: Gary Jennejohn To: Ed Maste Cc: FreeBSD Hackers Subject: Re: OpenSSH 8.7p1 update for the base system Message-ID: <20210905005224.1378f058@ernst.home> In-Reply-To: References: <20210904182529.75e411b8@ernst.home> Reply-To: gljennjohn@gmail.com X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) 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 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4H2Cg568gXz3Bsb 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 Sep 2021 19:50:02 -0400 Ed Maste wrote: > 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). Right, my tree was messed up. After re-checking out the tree the patch applied cleanly. Thanks! -- Gary Jennejohn