casa-mp-base

--- a/Makefile.in   2017-10-02 21:34:26.000000000 +0200

+++ b/Makefile.in   2017-10-08 09:09:59.000000000 +0200

@@ -59,6 +59,7 @@ SED=@SED@

 ENT=@ENT@

 XAUTH_PATH=@XAUTH_PATH@

 LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@

+KEYCHAIN_LDFLAGS=@KEYCHAIN_LDFLAGS@

 EXEEXT=@EXEEXT@

 MANFMT=@MANFMT@

@@ -112,6 +113,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passw

    sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-pledge.o \

    sandbox-solaris.o

+KEYCHAINOBJS=keychain.o

+

 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

 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

 MANTYPE        = @MANTYPE@

@@ -147,6 +150,7 @@ all: $(CONFIGFILES) $(MANPAGES) $(TARGET

 $(LIBSSH_OBJS): Makefile.in config.h

 $(SSHOBJS): Makefile.in config.h

 $(SSHDOBJS): Makefile.in config.h

+$(KEYCHAINOBJS): Makefile.in config.h

 .c.o:

    $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@

@@ -160,8 +164,8 @@ libssh.a: $(LIBSSH_OBJS)

    $(AR) rv $@ $(LIBSSH_OBJS)

    $(RANLIB) $@

-ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)

-   $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) $(GSSLIBS)

+ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) $(KEYCHAINOBJS)

+   $(LD) -o $@ $(SSHOBJS) $(KEYCHAINOBJS) $(LDFLAGS) $(KEYCHAIN_LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) $(GSSLIBS)

 sshd$(EXEEXT): libssh.a    $(LIBCOMPAT) $(SSHDOBJS)

    $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS)

@@ -169,11 +173,11 @@ sshd$(EXEEXT): libssh.a   $(LIBCOMPAT) $(S

 scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o

    $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)

-ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o

-   $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)

+ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o $(KEYCHAINOBJS)

+   $(LD) -o $@ ssh-add.o $(KEYCHAINOBJS) $(LDFLAGS) $(KEYCHAIN_LDFLAGS) -lssh -lopenbsd-compat $(LIBS)

-ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o ssh-pkcs11-client.o

-   $(LD) -o $@ ssh-agent.o ssh-pkcs11-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)

+ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o ssh-pkcs11-client.o $(KEYCHAINOBJS)

+   $(LD) -o $@ ssh-agent.o ssh-pkcs11-client.o $(KEYCHAINOBJS) $(LDFLAGS) $(KEYCHAIN_LDFLAGS) -lssh -lopenbsd-compat $(LIBS)

 ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o

    $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)

@@ -325,7 +329,7 @@ install-files:

    $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT)

    $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)

    $(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT)

-   $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign$(EXEEXT) $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT)

+   $(INSTALL) -m 0711 $(STRIP_OPT) ssh-keysign$(EXEEXT) $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT)

    $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT)

    $(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT)

    $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT)