From 53789510e0693671b65460f3ad6c558920150abc Mon Sep 17 00:00:00 2001 From: Peter Avalos Date: Sun, 10 Jan 2010 05:46:44 +0000 Subject: [PATCH] Change Makefiles for OpenSSH to more closely match the distro. This makes it slightly easier for updates. This also fixes buildworld. --- secure/lib/libssh/Makefile | 22 +++++++++++----------- secure/libexec/sftp-server/Makefile | 2 +- secure/libexec/ssh-keysign/Makefile | 2 +- secure/usr.bin/scp/Makefile | 1 + secure/usr.bin/sftp/Makefile | 2 +- secure/usr.bin/ssh-add/Makefile | 1 + secure/usr.bin/ssh-agent/Makefile | 1 + secure/usr.bin/ssh-keygen/Makefile | 1 + secure/usr.bin/ssh-keyscan/Makefile | 2 +- secure/usr.bin/ssh-vulnkey/Makefile | 2 +- secure/usr.bin/ssh/Makefile | 6 +++--- secure/usr.sbin/sshd/Makefile | 21 ++++++++++++--------- 12 files changed, 35 insertions(+), 28 deletions(-) diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 526a333f2b..e2920dc2fb 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -3,18 +3,18 @@ LIB= ssh SHLIB_MAJOR= 4 -SRCS= acss.c addrmatch.c authfd.c authfile.c \ - bufaux.c bufbn.c buffer.c canohost.c \ - channels.c cipher.c cipher-acss.c cipher-aes.c cipher-bf1.c \ - cipher-ctr.c cipher-3des1.c cleanup.c compat.c compress.c crc32.c \ - deattack.c fatal.c hostfile.c log.c match.c md-sha256.c \ - moduli.c nchan.c packet.c \ - readpass.c rsa.c ttymodes.c xmalloc.c atomicio.c \ - key.c dispatch.c kex.c mac.c uuencode.c misc.c rijndael.c ssh-dss.c \ - ssh-rsa.c dh.c kexdh.c kexgex.c kexdhc.c kexgexc.c scard.c msg.c \ - progressmeter.c dns.c scard-opensc.c getrrsetbyname.c uidswap.c umac.c +SRCS= acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.c \ + canohost.c channels.c cipher.c cipher-acss.c cipher-aes.c \ + cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \ + compat.c compress.c crc32.c deattack.c fatal.c hostfile.c \ + log.c match.c md-sha256.c moduli.c nchan.c packet.c \ + readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c \ + atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \ + monitor_fdpass.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c \ + kexgex.c kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \ + entropy.c scard-opensc.c gss-genr.c umac.c jpake.c schnorr.c # Portability layer -SRCS+= bsd-arc4random.c bsd-misc.c entropy.c port-tun.c +SRCS+= bsd-misc.c getrrsetbyname.c port-tun.c # FreeBSD additions SRCS+= version.c diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index 2a0c532bf4..6cd7bca0c8 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -2,7 +2,7 @@ # $DragonFly: src/secure/libexec/sftp-server/Makefile,v 1.4 2008/04/07 01:20:18 pavalos Exp $ PROG= sftp-server -SRCS= sftp-server.c sftp-common.c sftp-server-main.c +SRCS= sftp-server.c sftp-common.c sftp-server-main.c roaming_dummy.c MAN= sftp-server.8 .include "../../Makefile.ssh.common" diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile index 281fa6beb0..111ebfc89b 100644 --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -2,7 +2,7 @@ # $DragonFly: src/secure/libexec/ssh-keysign/Makefile,v 1.5 2008/04/07 01:20:18 pavalos Exp $ PROG= ssh-keysign -SRCS= ssh-keysign.c readconf.c uidswap.c +SRCS= ssh-keysign.c readconf.c roaming_dummy.c MAN= ssh-keysign.8 .if defined(ENABLE_SUID_SSH) BINMODE=4511 diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index 9964dcdc99..b24c25d27c 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -2,6 +2,7 @@ # $DragonFly: src/secure/usr.bin/scp/Makefile,v 1.3 2004/07/31 19:03:01 geekgod Exp $ PROG= scp +SRCS= scp.c roaming_dummy.c .include "../../Makefile.ssh.common" .include diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 203f8f852c..a5e84c9331 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -2,7 +2,7 @@ # $DragonFly: src/secure/usr.bin/sftp/Makefile,v 1.5 2008/09/28 03:19:46 pavalos Exp $ PROG= sftp -SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c +SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c roaming_dummy.c # Portability layer SRCS+= fmt_scaled.c diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index fef4ed7ac8..3f1e585351 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -2,6 +2,7 @@ # $DragonFly: src/secure/usr.bin/ssh-add/Makefile,v 1.3 2004/07/31 19:03:01 geekgod Exp $ PROG= ssh-add +SRCS+= ssh-add.c roaming_dummy.c .include "../../Makefile.ssh.common" .include diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index e0898192dd..1e15e66152 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -2,6 +2,7 @@ # $DragonFly: src/secure/usr.bin/ssh-agent/Makefile,v 1.4 2008/04/07 01:20:18 pavalos Exp $ PROG= ssh-agent +SRCS= ssh-agent.c roaming_dummy.c .include "../../Makefile.ssh.common" .include diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index ea441d9ce8..f98d7b4fff 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -2,6 +2,7 @@ # $DragonFly: src/secure/usr.bin/ssh-keygen/Makefile,v 1.3 2004/07/31 19:03:01 geekgod Exp $ PROG= ssh-keygen +SRCS= ssh-keygen.c roaming_dummy.c .include "../../Makefile.ssh.common" .include diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index ae9b553422..045084710b 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -3,7 +3,7 @@ PROG= ssh-keyscan -SRCS= ssh-keyscan.c misc.c +SRCS= ssh-keyscan.c misc.c roaming_dummy.c DPADD+= ${LIBZ} LDADD+= -lz diff --git a/secure/usr.bin/ssh-vulnkey/Makefile b/secure/usr.bin/ssh-vulnkey/Makefile index aaeeee5c59..2761b42081 100644 --- a/secure/usr.bin/ssh-vulnkey/Makefile +++ b/secure/usr.bin/ssh-vulnkey/Makefile @@ -3,7 +3,7 @@ PROG= ssh-vulnkey -SRCS= ssh-vulnkey.c +SRCS= ssh-vulnkey.c roaming_dummy.c .include "../../Makefile.ssh.common" .include diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 446609d2f4..f98deec8d9 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -7,9 +7,9 @@ LINKS= ${BINDIR}/ssh ${BINDIR}/slogin MAN= ssh.1 ssh_config.5 MLINKS= ssh.1 slogin.1 -SRCS= channels.c clientloop.c kex.c misc.c monitor_fdpass.c mux.c packet.c \ - readconf.c roaming_common.c ssh.c sshconnect.c sshconnect1.c \ - sshconnect2.c sshtty.c uidswap.c +SRCS= ssh.c readconf.c clientloop.c sshtty.c \ + sshconnect.c sshconnect1.c sshconnect2.c mux.c \ + roaming_common.c .if defined(X11BASE) CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\" diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 5cf85cf3a2..8116d3ea02 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -3,18 +3,21 @@ # PROG= sshd -SRCS= sshd.c addrmatch.c auth-rhosts.c auth-pam.c auth-passwd.c auth-rsa.c \ - auth-rh-rsa.c sshpty.c sshlogin.c servconf.c serverloop.c uidswap.c \ - auth.c auth1.c auth2.c auth-options.c session.c packet.c \ - auth-chall.c auth2-chall.c groupaccess.c auth-skey.c \ - auth-bsdauth.c auth2-hostbased.c sftp-server.c sftp-common.c \ - auth2-kbdint.c auth2-none.c auth2-passwd.c auth2-pubkey.c \ - monitor_mm.c monitor.c monitor_wrap.c monitor_fdpass.c \ - kexdhs.c kexgexs.c misc.c dh.c kex.c channels.c platform.c \ +SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ + sshpty.c sshlogin.c servconf.c serverloop.c \ + auth.c auth1.c auth2.c auth-options.c session.c \ + auth-chall.c auth2-chall.c groupaccess.c \ + auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \ + auth2-none.c auth2-passwd.c auth2-pubkey.c auth2-jpake.c \ + monitor_mm.c monitor.c monitor_wrap.c kexdhs.c kexgexs.c \ + auth-krb5.c \ + auth2-gss.c gss-serv.c gss-serv-krb5.c \ + loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \ + audit.c audit-bsm.c platform.c sftp-server.c sftp-common.c \ roaming_common.c # Portability layer -SRCS+= bsd-arc4random.c loginrec.c xmmap.c +SRCS+= xmmap.c MAN= sshd.8 sshd_config.5 # Passwd routine -- 2.41.0