From nobody Fri Jan 20 21:08:02 2023 X-Original-To: dev-commits-src-branches@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 4NzBst4KjMz310RY; Fri, 20 Jan 2023 21:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NzBst3st0z3PnX; Fri, 20 Jan 2023 21:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674248882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZTBD/ZEhsb/VakqygxTM6CmoFuBCuMghLPUtxiBRueQ=; b=Rgy9mM7bbO2e4BdwW3panUmc+IplXWUt/3qY3flO7bRKKEpstodUmqcqnRYdUmD7lKno6C HlB0y0oJ8wzATJrYbXDbYkorhT/tDsUW5etzbXORkK66BGR4QGbJUhdzmiZtrBIVgv09XM VM2k+Xbdrys1MSns97BSPB/2zmlsp77gh1LXm0UZVderBRv3nxp9i8ZqQsOOpqVjhDW3sr dPZWEn8t9A9srs+0+98OyVSaFervdPoNWDeR5QucH98Il8gFleNhUT+Ct58YVcrWgxAxZJ r7/sfn8PoKQZ8/eMfvnhBTJMen+OqoUpbZJZTdKC2vWVyXV+QSPYpjRUnL9rzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674248882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZTBD/ZEhsb/VakqygxTM6CmoFuBCuMghLPUtxiBRueQ=; b=dlaZj3/Lpm44JncYHNs49nFWquFdE9qI2aKXCc3bJO5WmC3ffxEKek3wvngv+tWVPSnbeA YcwosAEkWG74wU/7eisj559RDUCDrSu8AXWj1M38+8el4ajWiQQLFUNnOGjHTVouooegzH 0r4WGq/SosD/w7QEqA0PAOgYQTG5axTMXtQ6lfe+ig4L1v9T3oRCY7lAxmpBWJND8WkI6T GC2U/ITV1dHJpxAG0AR4JLNE7e8h7YxOkyEAYa3zhgT+Ad/ef8asheqFzbWWWA4AcKag98 EfVIDTGZKsyAjZFs5ifwhsJ2EnJyM8yk4oLrm5r+hgNLF78DaLNKFLcmxdVk3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674248882; a=rsa-sha256; cv=none; b=aDNrWFdG060L8+ugwy/Bk6X0qokVKp1GdC9qwESbxG5pvd+3ga/TskPbdnSrDMr2daqH4+ V9QWuW7/FiPO/cAS8eReHxvT0G0vCmLnQaJ+MqRwMDoXHGNn7G8rJjXHwfU2PmsWF7tLeM uz3VEJNAbPEKh+9Y5qiSfQRRQcFvKLSUdNv318i3EG0j5FLmpYNuWfLHwK/XpXBO3GE4Yg snrD3wGOTwUYg8wXhXcTDjflZaky9ED20egYY4hbNSFfl/tDbnpVSUtO1xnDTd8hNvapuv +Swwqi2UBJV2RXmNbpg6wednoIEUEDAO2hTxXEcq/AnsxSVAHls9DKo+zqiSCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NzBst2x7QzlJV; Fri, 20 Jan 2023 21:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30KL82oO058490; Fri, 20 Jan 2023 21:08:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30KL82pk058489; Fri, 20 Jan 2023 21:08:02 GMT (envelope-from git) Date: Fri, 20 Jan 2023 21:08:02 GMT Message-Id: <202301202108.30KL82pk058489@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b338bdf7fb0d - stable/13 - openssh: remove mention of now-unused svn:keywords List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b338bdf7fb0dfe771456a14cc4d8a08cc7b48033 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b338bdf7fb0dfe771456a14cc4d8a08cc7b48033 commit b338bdf7fb0dfe771456a14cc4d8a08cc7b48033 Author: Ed Maste AuthorDate: 2023-01-16 14:52:00 +0000 Commit: Ed Maste CommitDate: 2023-01-20 21:07:27 +0000 openssh: remove mention of now-unused svn:keywords Reported by: gshapiro (cherry picked from commit 9b7eddfeed465d4062dbad178261b806e97d6b62) --- crypto/openssh/FREEBSD-upgrade | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index fedbd80a2e3c..c8603577a2a2 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -73,10 +73,7 @@ $ git diff --diff-filter=M vendor/openssh/X.YpZ HEAD:crypto/openssh - Files that have modifications relative to the vendor code, and - only those files, must have the svn:keywords property set to - FreeBSD=%H and be listed in the 'keywords' file created by the - pre-merge script. + Review the diff for any unexpected changes. 12) Run the configure script: