Date: Sat, 23 Apr 2022 02:17:23 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 835ee05f3c75 - main - ssh: drop $FreeBSD$ from crypto/openssh Message-ID: <202204230217.23N2HNNq064236@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=835ee05f3c754d905099a3500f421dc01fab028f commit 835ee05f3c754d905099a3500f421dc01fab028f Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2022-04-22 23:05:44 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2022-04-22 23:12:23 +0000 ssh: drop $FreeBSD$ from crypto/openssh After we moved to git $FreeBSD$ is no longer expanded and serves no purpose. Remove them from OpenSSH to reduce diffs against upstream. Sponsored by: The FreeBSD Foundation --- crypto/openssh/FREEBSD-upgrade | 2 -- crypto/openssh/auth.c | 1 - crypto/openssh/auth2.c | 1 - crypto/openssh/freebsd-configure.sh | 5 +---- crypto/openssh/freebsd-namespace.sh | 2 -- crypto/openssh/freebsd-post-merge.sh | 2 -- crypto/openssh/freebsd-pre-merge.sh | 2 -- crypto/openssh/krb5_config.h | 1 - crypto/openssh/packet.c | 1 - crypto/openssh/pathnames.h | 1 - crypto/openssh/readconf.c | 1 - crypto/openssh/readconf.h | 1 - crypto/openssh/sandbox-capsicum.c | 1 - crypto/openssh/servconf.c | 1 - crypto/openssh/session.c | 1 - crypto/openssh/ssh-agent.1 | 1 - crypto/openssh/ssh-agent.c | 1 - crypto/openssh/ssh-gss.h | 1 - crypto/openssh/ssh.1 | 1 - crypto/openssh/ssh.c | 1 - crypto/openssh/ssh_config | 1 - crypto/openssh/ssh_config.5 | 1 - crypto/openssh/sshconnect.c | 1 - crypto/openssh/sshd.8 | 1 - crypto/openssh/sshd.c | 1 - crypto/openssh/sshd_config | 1 - crypto/openssh/sshd_config.5 | 1 - crypto/openssh/umac128.c | 1 - crypto/openssh/version.h | 1 - 29 files changed, 1 insertion(+), 36 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 02c2597f5667..52793e84c366 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -208,5 +208,3 @@ Labs, ThinkSec, Nescafé, the Aberlour Glenlivet Distillery Co., Suzanne Vega, and a Sanford's #69 Deluxe Marker. -- des@FreeBSD.org - -$FreeBSD$ diff --git a/crypto/openssh/auth.c b/crypto/openssh/auth.c index ad5a14e05ae8..0852a2d85728 100644 --- a/crypto/openssh/auth.c +++ b/crypto/openssh/auth.c @@ -24,7 +24,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/stat.h> diff --git a/crypto/openssh/auth2.c b/crypto/openssh/auth2.c index ec17c4b0b256..6f43c0979f19 100644 --- a/crypto/openssh/auth2.c +++ b/crypto/openssh/auth2.c @@ -24,7 +24,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/stat.h> diff --git a/crypto/openssh/freebsd-configure.sh b/crypto/openssh/freebsd-configure.sh index 3cde318ade58..28c9564435b2 100755 --- a/crypto/openssh/freebsd-configure.sh +++ b/crypto/openssh/freebsd-configure.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# $FreeBSD$ -# configure_args=" --prefix=/usr @@ -49,10 +47,9 @@ mv config.h config.h.sk-builtin sh configure $configure_args --without-kerberos5 --without-security-key-builtin # Extract the difference -echo '/* $Free''BSD$ */' > krb5_config.h diff -u config.h.kerberos5 config.h | sed -n '/^-#define/s/^-//p' | - grep -Ff /dev/stdin config.h.kerberos5 >> krb5_config.h + grep -Ff /dev/stdin config.h.kerberos5 > krb5_config.h # Extract the difference - SK diff -u config.h.sk-builtin config.h | diff --git a/crypto/openssh/freebsd-namespace.sh b/crypto/openssh/freebsd-namespace.sh index 79416247aff9..b347700b95f7 100755 --- a/crypto/openssh/freebsd-namespace.sh +++ b/crypto/openssh/freebsd-namespace.sh @@ -6,8 +6,6 @@ # other libraries or applications which link with libssh, either directly # or indirectly (e.g. through PAM loading pam_ssh). # -# $FreeBSD$ -# set -e diff --git a/crypto/openssh/freebsd-post-merge.sh b/crypto/openssh/freebsd-post-merge.sh index b9e4cbddc7e8..ede469cf8283 100755 --- a/crypto/openssh/freebsd-post-merge.sh +++ b/crypto/openssh/freebsd-post-merge.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# $FreeBSD$ -# xargs perl -n -i -e ' print; diff --git a/crypto/openssh/freebsd-pre-merge.sh b/crypto/openssh/freebsd-pre-merge.sh index f98e71822a0c..20376fb52351 100755 --- a/crypto/openssh/freebsd-pre-merge.sh +++ b/crypto/openssh/freebsd-pre-merge.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# $FreeBSD$ -# :>keywords :>rcsid diff --git a/crypto/openssh/krb5_config.h b/crypto/openssh/krb5_config.h index af1f80bb599a..2a6d35fbe3fd 100644 --- a/crypto/openssh/krb5_config.h +++ b/crypto/openssh/krb5_config.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ #define GSSAPI 1 #define HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE 1 #define HAVE_GSSAPI_GSSAPI_H 1 diff --git a/crypto/openssh/packet.c b/crypto/openssh/packet.c index fb65e6eb700e..a4d0537c7742 100644 --- a/crypto/openssh/packet.c +++ b/crypto/openssh/packet.c @@ -38,7 +38,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include <sys/types.h> #include "openbsd-compat/sys-queue.h" diff --git a/crypto/openssh/pathnames.h b/crypto/openssh/pathnames.h index eafa7d4efa41..205c9b0f696e 100644 --- a/crypto/openssh/pathnames.h +++ b/crypto/openssh/pathnames.h @@ -1,5 +1,4 @@ /* $OpenBSD: pathnames.h,v 1.31 2019/11/12 19:33:08 markus Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index d01716d6ea65..0a59470a74ae 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -13,7 +13,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/stat.h> diff --git a/crypto/openssh/readconf.h b/crypto/openssh/readconf.h index be67885e3903..31f4acb47084 100644 --- a/crypto/openssh/readconf.h +++ b/crypto/openssh/readconf.h @@ -1,5 +1,4 @@ /* $OpenBSD: readconf.h,v 1.146 2021/12/19 22:14:47 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> diff --git a/crypto/openssh/sandbox-capsicum.c b/crypto/openssh/sandbox-capsicum.c index dc3a22538872..ad241f6fd027 100644 --- a/crypto/openssh/sandbox-capsicum.c +++ b/crypto/openssh/sandbox-capsicum.c @@ -15,7 +15,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #ifdef SANDBOX_CAPSICUM diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index 6ab8e66f09e2..6eaf9c2876ff 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -12,7 +12,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/socket.h> diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c index 375ccb671d80..ba0bbffdb440 100644 --- a/crypto/openssh/session.c +++ b/crypto/openssh/session.c @@ -34,7 +34,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include <sys/types.h> #ifdef HAVE_SYS_STAT_H diff --git a/crypto/openssh/ssh-agent.1 b/crypto/openssh/ssh-agent.1 index 8844b2eb45e8..e918691ba9f7 100644 --- a/crypto/openssh/ssh-agent.1 +++ b/crypto/openssh/ssh-agent.1 @@ -1,5 +1,4 @@ .\" $OpenBSD: ssh-agent.1,v 1.73 2022/03/31 17:27:27 naddy Exp $ -.\" $FreeBSD$ .\" .\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland diff --git a/crypto/openssh/ssh-agent.c b/crypto/openssh/ssh-agent.c index a777d8b1c18c..479c77d1a945 100644 --- a/crypto/openssh/ssh-agent.c +++ b/crypto/openssh/ssh-agent.c @@ -35,7 +35,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/resource.h> diff --git a/crypto/openssh/ssh-gss.h b/crypto/openssh/ssh-gss.h index e19009770f5d..8e3cf2c0d79d 100644 --- a/crypto/openssh/ssh-gss.h +++ b/crypto/openssh/ssh-gss.h @@ -1,5 +1,4 @@ /* $OpenBSD: ssh-gss.h,v 1.15 2021/01/27 10:05:28 djm Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * diff --git a/crypto/openssh/ssh.1 b/crypto/openssh/ssh.1 index 9c6f5b798778..be43e87134b2 100644 --- a/crypto/openssh/ssh.1 +++ b/crypto/openssh/ssh.1 @@ -34,7 +34,6 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh.1,v 1.430 2022/03/31 17:27:27 naddy Exp $ -.\" $FreeBSD$ .Dd $Mdocdate: March 31 2022 $ .Dt SSH 1 .Os diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c index 8fcadfdf9107..8a33b06bea88 100644 --- a/crypto/openssh/ssh.c +++ b/crypto/openssh/ssh.c @@ -41,7 +41,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include <sys/types.h> #ifdef HAVE_SYS_STAT_H diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config index 792a47f333ee..7c7ad542e4ef 100644 --- a/crypto/openssh/ssh_config +++ b/crypto/openssh/ssh_config @@ -1,5 +1,4 @@ # $OpenBSD: ssh_config,v 1.35 2020/07/17 03:43:42 dtucker Exp $ -# $FreeBSD$ # This is the ssh client system-wide configuration file. See # ssh_config(5) for more information. This file provides defaults for diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5 index cb51f6aefe57..04d66e24d743 100644 --- a/crypto/openssh/ssh_config.5 +++ b/crypto/openssh/ssh_config.5 @@ -34,7 +34,6 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh_config.5,v 1.371 2022/03/31 17:58:44 naddy Exp $ -.\" $FreeBSD$ .Dd $Mdocdate: March 31 2022 $ .Dt SSH_CONFIG 5 .Os diff --git a/crypto/openssh/sshconnect.c b/crypto/openssh/sshconnect.c index d175ccdccec2..8030583c50aa 100644 --- a/crypto/openssh/sshconnect.c +++ b/crypto/openssh/sshconnect.c @@ -14,7 +14,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/wait.h> diff --git a/crypto/openssh/sshd.8 b/crypto/openssh/sshd.8 index db4c35da847c..1043185c539c 100644 --- a/crypto/openssh/sshd.8 +++ b/crypto/openssh/sshd.8 @@ -34,7 +34,6 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd.8,v 1.318 2022/03/31 17:27:27 naddy Exp $ -.\" $FreeBSD$ .Dd $Mdocdate: March 31 2022 $ .Dt SSHD 8 .Os diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c index 1995ba82d3b6..c8a405a96ce5 100644 --- a/crypto/openssh/sshd.c +++ b/crypto/openssh/sshd.c @@ -43,7 +43,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/ioctl.h> diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index 9aa116b1792a..bb2e1098368e 100644 --- a/crypto/openssh/sshd_config +++ b/crypto/openssh/sshd_config @@ -1,5 +1,4 @@ # $OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $ -# $FreeBSD$ # This is the sshd server system-wide configuration file. See # sshd_config(5) for more information. diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5 index a30975d0fc59..e8b835be3d38 100644 --- a/crypto/openssh/sshd_config.5 +++ b/crypto/openssh/sshd_config.5 @@ -34,7 +34,6 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd_config.5,v 1.340 2022/03/31 17:58:44 naddy Exp $ -.\" $FreeBSD$ .Dd $Mdocdate: March 31 2022 $ .Dt SSHD_CONFIG 5 .Os diff --git a/crypto/openssh/umac128.c b/crypto/openssh/umac128.c index 88b242a6fd5c..7d8798f10f8b 100644 --- a/crypto/openssh/umac128.c +++ b/crypto/openssh/umac128.c @@ -1,5 +1,4 @@ /* $OpenBSD: umac128.c,v 1.2 2018/02/08 04:12:32 dtucker Exp $ */ -/* $FreeBSD$ */ /* undo ssh_namespace.h munging */ #undef umac_new diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index d919b88fb53f..afebfdaeb591 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -1,5 +1,4 @@ /* $OpenBSD: version.h,v 1.93 2022/02/23 11:07:09 djm Exp $ */ -/* $FreeBSD$ */ #define SSH_VERSION "OpenSSH_9.0"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204230217.23N2HNNq064236>