← Back to branch summary

~ubuntu-branches/ubuntu/lucid/openssh/lucid

« back to all changes in this revision

Viewing changes to Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2008-09-30 23:09:58 UTC
  • mfrom: (1.13.3 upstream) (29 hardy)
  • mto: This revision was merged to the branch mainline in revision 43.
  • Revision ID: james.westby@ubuntu.com-20080930230958-o6vsgn8c4mm959s0
Tags: 1:5.1p1-3
http://bugs.debian.org/496495
http://bugs.debian.org/498681
* Remove unnecessary ssh-vulnkey output in non-verbose mode when no
  compromised or unknown keys were found (closes: #496495).
* Configure with --disable-strip; dh_strip will deal with stripping
  binaries and will honour DEB_BUILD_OPTIONS (thanks, Bernhard R. Link;
  closes: #498681).
* Fix handling of zero-length server banners (thanks, Tomas Mraz; closes:
  #497026).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.in
1
 
# $Id: Makefile.in,v 1.283 2006/10/23 21:44:47 tim Exp $
 
1
# $Id: Makefile.in,v 1.297 2008/07/08 14:21:12 djm Exp $
2
2
 
3
3
# uncomment if you run a non bourne compatable shell. Ie. csh
4
4
#SHELL = @SH@
26
26
SFTP_SERVER=$(libexecdir)/sftp-server
27
27
SSH_KEYSIGN=$(libexecdir)/ssh-keysign
28
28
RAND_HELPER=$(libexecdir)/ssh-rand-helper
 
29
SSH_DATADIR=$(datadir)/ssh
29
30
PRIVSEP_PATH=@PRIVSEP_PATH@
30
31
SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
31
32
STRIP_OPT=@STRIP_OPT@
37
38
        -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \
38
39
        -D_PATH_SSH_PIDDIR=\"$(piddir)\" \
39
40
        -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" \
40
 
        -DSSH_RAND_HELPER=\"$(RAND_HELPER)\"
 
41
        -DSSH_RAND_HELPER=\"$(RAND_HELPER)\" \
 
42
        -D_PATH_SSH_DATADIR=\"$(SSH_DATADIR)\"
41
43
 
42
44
CC=@CC@
43
45
LD=@LD@
44
46
CFLAGS=@CFLAGS@
45
47
CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
46
48
LIBS=@LIBS@
47
 
LIBSELINUX=@LIBSELINUX@
48
49
SSHDLIBS=@SSHDLIBS@
49
50
LIBEDIT=@LIBEDIT@
50
 
LIBPAM=@LIBPAM@
51
 
LIBWRAP=@LIBWRAP@
52
51
AR=@AR@
53
52
AWK=@AWK@
54
53
RANLIB=@RANLIB@
63
62
INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
64
63
INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
65
64
 
66
 
TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT)
 
65
TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT) ssh-vulnkey$(EXEEXT)
67
66
 
68
67
LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
69
68
        canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \
70
69
        cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
71
70
        compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
72
71
        log.o match.o md-sha256.o moduli.o nchan.o packet.o \
73
 
        readpass.o rsa.o ttymodes.o xmalloc.o \
 
72
        readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
74
73
        atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
75
74
        monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
76
75
        kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
77
 
        entropy.o scard-opensc.o gss-genr.o kexgssc.o
 
76
        entropy.o scard-opensc.o gss-genr.o umac.o kexgssc.o
78
77
 
79
78
SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
80
 
        sshconnect.o sshconnect1.o sshconnect2.o
 
79
        sshconnect.o sshconnect1.o sshconnect2.o mux.o
81
80
 
82
81
SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
83
82
        sshpty.o sshlogin.o servconf.o serverloop.o \
89
88
        auth-krb5.o \
90
89
        auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\
91
90
        loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
92
 
        audit.o audit-bsm.o platform.o
 
91
        audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o
93
92
 
94
 
MANPAGES        = 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-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out
95
 
MANPAGES_IN     = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5
 
93
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-rand-helper.8.out ssh-keysign.8.out ssh-vulnkey.1.out sshd_config.5.out ssh_config.5.out
 
94
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-rand-helper.8 ssh-keysign.8 ssh-vulnkey.1 sshd_config.5 ssh_config.5
96
95
MANTYPE         = @MANTYPE@
97
96
 
98
97
CONFIGFILES=sshd_config.out ssh_config.out moduli.out
109
108
        -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \
110
109
        -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \
111
110
        -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
 
111
        -e 's|/etc/moduli|$(sysconfdir)/moduli|g' \
112
112
        -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
113
113
        -e 's|/etc/ssh/sshrc|$(sysconfdir)/sshrc|g' \
114
114
        -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \
139
139
        $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
140
140
 
141
141
sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
142
 
        $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBSELINUX) $(SSHDLIBS) $(LIBS)
 
142
        $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS)
143
143
 
144
144
scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
145
145
        $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
159
159
ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o
160
160
        $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
161
161
 
162
 
sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o
163
 
        $(LD) -o $@ sftp-server.o sftp-common.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
162
sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o
 
163
        $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
164
164
 
165
165
sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o
166
166
        $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT)
168
168
ssh-rand-helper${EXEEXT}: $(LIBCOMPAT) libssh.a ssh-rand-helper.o
169
169
        $(LD) -o $@ ssh-rand-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
170
170
 
 
171
ssh-vulnkey$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-vulnkey.o
 
172
        $(LD) -o $@ ssh-vulnkey.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
173
 
171
174
# test driver for the loginrec code - not built by default
172
175
logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o
173
176
        $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS)
267
270
        $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign $(DESTDIR)$(SSH_KEYSIGN)
268
271
        $(INSTALL) -m 0755 $(STRIP_OPT) sftp $(DESTDIR)$(bindir)/sftp
269
272
        $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server $(DESTDIR)$(SFTP_SERVER)
 
273
        $(INSTALL) -m 0755 $(STRIP_OPT) ssh-vulnkey $(DESTDIR)$(bindir)/ssh-vulnkey
270
274
        $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
271
275
        $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
272
276
        $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
273
277
        $(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
274
278
        $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
275
279
        $(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
 
280
        $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5
276
281
        $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
277
282
        $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
278
283
        $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
 
284
        ln -s ../$(mansubdir)8/sshd.8 $(DESTDIR)$(mandir)/$(mansubdir)5/authorized_keys.5
279
285
        if [ ! -z "$(INSTALL_SSH_RAND_HELPER)" ]; then \
280
286
                $(INSTALL) -m 644 ssh-rand-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 ; \
281
287
        fi
282
288
        $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
283
289
        $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
284
290
        $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
 
291
        $(INSTALL) -m 644 ssh-vulnkey.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-vulnkey.1
285
292
        -rm -f $(DESTDIR)$(bindir)/slogin
286
293
        ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
287
294
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
363
370
        -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT)
364
371
        -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT)
365
372
        -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
 
373
        -rm -f $(DESTDIR)$(bindir)/ssh-vulnkey$(EXEEXT)
366
374
        -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT)
367
375
        -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT)
368
376
        -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT)
375
383
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
376
384
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
377
385
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
 
386
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-vulnkey.1
378
387
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
379
388
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8
380
389
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
381
390
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
382
391
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
383
392
 
384
 
tests:  $(TARGETS)
 
393
tests interop-tests:    $(TARGETS)
385
394
        BUILDDIR=`pwd`; \
386
395
        [ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress; \
387
396
        [ -f `pwd`/regress/Makefile ]  || \
395
404
        TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \
396
405
        TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \
397
406
        TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \
 
407
        TEST_SSH_PLINK="plink"; \
 
408
        TEST_SSH_PUTTYGEN="puttygen"; \
 
409
        TEST_SSH_CONCH="conch"; \
 
410
        TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \
398
411
        cd $(srcdir)/regress || exit $$?; \
399
412
        $(MAKE) \
400
413
                .OBJDIR="$${BUILDDIR}/regress" \
411
424
                TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \
412
425
                TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \
413
426
                TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
 
427
                TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \
 
428
                TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \
 
429
                TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \
 
430
                TEST_SSH_IPV6="@TEST_SSH_IPV6@" \
414
431
                EXEEXT="$(EXEEXT)" \
415
 
                $@
 
432
                $@ && echo all tests passed
416
433
 
417
434
compat-tests: $(LIBCOMPAT)
418
435
        (cd openbsd-compat/regress && $(MAKE))