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
This commit is contained in:
Ed Maste
parent
a8280123e4
commit
835ee05f3c
@ -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$
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
__RCSID("$FreeBSD$");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
__RCSID("$FreeBSD$");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
@ -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 |
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
xargs perl -n -i -e '
|
||||
print;
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
:>keywords
|
||||
:>rcsid
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
/* $FreeBSD$ */
|
||||
#define GSSAPI 1
|
||||
#define HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE 1
|
||||
#define HAVE_GSSAPI_GSSAPI_H 1
|
||||
|
||||
@ -38,7 +38,6 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
__RCSID("$FreeBSD$");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include "openbsd-compat/sys-queue.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>
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
__RCSID("$FreeBSD$");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.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>
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
__RCSID("$FreeBSD$");
|
||||
|
||||
#ifdef SANDBOX_CAPSICUM
|
||||
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
__RCSID("$FreeBSD$");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
__RCSID("$FreeBSD$");
|
||||
|
||||
#include <sys/types.h>
|
||||
#ifdef HAVE_SYS_STAT_H
|
||||
|
||||
@ -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
|
||||
|
||||
@ -35,7 +35,6 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
__RCSID("$FreeBSD$");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/resource.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.
|
||||
*
|
||||
|
||||
@ -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
|
||||
|
||||
@ -41,7 +41,6 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
__RCSID("$FreeBSD$");
|
||||
|
||||
#include <sys/types.h>
|
||||
#ifdef HAVE_SYS_STAT_H
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
__RCSID("$FreeBSD$");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -43,7 +43,6 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
__RCSID("$FreeBSD$");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user