kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-16 23:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

secure: Rearrange Makefile SRCS to match upstream Makefile.in

Browse source 
SRCS entries are kept in the same order and with the same line breaks as
upstream, to make comparison easier.

No functional change intended.

Reviewed by:	emaste
Approved by:	emaste (mentor)
Differential Revision:	https://reviews.freebsd.org/D49793
This commit is contained in:
Jose Luis Duran 2025-04-17 18:56:00 +00:00
parent 44b69b1a96
commit 9440aad19d
No known key found for this signature in database
GPG key ID: 5415E244477475CC
7 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
secure/lib/libssh/Makefile
View file

@ -4,10 +4,22 @@
LIB= ssh
PRIVATELIB= true
SHLIB_MAJOR= 5
SRCS= ssh_api.c ssherr.c \
sshbuf.c sshkey.c sshbuf-getput-basic.c \
sshbuf-misc.c sshbuf-getput-crypto.c krl.c bitmap.c
SRCS+= authfd.c authfile.c \
LIBOPENSSH_SRCS=\
ssh_api.c \
ssherr.c \
sshbuf.c \
sshkey.c \
sshbuf-getput-basic.c \
sshbuf-misc.c \
sshbuf-getput-crypto.c \
krl.c \
bitmap.c
# gss-genr.c should be in $SRCS but causes linking problems, so it is
# compiled directly into sshd instead.
SRCS= ${LIBOPENSSH_SRCS} \
authfd.c authfile.c \
canohost.c channels.c cipher.c cipher-aes.c cipher-aesctr.c \
cleanup.c \
compat.c fatal.c hostfile.c \
@ -30,9 +42,6 @@ SRCS+= ssh-sk-client.c
PACKAGE= ssh
# gss-genr.c should be in $SRCS but causes linking problems, so it is
# compiled directly into sshd instead.
# Portability layer
SRCS+= bcrypt_pbkdf.c blowfish.c bsd-misc.c bsd-signal.c explicit_bzero.c \
fmt_scaled.c freezero.c glob.c \

4
secure/libexec/sftp-server/Makefile
View file

@ -1,8 +1,8 @@
.include <src.opts.mk>
.include "${SRCTOP}/secure/ssh.mk"
PROG= sftp-server
SRCS= sftp-server.c sftp-common.c sftp-server-main.c
PROG= sftp-server
SRCS= sftp-common.c sftp-server.c sftp-server-main.c
MAN= sftp-server.8
LIBADD= ssh

2
secure/libexec/ssh-pkcs11-helper/Makefile
View file

@ -2,7 +2,7 @@
.include "${SRCTOP}/secure/ssh.mk"
PROG= ssh-pkcs11-helper
SRCS= ssh-pkcs11.c ssh-pkcs11-helper.c
SRCS= ssh-pkcs11-helper.c ssh-pkcs11.c
MAN= ssh-pkcs11-helper.8
LIBADD= crypto ssh

2
secure/ssh.mk
View file

@ -4,6 +4,8 @@
SSHDIR= ${SRCTOP}/crypto/openssh
SFTP_CLIENT_SRCS=sftp-common.c sftp-client.c sftp-glob.c
CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"

2
secure/usr.bin/scp/Makefile
View file

@ -2,7 +2,7 @@
.include "${SRCTOP}/secure/ssh.mk"
PROG= scp
SRCS= scp.c sftp-common.c sftp-client.c sftp-glob.c progressmeter.c
SRCS= scp.c progressmeter.c $(SFTP_CLIENT_SRCS)
PACKAGE= ssh
LIBADD= ssh

3
secure/usr.bin/sftp/Makefile
View file

@ -2,8 +2,7 @@
.include "${SRCTOP}/secure/ssh.mk"
PROG= sftp
SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c sftp-usergroup.c \
progressmeter.c
SRCS= sftp.c sftp-usergroup.c progressmeter.c $(SFTP_CLIENT_SRCS)
PACKAGE= ssh
LIBADD= ssh edit

2
secure/usr.bin/ssh-add/Makefile
View file

@ -2,7 +2,7 @@
.include "${SRCTOP}/secure/ssh.mk"
PROG= ssh-add
SRCS+= ssh-add.c ssh-sk-client.c
SRCS= ssh-add.c ssh-sk-client.c
PACKAGE= ssh
LIBADD= ssh