Change Makefiles for OpenSSH to more closely match the distro.
authorPeter Avalos <pavalos@dragonflybsd.org>
Sun, 10 Jan 2010 05:46:44 +0000 (05:46 +0000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Sun, 10 Jan 2010 09:38:59 +0000 (09:38 +0000)
This makes it slightly easier for updates.
This also fixes buildworld.

12 files changed:
secure/lib/libssh/Makefile
secure/libexec/sftp-server/Makefile
secure/libexec/ssh-keysign/Makefile
secure/usr.bin/scp/Makefile
secure/usr.bin/sftp/Makefile
secure/usr.bin/ssh-add/Makefile
secure/usr.bin/ssh-agent/Makefile
secure/usr.bin/ssh-keygen/Makefile
secure/usr.bin/ssh-keyscan/Makefile
secure/usr.bin/ssh-vulnkey/Makefile
secure/usr.bin/ssh/Makefile
secure/usr.sbin/sshd/Makefile

index 526a333..e2920dc 100644 (file)
@@ -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
 
index 2a0c532..6cd7bca 100644 (file)
@@ -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"
index 281fa6b..111ebfc 100644 (file)
@@ -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
index 9964dcd..b24c25d 100644 (file)
@@ -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 <bsd.prog.mk>
index 203f8f8..a5e84c9 100644 (file)
@@ -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
index fef4ed7..3f1e585 100644 (file)
@@ -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 <bsd.prog.mk>
index e089819..1e15e66 100644 (file)
@@ -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 <bsd.prog.mk>
index ea441d9..f98d7b4 100644 (file)
@@ -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 <bsd.prog.mk>
index ae9b553..0450847 100644 (file)
@@ -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
index aaeeee5..2761b42 100644 (file)
@@ -3,7 +3,7 @@
 
 PROG=  ssh-vulnkey
 
-SRCS=  ssh-vulnkey.c
+SRCS=  ssh-vulnkey.c roaming_dummy.c
 
 .include "../../Makefile.ssh.common"
 .include <bsd.prog.mk>
index 446609d..f98deec 100644 (file)
@@ -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\"
index 5cf85cf..8116d3e 100644 (file)
@@ -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