diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-10 00:18:28 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-02-10 00:18:28 +0000 |
commit | 9a975a9faed7c4f334e8c8490db3e77e102f2b21 (patch) | |
tree | 764a885ec9a963f6a8b15de6e1765f16b9ac4738 /Makefile.in | |
parent | ee196dab7c5f97f0b80c8099343a375bead92010 (diff) | |
parent | cdb6c90811caa5df2df856be9b0b16db020fe31d (diff) |
Import openssh_6.5p1.orig.tar.gz
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 92c95a928..a8aa1272a 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.340 2013/06/11 01:26:10 dtucker Exp $ | 1 | # $Id: Makefile.in,v 1.352 2014/01/27 06:35:04 dtucker Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -73,7 +73,10 @@ LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | |||
73 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ | 73 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ |
74 | kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ | 74 | kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ |
75 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ | 75 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ |
76 | jpake.o schnorr.o ssh-pkcs11.o krl.o | 76 | jpake.o schnorr.o ssh-pkcs11.o krl.o smult_curve25519_ref.o \ |
77 | kexc25519.o kexc25519c.o poly1305.o chacha.o cipher-chachapoly.o \ | ||
78 | ssh-ed25519.o digest.o \ | ||
79 | sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o | ||
77 | 80 | ||
78 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ | 81 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ |
79 | sshconnect.o sshconnect1.o sshconnect2.o mux.o \ | 82 | sshconnect.o sshconnect1.o sshconnect2.o mux.o \ |
@@ -87,13 +90,13 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | |||
87 | auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ | 90 | auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ |
88 | auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ | 91 | auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ |
89 | monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \ | 92 | monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \ |
90 | auth-krb5.o \ | 93 | kexc25519s.o auth-krb5.o \ |
91 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ | 94 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ |
92 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ | 95 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ |
93 | sftp-server.o sftp-common.o \ | 96 | sftp-server.o sftp-common.o \ |
94 | roaming_common.o roaming_serv.o \ | 97 | roaming_common.o roaming_serv.o \ |
95 | sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \ | 98 | sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \ |
96 | sandbox-seccomp-filter.o | 99 | sandbox-seccomp-filter.o sandbox-capsicum.o |
97 | 100 | ||
98 | MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out | 101 | MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out |
99 | MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5 | 102 | MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5 |
@@ -112,6 +115,7 @@ PATHSUBS = \ | |||
112 | -e 's|/etc/ssh/ssh_host_ecdsa_key|$(sysconfdir)/ssh_host_ecdsa_key|g' \ | 115 | -e 's|/etc/ssh/ssh_host_ecdsa_key|$(sysconfdir)/ssh_host_ecdsa_key|g' \ |
113 | -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \ | 116 | -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \ |
114 | -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \ | 117 | -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \ |
118 | -e 's|/etc/ssh/ssh_host_ed25519_key|$(sysconfdir)/ssh_host_ed25519_key|g' \ | ||
115 | -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \ | 119 | -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \ |
116 | -e 's|/etc/moduli|$(sysconfdir)/moduli|g' \ | 120 | -e 's|/etc/moduli|$(sysconfdir)/moduli|g' \ |
117 | -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \ | 121 | -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \ |
@@ -332,6 +336,11 @@ host-key: ssh-keygen$(EXEEXT) | |||
332 | else \ | 336 | else \ |
333 | ./ssh-keygen -t rsa -f $(sysconfdir)/ssh_host_rsa_key -N "" ; \ | 337 | ./ssh-keygen -t rsa -f $(sysconfdir)/ssh_host_rsa_key -N "" ; \ |
334 | fi ; \ | 338 | fi ; \ |
339 | if [ -f $(sysconfdir)/ssh_host_ed25519_key ] ; then \ | ||
340 | echo "$(sysconfdir)/ssh_host_ed25519_key already exists, skipping." ; \ | ||
341 | else \ | ||
342 | ./ssh-keygen -t ed25519 -f $(sysconfdir)/ssh_host_ed25519_key -N "" ; \ | ||
343 | fi ; \ | ||
335 | if [ -z "@COMMENT_OUT_ECC@" ] ; then \ | 344 | if [ -z "@COMMENT_OUT_ECC@" ] ; then \ |
336 | if [ -f $(sysconfdir)/ssh_host_ecdsa_key ] ; then \ | 345 | if [ -f $(sysconfdir)/ssh_host_ecdsa_key ] ; then \ |
337 | echo "$(sysconfdir)/ssh_host_ecdsa_key already exists, skipping." ; \ | 346 | echo "$(sysconfdir)/ssh_host_ecdsa_key already exists, skipping." ; \ |
@@ -345,6 +354,7 @@ host-key-force: ssh-keygen$(EXEEXT) | |||
345 | ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" | 354 | ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" |
346 | ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" | 355 | ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" |
347 | ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" | 356 | ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" |
357 | ./ssh-keygen -t ed25519 -f $(DESTDIR)$(sysconfdir)/ssh_host_ed25519_key -N "" | ||
348 | test -z "@COMMENT_OUT_ECC@" && ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N "" | 358 | test -z "@COMMENT_OUT_ECC@" && ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N "" |
349 | 359 | ||
350 | uninstallall: uninstall | 360 | uninstallall: uninstall |
@@ -391,9 +401,17 @@ regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c | |||
391 | $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \ | 401 | $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \ |
392 | $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 402 | $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
393 | 403 | ||
404 | regress/setuid-allowed$(EXEEXT): $(srcdir)/regress/setuid-allowed.c | ||
405 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress | ||
406 | [ -f `pwd`/regress/Makefile ] || \ | ||
407 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile | ||
408 | $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \ | ||
409 | $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | ||
410 | |||
394 | tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) | 411 | tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) |
395 | BUILDDIR=`pwd`; \ | 412 | BUILDDIR=`pwd`; \ |
396 | TEST_SHELL="@TEST_SHELL@"; \ | 413 | TEST_SHELL="@TEST_SHELL@"; \ |
414 | TEST_SSH_SCP="$${BUILDDIR}/scp"; \ | ||
397 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ | 415 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ |
398 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ | 416 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ |
399 | TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ | 417 | TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ |
@@ -408,7 +426,6 @@ tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) | |||
408 | TEST_SSH_CONCH="conch"; \ | 426 | TEST_SSH_CONCH="conch"; \ |
409 | TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ | 427 | TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ |
410 | TEST_SSH_ECC="@TEST_SSH_ECC@" ; \ | 428 | TEST_SSH_ECC="@TEST_SSH_ECC@" ; \ |
411 | TEST_SSH_SHA256="@TEST_SSH_SHA256@" ; \ | ||
412 | cd $(srcdir)/regress || exit $$?; \ | 429 | cd $(srcdir)/regress || exit $$?; \ |
413 | $(MAKE) \ | 430 | $(MAKE) \ |
414 | .OBJDIR="$${BUILDDIR}/regress" \ | 431 | .OBJDIR="$${BUILDDIR}/regress" \ |
@@ -416,7 +433,9 @@ tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) | |||
416 | BUILDDIR="$${BUILDDIR}" \ | 433 | BUILDDIR="$${BUILDDIR}" \ |
417 | OBJ="$${BUILDDIR}/regress/" \ | 434 | OBJ="$${BUILDDIR}/regress/" \ |
418 | PATH="$${BUILDDIR}:$${PATH}" \ | 435 | PATH="$${BUILDDIR}:$${PATH}" \ |
436 | TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ | ||
419 | TEST_SHELL="$${TEST_SHELL}" \ | 437 | TEST_SHELL="$${TEST_SHELL}" \ |
438 | TEST_SSH_SCP="$${TEST_SSH_SCP}" \ | ||
420 | TEST_SSH_SSH="$${TEST_SSH_SSH}" \ | 439 | TEST_SSH_SSH="$${TEST_SSH_SSH}" \ |
421 | TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ | 440 | TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ |
422 | TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \ | 441 | TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \ |
@@ -431,7 +450,6 @@ tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) | |||
431 | TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \ | 450 | TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \ |
432 | TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ | 451 | TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ |
433 | TEST_SSH_ECC="$${TEST_SSH_ECC}" \ | 452 | TEST_SSH_ECC="$${TEST_SSH_ECC}" \ |
434 | TEST_SSH_SHA256="$${TEST_SSH_SHA256}" \ | ||
435 | EXEEXT="$(EXEEXT)" \ | 453 | EXEEXT="$(EXEEXT)" \ |
436 | $@ && echo all tests passed | 454 | $@ && echo all tests passed |
437 | 455 | ||
@@ -456,4 +474,3 @@ package: $(CONFIGFILES) $(MANPAGES) $(TARGETS) | |||
456 | if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \ | 474 | if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \ |
457 | sh buildpkg.sh; \ | 475 | sh buildpkg.sh; \ |
458 | fi | 476 | fi |
459 | |||