From nobody Sun Sep 05 01:55:12 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 A1C8317B3F0C for ; Sun, 5 Sep 2021 01:55:38 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) (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 4H2F3s3QcCz3k4F for ; Sun, 5 Sep 2021 01:55:37 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f51.google.com with SMTP id n24so3958634ion.10 for ; Sat, 04 Sep 2021 18:55:37 -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; bh=7dOUGpB1kCGlxSBo6klyQXYRYk9nXnLvR1AZu17DTvM=; b=V5bWfgFvshQerggX6LFMqm6IR8sKBulSCH9vMZVgvL0HliL+gfeL89gqqknA0uaaW3 B4qixGgjJZK/+O0ghKE1b0STCNKbqTxJ0ir4dAAMJyUrZsA9oP1/spF8nDYuJExpt21F qL1h7IvAd9jUaDMh7IS3h/+KZOWfNB0ZAn8TNS8TQPQ/O4ucyssEGV9MZ2OfzEQwWikw +aFNWeIPR95CeCstTsy3nvspPzj2qhIhKLphWFFt/5+afG3kTJFeh9lXk/OaIvedX5BX pgvv9G0AKYUNITuZdnfhJb2VfyuvSiUVgndUZDLjCh0klyJCgqMLV2bU5EiavbuhAayf kCPA== X-Gm-Message-State: AOAM533CkayeqEOdhFuNMFLodNhNYH6Fw8p98waRFM1khUdPq1XMlFMj l5QxqpHHeboobm1HQu8dcxuQ8hxIhN9934uJ/BPRmMP1RSw= X-Google-Smtp-Source: ABdhPJzyudl/+cer+fG9NuFJPggXzeGfxvEaimknaaHR4IPz07mnV5LfklTPttSVgu5Y5Mg35F68cHCZASySkRgwK3o= X-Received: by 2002:a6b:24d:: with SMTP id 74mr4793201ioc.134.1630806930449; Sat, 04 Sep 2021 18:55:30 -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: In-Reply-To: From: Ed Maste Date: Sat, 4 Sep 2021 21:55:12 -0400 Message-ID: Subject: Re: OpenSSH 8.7p1 update for the base system To: FreeBSD Hackers Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4H2F3s3QcCz3k4F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.51 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCVD_COUNT_TWO(0.00)[2]; FREEFALL_USER(0.00)[carpeddiem]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-hackers@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-0.996]; RCVD_TLS_ALL(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.51:from]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.51:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DOM_EQ_FROM_DOM(0.00)[] X-ThisMailContainsUnwantedMimeParts: N On Sat, 4 Sept 2021 at 11:59, Ed Maste wrote: > > I'm preparing to update OpenSSH in the FreeBSD base system to 8.7p1, > and am sharing an initial patch for testing. ... > Also as a diff against main: > https://people.freebsd.org/~emaste/openssh/FreeBSD-base-openssh-8.7p1-20210904-114623.diff It turns out there is a renamed file that confuses patch. If you've applied this patch you should be able to rectify it by running: mv crypto/openssh/openbsd-compat/realpath.c \ crypto/openssh/sftp-realpath.c If you haven't applied the patch yet I've regenerated it. with --no-renames, here: https://people.freebsd.org/~emaste/openssh/FreeBSD-base-openssh-8.7p1-20210904-215057.diff