diff --git a/net-misc/openssh1/Manifest b/net-misc/openssh1/Manifest index 87e910b..50a543a 100644 --- a/net-misc/openssh1/Manifest +++ b/net-misc/openssh1/Manifest @@ -6,11 +6,11 @@ AUX openssh1-7.5_p1-cross-cache.patch 1220 BLAKE2B 7176b86024b072ff601421143f856 AUX openssh1-7.5_p1-disable-conch-interop-tests.patch 554 BLAKE2B f5f45c000ec26c1f783669c3447ea3c80c5c0f9b971b86ca1e79e99e906a90a519abb6b14db462f5766572e9759180719ea44f048ef5aa8efc37efb61d2b6ef7 SHA512 f35b15f1e8d0eb276d748ee14c71004c6599ddb124c33e2f84623bc9eb02bb4fd4680d25d0ba0289d6a723a526c95c9a56b30496bdaa565bae853bf3d1bab61f AUX openssh1-7.5_p1-hpn-x509-10.2-glue.patch 2847 BLAKE2B 8a6151ab121871e4f2d93ace0e07dce1106c6841031cacfb197e00cc76fc1d0cf153aae52757dcf98a5fb89971125493d0572bd4964d0e59cb3f391fd1256aef SHA512 bc23fdf5995ae38ff166f12f64082f79a2135ca28f2240e89bee42b1e3ba39ce94467ece9ddea99173f1829b09b069dbf56a0bce7dfd1ae5f63c12f73b5ffba7 AUX openssh1-7.5_p1-s390-seccomp.patch 624 BLAKE2B 0bf595d72cd65993dde4e5aae0a3e091bb48021ef8affa84c988d55d9fe6a823b0329b6d9707c88e1556d45c304b6630ade7008f63fd649975594a75f570bb33 SHA512 058dc269eb032151e88e0ac79a0b0fd6fcd56d489e90e299ee431b1475a8f8080e8f4649244864af33e743820b081c9f90b32a1a93b8b60feeb491c0201a4d61 -AUX openssh1-7.5_p1-ssh1.patch 22685 BLAKE2B 4507f1eef1981ce71d6e240aa1e6a1f49b6772d84cf0c55f48af03605054984d101bb466809320daca1fbcd24db2495bf92adc1e7da46dea36a4e8a804213846 SHA512 f100dbe2927f4cd36548edf318cd4fa15899c9c26f61faefeb2e3cc0d7d5ea03acffe10286ca0c4d16d54ae081e17ab11c63cd657222caec876b07966d48a862 +AUX openssh1-7.5_p1-ssh1.patch 8016 BLAKE2B 37ac01e02bd442b88eabe90e87d6c929c63214241905385977107a37ca92fc856468755ecb1d44e6b5e121276f71fb6b25414392ed17429f8ff83186ee7b04fd SHA512 09bc60e93d3f7ae95160881dc915504ced95801a5f938210edd398258a6b4d1a10fadc645f52c4b130b94ea0953cfe52a33e31c8f21041ffb7df4cc12d4aa579 AUX openssh1-7.5_p1-x32-typo.patch 772 BLAKE2B 3f27d669ee76e191f2f6f7c7d86b1d9cb7297cecf17b2d88d86ef498c9ca35231adb0edc9fb811698ec86fd65527cc3fe9f2ce514836aebe5dc27bca2a3a55dc SHA512 20d19301873d4b8e908527f462f40c2f4a513d0bb89d4c7b885f9fc7eb5d483eea544eb108d87ff6aaa3d988d360c2029910c18f7125c96e8367485553f59a5e DIST openssh-7.4_p1-sctp.patch.xz 8220 BLAKE2B 2d571cacaab342b7950b42ec826bd896edf78780e9ee73fcd441cbc9764eb59e408e295062862db986918824d10498383bf34ae7c93df0da2c056eaec4d2c031 SHA512 0c199e3b26949482125aeaa88216b2458292589e3eac8908d9134d13a1cae891094fcb0f752ed3009b3126cc72277b460205f39140c251792eb1b545271c3bd4 DIST openssh-7.5p1+x509-10.2.diff.gz 467040 BLAKE2B 4048b0f016bf7d43276f88117fc266d1a450d298563bfc6ce705ec2829b8f9d91af5c5232941d55004b5aea2d3e0fb682a9d4acd9510c9761ba7ede2f2f0e37f SHA512 ec760d38771749d09afc8d720120ea2aa065c1c7983898b45dba74a4411f7e61e7705da226864e1e8e62e2261eecc3a4ab654b528c71512a07798824d9fb1a9a DIST openssh-7.5p1-hpnssh14v12.tar.xz 23068 BLAKE2B 15702338877e50c2143b33b93bfc87d0aa0fa55915db1f0cab9c22e55f8aa0c6eeb5a56f438d849544d1650bdc574384b851292d621b79f673b78bc37617aa0b SHA512 45c42090a212b9ce898fbaa8284ddf0f0d17236af13c4a780e00bf265b0c7a4286027e90a7ce9ad70066309db722709dd2f0a7914f57e5364ffbaf7c4859cdf9 DIST openssh-7.5p1.tar.gz 1510857 BLAKE2B 505764a210018136456c0f5dd40ad9f1383551c3ae037593d4296305df189e0a6f1383adc89b1970d58b8dcfff391878b7a29b848cc244a99705a164bec5d734 SHA512 58c542e8a110fb4316a68db94abb663fa1c810becd0638d45281df8aeca62c1f705090437a80e788e6c29121769b72a505feced537d3118c933fde01b5285c81 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b -EBUILD openssh1-7.5_p1-r4.ebuild 9661 BLAKE2B 937992e9ba8391dcb02968b0c4a3ea80c38e1b81239caa672aebaebfe15c5265156b65a9a24b55d5747ae08022c3249630e98ab800346f73da665c096c6887f0 SHA512 50f52804ed394bb76ba7aebd6bd6e113b03df7b028633758c4173357c50eb0cc6383ea16623b5d888a83db710f9a1930113942fb1b4712489ebe9f0780c904a3 +EBUILD openssh1-7.5_p1-r4.ebuild 9616 BLAKE2B b593252fe866aed2cb770b8c72a96d6ad9d3e0c7564080ffd9a2fc94870f5e4ed57a6944a158a721eae5debccbac7f8a2c63b9c76f4d1510de83721e11242d82 SHA512 50f445ec7ba564b008db7cf88ecb8f17f6db746fe277b346e0a3b2c7710ec84c16835d4915a088df9e6e97f165aa8def816470bb96cd8eda7621492eca18a2ca diff --git a/net-misc/openssh1/files/openssh1-7.5_p1-ssh1.patch b/net-misc/openssh1/files/openssh1-7.5_p1-ssh1.patch index db63f86..36b6f68 100644 --- a/net-misc/openssh1/files/openssh1-7.5_p1-ssh1.patch +++ b/net-misc/openssh1/files/openssh1-7.5_p1-ssh1.patch @@ -1,318 +1,81 @@ ---- openssh-7.5p1/Makefile.in~ 1970-01-01 01:00:00.000000000 +0100 +--- openssh-7.5p1/Makefile.in.orig 2017-03-20 03:39:27.000000000 +0100 +++ openssh-7.5p1/Makefile.in 2019-12-10 05:24:40.322129549 +0100 -@@ -0,0 +1,594 @@ -+# $Id: Makefile.in,v 1.365 2014/08/30 06:23:07 djm Exp $ -+ -+# uncomment if you run a non bourne compatable shell. Ie. csh -+#SHELL = @SH@ -+ -+AUTORECONF=autoreconf -+ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+bindir=@bindir@ -+sbindir=@sbindir@ -+libexecdir=@libexecdir@ -+datadir=@datadir@ -+datarootdir=@datarootdir@ -+mandir=@mandir@ -+mansubdir=@mansubdir@ -+sysconfdir=@sysconfdir@ -+piddir=@piddir@ -+srcdir=@srcdir@ -+top_srcdir=@top_srcdir@ -+ -+DESTDIR= -+VPATH=@srcdir@ -+SSH_PROGRAM=@bindir@/ssh -+ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass -+SFTP_SERVER=$(libexecdir)/sftp-server -+SSH_KEYSIGN=$(libexecdir)/ssh-keysign -+SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper -+PRIVSEP_PATH=@PRIVSEP_PATH@ -+SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ -+STRIP_OPT=@STRIP_OPT@ -+TEST_SHELL=@TEST_SHELL@ -+ -+PATHS= -DSSHDIR=\"$(sysconfdir)\" \ -+ -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \ -+ -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \ -+ -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \ -+ -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \ -+ -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \ -+ -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ -+ -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" -+ -+CC=@CC@ -+LD=@LD@ -+CFLAGS=@CFLAGS@ -+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ -+LIBS=@LIBS@ -+K5LIBS=@K5LIBS@ -+GSSLIBS=@GSSLIBS@ -+SSHLIBS=@SSHLIBS@ -+SSHDLIBS=@SSHDLIBS@ -+LIBEDIT=@LIBEDIT@ -+AR=@AR@ -+AWK=@AWK@ -+RANLIB=@RANLIB@ -+INSTALL=@INSTALL@ -+PERL=@PERL@ -+SED=@SED@ -+ENT=@ENT@ -+XAUTH_PATH=@XAUTH_PATH@ -+LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ -+EXEEXT=@EXEEXT@ -+MANFMT=@MANFMT@ -+ +@@ -62,7 +62,7 @@ + EXEEXT=@EXEEXT@ + MANFMT=@MANFMT@ + +-TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) +TARGETS=ssh$(EXEEXT) ssh-keygen$(EXEEXT) scp$(EXEEXT) -+ -+LIBOPENSSH_OBJS=\ -+ ssh_api.o \ -+ ssherr.o \ -+ sshbuf.o \ -+ sshkey.o \ -+ sshbuf-getput-basic.o \ -+ sshbuf-misc.o \ -+ sshbuf-getput-crypto.o \ -+ krl.o \ -+ bitmap.o -+ -+LIBSSH_OBJS=${LIBOPENSSH_OBJS} \ -+ authfd.o authfile.o bufaux.o bufbn.o bufec.o buffer.o \ -+ canohost.o channels.o cipher.o cipher-aes.o cipher-aesctr.o \ -+ cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ -+ compat.o crc32.o deattack.o fatal.o hostfile.o \ -+ log.o match.o md-sha256.o moduli.o nchan.o packet.o opacket.o \ -+ readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \ -+ atomicio.o key.o dispatch.o mac.o uidswap.o uuencode.o misc.o utf8.o \ -+ monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ -+ msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ -+ ssh-pkcs11.o smult_curve25519_ref.o \ -+ poly1305.o chacha.o cipher-chachapoly.o \ -+ ssh-ed25519.o digest-openssl.o digest-libc.o hmac.o \ -+ sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o \ -+ kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \ -+ kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \ -+ kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \ -+ platform-pledge.o platform-tracing.o -+ -+SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ -+ sshconnect.o sshconnect1.o sshconnect2.o mux.o -+ -+SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o \ -+ audit.o audit-bsm.o audit-linux.o platform.o \ -+ sshpty.o sshlogin.o servconf.o serverloop.o \ -+ auth.o auth2.o auth-options.o session.o \ -+ auth2-chall.o groupaccess.o \ -+ auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ -+ auth2-none.o auth2-passwd.o auth2-pubkey.o \ -+ monitor.o monitor_wrap.o auth-krb5.o \ -+ auth2-gss.o gss-serv.o gss-serv-krb5.o \ -+ loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ -+ sftp-server.o sftp-common.o \ -+ sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \ -+ sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-pledge.o \ -+ sandbox-solaris.o -+ + + LIBOPENSSH_OBJS=\ + ssh_api.o \ +@@ -112,15 +112,15 @@ + sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-pledge.o \ + sandbox-solaris.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 +MANPAGES = scp.1.out ssh-keygen.1.out ssh.1.out ssh_config1.5.out +MANPAGES_IN = scp.1 ssh-keygen.1 ssh.1 ssh_config1.5 -+MANTYPE = @MANTYPE@ -+ + MANTYPE = @MANTYPE@ + +-CONFIGFILES=sshd_config.out ssh_config.out moduli.out +-CONFIGFILES_IN=sshd_config ssh_config moduli +CONFIGFILES=ssh_config.out +CONFIGFILES_IN=ssh_config -+ -+PATHSUBS = \ + + PATHSUBS = \ +- -e 's|/etc/ssh/ssh_config|$(sysconfdir)/ssh_config|g' \ + -e 's|/etc/ssh/ssh_config|$(sysconfdir)/ssh_config1|g' \ -+ -e 's|/etc/ssh/ssh_known_hosts|$(sysconfdir)/ssh_known_hosts|g' \ -+ -e 's|/etc/ssh/sshd_config|$(sysconfdir)/sshd_config|g' \ -+ -e 's|/usr/libexec|$(libexecdir)|g' \ -+ -e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \ -+ -e 's|/etc/ssh/ssh_host_key|$(sysconfdir)/ssh_host_key|g' \ -+ -e 's|/etc/ssh/ssh_host_ecdsa_key|$(sysconfdir)/ssh_host_ecdsa_key|g' \ -+ -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \ -+ -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \ -+ -e 's|/etc/ssh/ssh_host_ed25519_key|$(sysconfdir)/ssh_host_ed25519_key|g' \ -+ -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \ -+ -e 's|/etc/moduli|$(sysconfdir)/moduli|g' \ -+ -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \ -+ -e 's|/etc/ssh/sshrc|$(sysconfdir)/sshrc|g' \ -+ -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \ -+ -e 's|/var/empty|$(PRIVSEP_PATH)|g' \ -+ -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g' -+ -+FIXPATHSCMD = $(SED) $(PATHSUBS) -+FIXALGORITHMSCMD= $(SHELL) $(srcdir)/fixalgorithms $(SED) \ -+ @UNSUPPORTED_ALGORITHMS@ -+ -+all: $(CONFIGFILES) $(MANPAGES) $(TARGETS) -+ -+$(LIBSSH_OBJS): Makefile.in config.h -+$(SSHOBJS): Makefile.in config.h -+$(SSHDOBJS): Makefile.in config.h -+ -+.c.o: -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -+ -+LIBCOMPAT=openbsd-compat/libopenbsd-compat.a -+$(LIBCOMPAT): always -+ (cd openbsd-compat && $(MAKE)) -+always: -+ -+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) -+ -+sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) -+ $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS) -+ -+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-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-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o -+ $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -+ -+ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o readconf.o -+ $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -+ -+ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-pkcs11-helper.o ssh-pkcs11.o -+ $(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -+ -+ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o -+ $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) -+ -+sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o -+ $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -+ -+sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o -+ $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT) -+ -+# test driver for the loginrec code - not built by default -+logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o -+ $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS) -+ -+$(MANPAGES): $(MANPAGES_IN) -+ if test "$(MANTYPE)" = "cat"; then \ -+ manpage=$(srcdir)/`echo $@ | sed 's/\.[1-9]\.out$$/\.0/'`; \ -+ else \ -+ manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \ -+ fi; \ -+ if test "$(MANTYPE)" = "man"; then \ -+ $(FIXPATHSCMD) $${manpage} | $(FIXALGORITHMSCMD) | \ -+ $(AWK) -f $(srcdir)/mdoc2man.awk > $@; \ -+ else \ -+ $(FIXPATHSCMD) $${manpage} | $(FIXALGORITHMSCMD) > $@; \ -+ fi -+ -+$(CONFIGFILES): $(CONFIGFILES_IN) -+ conffile=`echo $@ | sed 's/.out$$//'`; \ -+ $(FIXPATHSCMD) $(srcdir)/$${conffile} > $@ -+ -+# fake rule to stop make trying to compile moduli.o into a binary "moduli.o" -+moduli: -+ echo -+ -+# special case target for umac128 -+umac128.o: umac.c -+ $(CC) $(CFLAGS) $(CPPFLAGS) -o umac128.o -c $(srcdir)/umac.c \ -+ -DUMAC_OUTPUT_LEN=16 -Dumac_new=umac128_new \ -+ -Dumac_update=umac128_update -Dumac_final=umac128_final \ -+ -Dumac_delete=umac128_delete -Dumac_ctx=umac128_ctx -+ -+clean: regressclean -+ rm -f *.o *.a $(TARGETS) logintest config.cache config.log -+ rm -f *.out core survey -+ rm -f regress/unittests/test_helper/*.a -+ rm -f regress/unittests/test_helper/*.o -+ rm -f regress/unittests/sshbuf/*.o -+ rm -f regress/unittests/sshbuf/test_sshbuf -+ rm -f regress/unittests/sshkey/*.o -+ rm -f regress/unittests/sshkey/test_sshkey -+ rm -f regress/unittests/bitmap/*.o -+ rm -f regress/unittests/bitmap/test_bitmap -+ rm -f regress/unittests/conversion/*.o -+ rm -f regress/unittests/conversion/test_conversion -+ rm -f regress/unittests/hostkeys/*.o -+ rm -f regress/unittests/hostkeys/test_hostkeys -+ rm -f regress/unittests/kex/*.o -+ rm -f regress/unittests/kex/test_kex -+ rm -f regress/unittests/match/*.o -+ rm -f regress/unittests/match/test_match -+ rm -f regress/unittests/utf8/*.o -+ rm -f regress/unittests/utf8/test_utf8 -+ rm -f regress/misc/kexfuzz/*.o -+ rm -f regress/misc/kexfuzz/kexfuzz -+ (cd openbsd-compat && $(MAKE) clean) -+ -+distclean: regressclean -+ rm -f *.o *.a $(TARGETS) logintest config.cache config.log -+ rm -f *.out core opensshd.init openssh.xml -+ rm -f Makefile buildpkg.sh config.h config.status -+ rm -f survey.sh openbsd-compat/regress/Makefile *~ -+ rm -rf autom4te.cache -+ rm -f regress/unittests/test_helper/*.a -+ rm -f regress/unittests/test_helper/*.o -+ rm -f regress/unittests/sshbuf/*.o -+ rm -f regress/unittests/sshbuf/test_sshbuf -+ rm -f regress/unittests/sshkey/*.o -+ rm -f regress/unittests/sshkey/test_sshkey -+ rm -f regress/unittests/bitmap/*.o -+ rm -f regress/unittests/bitmap/test_bitmap -+ rm -f regress/unittests/conversion/*.o -+ rm -f regress/unittests/conversion/test_conversion -+ rm -f regress/unittests/hostkeys/*.o -+ rm -f regress/unittests/hostkeys/test_hostkeys -+ rm -f regress/unittests/kex/*.o -+ rm -f regress/unittests/kex/test_kex -+ rm -f regress/unittests/match/*.o -+ rm -f regress/unittests/match/test_match -+ rm -f regress/unittests/utf8/*.o -+ rm -f regress/unittests/utf8/test_utf8 -+ rm -f regress/unittests/misc/kexfuzz -+ (cd openbsd-compat && $(MAKE) distclean) -+ if test -d pkg ; then \ -+ rm -fr pkg ; \ -+ fi -+ -+veryclean: distclean -+ rm -f configure config.h.in *.0 -+ -+cleandir: veryclean -+ -+mrproper: veryclean -+ -+realclean: veryclean -+ -+catman-do: -+ @for f in $(MANPAGES_IN) ; do \ -+ base=`echo $$f | sed 's/\..*$$//'` ; \ -+ echo "$$f -> $$base.0" ; \ -+ $(MANFMT) $$f | cat -v | sed -e 's/.\^H//g' \ -+ >$$base.0 ; \ -+ done -+ -+distprep: catman-do -+ $(AUTORECONF) -+ -rm -rf autom4te.cache -+ + -e 's|/etc/ssh/ssh_known_hosts|$(sysconfdir)/ssh_known_hosts|g' \ + -e 's|/etc/ssh/sshd_config|$(sysconfdir)/sshd_config|g' \ + -e 's|/usr/libexec|$(libexecdir)|g' \ +@@ -301,71 +301,31 @@ + $(AUTORECONF) + -rm -rf autom4te.cache + +-install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config +install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key -+install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf -+install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files -+ -+install-files: -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1 -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5 + install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf + install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files + +-check-config: +- -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config +- + install-files: + $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) +- $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) + $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir) + $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1 + $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5 +- $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8 +- $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) +- (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH)) +- $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) +- $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) +- $(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT) +- $(INSTALL) -m 0755 $(STRIP_OPT) ssh-agent$(EXEEXT) $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT) +- $(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 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) +- $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 +- $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 +- $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 +- $(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1 +- $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 +- $(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 +- $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5 +- $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5 +- $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5 +- $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 +- $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 +- $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 +- $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 +- $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 + $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh1$(EXEEXT) + $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp1$(EXEEXT) + $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen1$(EXEEXT) @@ -320,278 +83,70 @@ + $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp1.1 + $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen1.1 + $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config1.5 -+ -+install-sysconf: -+ if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ -+ fi + + install-sysconf: + if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ + $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ + fi +- @if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ +- $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ +- else \ +- echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \ +- fi +- @if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ +- $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ +- else \ +- echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ +- fi +- @if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \ +- if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \ +- echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \ +- mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \ +- else \ +- $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \ +- fi ; \ + @if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config1 ]; then \ + $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config1; \ -+ else \ + else \ +- echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \ + echo "$(DESTDIR)$(sysconfdir)/ssh_config1 already exists, install will not overwrite"; \ -+ fi -+ -+host-key: ssh-keygen$(EXEEXT) -+ @if [ -z "$(DESTDIR)" ] ; then \ -+ ./ssh-keygen -A; \ -+ fi -+ -+host-key-force: ssh-keygen$(EXEEXT) ssh$(EXEEXT) -+ if ./ssh -Q protocol-version | grep '^1$$' >/dev/null; then \ -+ ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N ""; \ -+ fi -+ ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" -+ ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" -+ ./ssh-keygen -t ed25519 -f $(DESTDIR)$(sysconfdir)/ssh_host_ed25519_key -N "" -+ if ./ssh -Q key | grep ecdsa >/dev/null ; then \ -+ ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N ""; \ -+ fi -+ -+uninstallall: uninstall + fi + + host-key: ssh-keygen$(EXEEXT) +@@ -385,8 +345,7 @@ + fi + + uninstallall: uninstall +- -rm -f $(DESTDIR)$(sysconfdir)/ssh_config +- -rm -f $(DESTDIR)$(sysconfdir)/sshd_config + -rm -f $(DESTDIR)$(sysconfdir)/ssh_config1 -+ -rmdir $(DESTDIR)$(sysconfdir) -+ -rmdir $(DESTDIR)$(bindir) -+ -rmdir $(DESTDIR)$(sbindir) -+ -rmdir $(DESTDIR)$(mandir)/$(mansubdir)1 -+ -rmdir $(DESTDIR)$(mandir)/$(mansubdir)8 -+ -rmdir $(DESTDIR)$(mandir) -+ -rmdir $(DESTDIR)$(libexecdir) -+ -+uninstall: -+ -rm -f $(DESTDIR)$(bindir)/ssh$(EXEEXT) -+ -rm -f $(DESTDIR)$(bindir)/scp$(EXEEXT) -+ -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) -+ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 -+ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 -+ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 -+ -+regress-prep: -+ [ -d `pwd`/regress ] || mkdir -p `pwd`/regress -+ [ -d `pwd`/regress/unittests ] || mkdir -p `pwd`/regress/unittests -+ [ -d `pwd`/regress/unittests/test_helper ] || \ -+ mkdir -p `pwd`/regress/unittests/test_helper -+ [ -d `pwd`/regress/unittests/sshbuf ] || \ -+ mkdir -p `pwd`/regress/unittests/sshbuf -+ [ -d `pwd`/regress/unittests/sshkey ] || \ -+ mkdir -p `pwd`/regress/unittests/sshkey -+ [ -d `pwd`/regress/unittests/bitmap ] || \ -+ mkdir -p `pwd`/regress/unittests/bitmap -+ [ -d `pwd`/regress/unittests/conversion ] || \ -+ mkdir -p `pwd`/regress/unittests/conversion -+ [ -d `pwd`/regress/unittests/hostkeys ] || \ -+ mkdir -p `pwd`/regress/unittests/hostkeys -+ [ -d `pwd`/regress/unittests/kex ] || \ -+ mkdir -p `pwd`/regress/unittests/kex -+ [ -d `pwd`/regress/unittests/match ] || \ -+ mkdir -p `pwd`/regress/unittests/match -+ [ -d `pwd`/regress/unittests/utf8 ] || \ -+ mkdir -p `pwd`/regress/unittests/utf8 -+ [ -d `pwd`/regress/misc/kexfuzz ] || \ -+ mkdir -p `pwd`/regress/misc/kexfuzz -+ [ -f `pwd`/regress/Makefile ] || \ -+ ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile -+ -+REGRESSLIBS=libssh.a $(LIBCOMPAT) -+ -+regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c $(REGRESSLIBS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/modpipe.c \ -+ $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -+ -+regress/setuid-allowed$(EXEEXT): $(srcdir)/regress/setuid-allowed.c $(REGRESSLIBS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/setuid-allowed.c \ -+ $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -+ -+regress/netcat$(EXEEXT): $(srcdir)/regress/netcat.c $(REGRESSLIBS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/netcat.c \ -+ $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -+ -+regress/check-perm$(EXEEXT): $(srcdir)/regress/check-perm.c $(REGRESSLIBS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/check-perm.c \ -+ $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -+ -+UNITTESTS_TEST_HELPER_OBJS=\ -+ regress/unittests/test_helper/test_helper.o \ -+ regress/unittests/test_helper/fuzz.o -+ -+regress/unittests/test_helper/libtest_helper.a: ${UNITTESTS_TEST_HELPER_OBJS} -+ $(AR) rv $@ $(UNITTESTS_TEST_HELPER_OBJS) -+ $(RANLIB) $@ -+ -+UNITTESTS_TEST_SSHBUF_OBJS=\ -+ regress/unittests/sshbuf/tests.o \ -+ regress/unittests/sshbuf/test_sshbuf.o \ -+ regress/unittests/sshbuf/test_sshbuf_getput_basic.o \ -+ regress/unittests/sshbuf/test_sshbuf_getput_crypto.o \ -+ regress/unittests/sshbuf/test_sshbuf_misc.o \ -+ regress/unittests/sshbuf/test_sshbuf_fuzz.o \ -+ regress/unittests/sshbuf/test_sshbuf_getput_fuzz.o \ -+ regress/unittests/sshbuf/test_sshbuf_fixed.o -+ -+regress/unittests/sshbuf/test_sshbuf$(EXEEXT): ${UNITTESTS_TEST_SSHBUF_OBJS} \ -+ regress/unittests/test_helper/libtest_helper.a libssh.a -+ $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHBUF_OBJS) \ -+ regress/unittests/test_helper/libtest_helper.a \ -+ -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -+ -+UNITTESTS_TEST_SSHKEY_OBJS=\ -+ regress/unittests/sshkey/test_fuzz.o \ -+ regress/unittests/sshkey/tests.o \ -+ regress/unittests/sshkey/common.o \ -+ regress/unittests/sshkey/test_file.o \ -+ regress/unittests/sshkey/test_sshkey.o -+ -+regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \ -+ regress/unittests/test_helper/libtest_helper.a libssh.a -+ $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHKEY_OBJS) \ -+ regress/unittests/test_helper/libtest_helper.a \ -+ -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -+ -+UNITTESTS_TEST_BITMAP_OBJS=\ -+ regress/unittests/bitmap/tests.o -+ -+regress/unittests/bitmap/test_bitmap$(EXEEXT): ${UNITTESTS_TEST_BITMAP_OBJS} \ -+ regress/unittests/test_helper/libtest_helper.a libssh.a -+ $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_BITMAP_OBJS) \ -+ regress/unittests/test_helper/libtest_helper.a \ -+ -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -+ -+UNITTESTS_TEST_CONVERSION_OBJS=\ -+ regress/unittests/conversion/tests.o -+ -+regress/unittests/conversion/test_conversion$(EXEEXT): \ -+ ${UNITTESTS_TEST_CONVERSION_OBJS} \ -+ regress/unittests/test_helper/libtest_helper.a libssh.a -+ $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_CONVERSION_OBJS) \ -+ regress/unittests/test_helper/libtest_helper.a \ -+ -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -+ -+UNITTESTS_TEST_KEX_OBJS=\ -+ regress/unittests/kex/tests.o \ -+ regress/unittests/kex/test_kex.o -+ -+regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \ -+ regress/unittests/test_helper/libtest_helper.a libssh.a -+ $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_KEX_OBJS) \ -+ regress/unittests/test_helper/libtest_helper.a \ -+ -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -+ -+UNITTESTS_TEST_HOSTKEYS_OBJS=\ -+ regress/unittests/hostkeys/tests.o \ -+ regress/unittests/hostkeys/test_iterate.o -+ -+regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \ -+ ${UNITTESTS_TEST_HOSTKEYS_OBJS} \ -+ regress/unittests/test_helper/libtest_helper.a libssh.a -+ $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_HOSTKEYS_OBJS) \ -+ regress/unittests/test_helper/libtest_helper.a \ -+ -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -+ -+UNITTESTS_TEST_MATCH_OBJS=\ -+ regress/unittests/match/tests.o -+ -+regress/unittests/match/test_match$(EXEEXT): \ -+ ${UNITTESTS_TEST_MATCH_OBJS} \ -+ regress/unittests/test_helper/libtest_helper.a libssh.a -+ $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_MATCH_OBJS) \ -+ regress/unittests/test_helper/libtest_helper.a \ -+ -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -+ -+UNITTESTS_TEST_UTF8_OBJS=\ -+ regress/unittests/utf8/tests.o -+ -+regress/unittests/utf8/test_utf8$(EXEEXT): \ -+ ${UNITTESTS_TEST_UTF8_OBJS} \ -+ regress/unittests/test_helper/libtest_helper.a libssh.a -+ $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_UTF8_OBJS) \ -+ regress/unittests/test_helper/libtest_helper.a \ -+ -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -+ -+MISC_KEX_FUZZ_OBJS=\ -+ regress/misc/kexfuzz/kexfuzz.o -+ -+regress/misc/kexfuzz/kexfuzz$(EXEEXT): ${MISC_KEX_FUZZ_OBJS} libssh.a -+ $(LD) -o $@ $(LDFLAGS) $(MISC_KEX_FUZZ_OBJS) \ -+ -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -+ -+regress-binaries: regress/modpipe$(EXEEXT) \ -+ regress/setuid-allowed$(EXEEXT) \ -+ regress/netcat$(EXEEXT) \ -+ regress/check-perm$(EXEEXT) \ -+ regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ -+ regress/unittests/sshkey/test_sshkey$(EXEEXT) \ -+ regress/unittests/bitmap/test_bitmap$(EXEEXT) \ -+ regress/unittests/conversion/test_conversion$(EXEEXT) \ -+ regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \ -+ regress/unittests/kex/test_kex$(EXEEXT) \ -+ regress/unittests/match/test_match$(EXEEXT) \ -+ regress/unittests/utf8/test_utf8$(EXEEXT) \ -+ regress/misc/kexfuzz/kexfuzz$(EXEEXT) -+ -+tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS) -+ BUILDDIR=`pwd`; \ -+ TEST_SSH_SCP="$${BUILDDIR}/scp"; \ -+ TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ -+ TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ -+ TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ -+ TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \ -+ TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \ -+ TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \ -+ TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \ -+ TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \ -+ TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ -+ TEST_SSH_PLINK="plink"; \ -+ TEST_SSH_PUTTYGEN="puttygen"; \ -+ TEST_SSH_CONCH="conch"; \ -+ TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ -+ TEST_SSH_UTF8="@TEST_SSH_UTF8@" ; \ -+ TEST_SSH_ECC="@TEST_SSH_ECC@" ; \ -+ cd $(srcdir)/regress || exit $$?; \ -+ $(MAKE) \ -+ .OBJDIR="$${BUILDDIR}/regress" \ -+ .CURDIR="`pwd`" \ -+ BUILDDIR="$${BUILDDIR}" \ -+ OBJ="$${BUILDDIR}/regress/" \ -+ PATH="$${BUILDDIR}:$${PATH}" \ -+ TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ -+ TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ -+ TEST_SSH_SCP="$${TEST_SSH_SCP}" \ -+ TEST_SSH_SSH="$${TEST_SSH_SSH}" \ -+ TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ -+ TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \ -+ TEST_SSH_SSHADD="$${TEST_SSH_SSHADD}" \ -+ TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \ -+ TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \ -+ TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ -+ TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ -+ TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ -+ TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ -+ TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ -+ TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \ -+ TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ -+ TEST_SSH_UTF8="$${TEST_SSH_UTF8}" \ -+ TEST_SSH_ECC="$${TEST_SSH_ECC}" \ -+ TEST_SHELL="${TEST_SHELL}" \ -+ EXEEXT="$(EXEEXT)" \ -+ $@ && echo all tests passed -+ -+compat-tests: $(LIBCOMPAT) -+ (cd openbsd-compat/regress && $(MAKE)) -+ -+regressclean: -+ if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \ -+ (cd regress && $(MAKE) clean) \ -+ fi -+ -+survey: survey.sh ssh -+ @$(SHELL) ./survey.sh > survey -+ @echo 'The survey results have been placed in the file "survey" in the' -+ @echo 'current directory. Please review the file then send with' -+ @echo '"make send-survey".' -+ -+send-survey: survey -+ mail portable-survey@mindrot.org