From ecc6d00aba30761e084b26a38b921dbe887fd76e Mon Sep 17 00:00:00 2001 From: Peter Avalos Date: Sat, 9 Apr 2011 02:34:37 -0700 Subject: [PATCH] Update files for OpenSSH-5.8p1 import. --- crypto/openssh/README.DRAGONFLY | 2 +- crypto/openssh/defines.h | 2 - crypto/openssh/includes.h | 1 + crypto/openssh/ssh-keygen.c | 2 +- crypto/openssh/ssh_config | 2 +- crypto/openssh/ssh_config.5 | 2 +- crypto/openssh/ssh_namespace.h | 35 +++++++++++++ crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 2 +- secure/Makefile.ssh.common | 7 +-- secure/lib/libssh/Makefile | 13 ++--- secure/lib/libssh/config.h | 64 ++++++++++++++++++----- secure/lib/libssh/version.h | 4 +- secure/libexec/ssh-keysign/Makefile | 3 -- secure/libexec/ssh-pkcs11-helper/Makefile | 3 -- secure/usr.bin/scp/Makefile | 2 +- secure/usr.bin/sftp/Makefile | 2 +- secure/usr.bin/ssh-agent/Makefile | 2 +- secure/usr.bin/ssh-keyscan/Makefile | 5 +- secure/usr.bin/ssh/Makefile | 3 -- secure/usr.sbin/sshd/Makefile | 10 ++-- 21 files changed, 111 insertions(+), 57 deletions(-) diff --git a/crypto/openssh/README.DRAGONFLY b/crypto/openssh/README.DRAGONFLY index fb6c65027d..b1a9fa8282 100644 --- a/crypto/openssh/README.DRAGONFLY +++ b/crypto/openssh/README.DRAGONFLY @@ -5,7 +5,7 @@ A list of deleted files is in README.DELETED. Upgrading notes: ./configure --prefix=/usr --sysconfdir=/etc/ssh \ - --with-pam --with-tcp-wrappers --with-libedit + --with-pam --with-tcp-wrappers --with-libedit --with-ssl-engine Update config.h and version.h in secure/lib/libssh. Update ssh{,d}_config and ssh{,d}_config.5. diff --git a/crypto/openssh/defines.h b/crypto/openssh/defines.h index cd273066da..6eded7d053 100644 --- a/crypto/openssh/defines.h +++ b/crypto/openssh/defines.h @@ -56,8 +56,6 @@ enum /* * Definitions for DiffServ Codepoints as per RFC2474 */ -#include -#include #ifndef IPTOS_DSCP_AF11 # define IPTOS_DSCP_AF11 0x28 # define IPTOS_DSCP_AF12 0x30 diff --git a/crypto/openssh/includes.h b/crypto/openssh/includes.h index b4c53d9b4f..e02e99f11b 100644 --- a/crypto/openssh/includes.h +++ b/crypto/openssh/includes.h @@ -111,6 +111,7 @@ #include #include /* For typedefs */ +#include #ifdef HAVE_RPC_TYPES_H # include /* For INADDR_LOOPBACK */ #endif diff --git a/crypto/openssh/ssh-keygen.c b/crypto/openssh/ssh-keygen.c index 249831c1a4..c95e4ab298 100644 --- a/crypto/openssh/ssh-keygen.c +++ b/crypto/openssh/ssh-keygen.c @@ -1478,7 +1478,7 @@ do_ca_sign(struct passwd *pw, int argc, char **argv) fclose(f); if (!quiet) { - logit("Signed %s key %s: id \"%s\" serial %ju%s%s " + logit("Signed %s key %s: id \"%s\" serial %llu%s%s " "valid %s", key_cert_type(public), out, public->cert->key_id, (unsigned long long)public->cert->serial, diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config index fca28f93f2..cb43fe1d27 100644 --- a/crypto/openssh/ssh_config +++ b/crypto/openssh/ssh_config @@ -40,7 +40,7 @@ # Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 # EscapeChar ~ -# VersionAddendum DragonFly-20090620 +# VersionAddendum DragonFly-20110408 # XAuthLocation /usr/pkg/bin/xauth # Tunnel no diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5 index 80a5492e3c..6e900eff93 100644 --- a/crypto/openssh/ssh_config.5 +++ b/crypto/openssh/ssh_config.5 @@ -1172,7 +1172,7 @@ in Specifies a string to append to the regular version string to identify OS- or site-specific modifications. The default is -.Dq DragonFly-20090620 . +.Dq DragonFly-20110408 . .It Cm VisualHostKey If this flag is set to .Dq yes , diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h index 683bee3f5f..47f10f8c40 100644 --- a/crypto/openssh/ssh_namespace.h +++ b/crypto/openssh/ssh_namespace.h @@ -23,8 +23,12 @@ #define addr_match_list ssh_addr_match_list #define ask_permission ssh_ask_permission #define atomicio ssh_atomicio +#define atomicio6 ssh_atomicio6 #define atomiciov ssh_atomiciov +#define atomiciov6 ssh_atomiciov6 #define auth_request_forwarding ssh_auth_request_forwarding +#define bandwidth_limit ssh_bandwidth_limit +#define bandwidth_limit_init ssh_bandwidth_limit_init #define blacklist_filename ssh_blacklist_filename #define blacklisted_key ssh_blacklisted_key #define bn_rand_range_gt_one ssh_bn_rand_range_gt_one @@ -49,6 +53,10 @@ #define buffer_get_bignum_ret ssh_buffer_get_bignum_ret #define buffer_get_char ssh_buffer_get_char #define buffer_get_char_ret ssh_buffer_get_char_ret +#define buffer_get_cstring ssh_buffer_get_cstring +#define buffer_get_cstring_ret ssh_buffer_get_cstring_ret +#define buffer_get_ecpoint ssh_buffer_get_ecpoint +#define buffer_get_ecpoint_ret ssh_buffer_get_ecpoint_ret #define buffer_get_int ssh_buffer_get_int #define buffer_get_int64 ssh_buffer_get_int64 #define buffer_get_int64_ret ssh_buffer_get_int64_ret @@ -69,6 +77,8 @@ #define buffer_put_bignum_ret ssh_buffer_put_bignum_ret #define buffer_put_char ssh_buffer_put_char #define buffer_put_cstring ssh_buffer_put_cstring +#define buffer_put_ecpoint ssh_buffer_put_ecpoint +#define buffer_put_ecpoint_ret ssh_buffer_put_ecpoint_ret #define buffer_put_int ssh_buffer_put_int #define buffer_put_int64 ssh_buffer_put_int64 #define buffer_put_short ssh_buffer_put_short @@ -140,6 +150,7 @@ #define channel_stop_listening ssh_channel_stop_listening #define channel_tcpwinsz ssh_channel_tcpwinsz #define check_host_in_hostfile ssh_check_host_in_hostfile +#define check_key_in_hostkeys ssh_check_key_in_hostkeys #define choose_dh ssh_choose_dh #define chop ssh_chop #define cipher_blocksize ssh_cipher_blocksize @@ -214,6 +225,7 @@ #define fatal ssh_fatal #define fatal ssh_fatal #define fmt_scaled ssh_fmt_scaled +#define free_hostkeys ssh_free_hostkeys #define freeargs ssh_freeargs #define freerrset ssh_freerrset #define gen_candidates ssh_gen_candidates @@ -236,17 +248,36 @@ #define hostfile_read_key ssh_hostfile_read_key #define hpdelim ssh_hpdelim #define incoming_stream ssh_incoming_stream +#define init_hostkeys ssh_init_hostkeys #define init_rng ssh_init_rng #define ipv64_normalise_mapped ssh_ipv64_normalise_mapped +#define key_curve_name_to_nid ssh_key_curve_name_to_nid +#define key_curve_nid_to_bits ssh_key_curve_nid_to_bits +#define key_curve_nid_to_name ssh_key_curve_nid_to_name #define kex_derive_keys ssh_kex_derive_keys #define kex_dh_hash ssh_kex_dh_hash +#define key_ec_nid_to_evpmd ssh_key_ec_nid_to_evpmd +#define key_ec_validate_private ssh_key_ec_validate_private +#define key_ec_validate_public ssh_key_ec_validate_public +#define kex_ecdh_hash ssh_kex_ecdh_hash +#define kex_ecdh_name_to_evpmd ssh_kex_ecdh_name_to_evpmd +#define kex_ecdh_name_to_nid ssh_kex_ecdh_name_to_nid +#define key_ecdsa_bits_to_nid ssh_key_ecdsa_bits_to_nid +#define key_ecdsa_key_to_nid ssh_key_ecdsa_key_to_nid +#define key_ecdsa_nid_from_name ssh_key_ecdsa_nid_from_name #define kex_finish ssh_kex_finish #define kex_get_newkeys ssh_kex_get_newkeys #define kex_input_kexinit ssh_kex_input_kexinit +#define kex_names_valid ssh_kex_names_valid +#define packet_get_cstring ssh_packet_get_cstring +#define packet_get_ecpoint ssh_packet_get_ecpoint +#define packet_put_ecpoint ssh_packet_put_ecpoint #define kex_prop2buf ssh_kex_prop2buf #define kex_send_kexinit ssh_kex_send_kexinit #define kex_setup ssh_kex_setup +#define key_ssh_name_plain ssh_key_ssh_name_plain #define kexdh_client ssh_kexdh_client +#define kexecdh_client ssh_kexecdh_client #define kexgex_client ssh_kexgex_client #define kexgex_hash ssh_kexgex_hash #define key_add_private ssh_key_add_private @@ -290,6 +321,7 @@ #define key_type_plain ssh_key_type_plain #define key_verify ssh_key_verify #define key_write ssh_key_write +#define load_hostkeys ssh_load_hostkeys #define log_facility_name ssh_log_facility_name #define log_facility_number ssh_log_facility_number #define log_init ssh_log_init @@ -298,6 +330,7 @@ #define logit ssh_logit #define logit ssh_logit #define lookup_key_in_hostfile_by_type ssh_lookup_key_in_hostfile_by_type +#define lookup_key_in_hostkeys_by_type ssh_lookup_key_in_hostkeys_by_type #define mac_clear ssh_mac_clear #define mac_compute ssh_mac_compute #define mac_init ssh_mac_init @@ -310,6 +343,7 @@ #define match_pattern ssh_match_pattern #define match_pattern_list ssh_match_pattern_list #define match_user ssh_match_user +#define mktemp_proto ssh_mktemp_proto #define mm_receive_fd ssh_mm_receive_fd #define mm_send_fd ssh_mm_send_fd #define modp_group_free ssh_modp_group_free @@ -389,6 +423,7 @@ #define packet_start_compression ssh_packet_start_compression #define packet_write_poll ssh_packet_write_poll #define packet_write_wait ssh_packet_write_wait +#define parse_ipqos ssh_parse_ipqos #define percent_expand ssh_percent_expand #define permanently_drop_suid ssh_permanently_drop_suid #define permanently_set_uid ssh_permanently_set_uid diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index bcd97c4822..ee2a0aaee1 100644 --- a/crypto/openssh/sshd_config +++ b/crypto/openssh/sshd_config @@ -13,7 +13,7 @@ # Note that some of DragonFly's defaults differ from OpenBSD's, and # DragonFly has a few additional options. -#VersionAddendum DragonFly-20090620 +#VersionAddendum DragonFly-20110408 #Port 22 #AddressFamily any diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5 index 9b0b9f2554..e466db310d 100644 --- a/crypto/openssh/sshd_config.5 +++ b/crypto/openssh/sshd_config.5 @@ -1105,7 +1105,7 @@ The default is Specifies a string to append to the regular version string to identify OS- or site-specific modifications. The default is -.Dq DragonFly-20090620 . +.Dq DragonFly-20110408 . .It Cm X11DisplayOffset Specifies the first display number available for .Xr sshd 8 Ns 's diff --git a/secure/Makefile.ssh.common b/secure/Makefile.ssh.common index 6123f9a404..3fb3ccdd39 100644 --- a/secure/Makefile.ssh.common +++ b/secure/Makefile.ssh.common @@ -7,11 +7,8 @@ CFLAGS+= -I${.CURDIR}/../../lib/libssh -I${SSHDIR} -include ssh_namespace.h NOLINT= true .if ${.CURDIR:T} != "libssh" -DPADD+= ${LIBSSH} -LDADD+= -lssh +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} +LDADD+= -lssh -lcrypto -lutil -lz .endif -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto - .PATH: ${SSHDIR} diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index bffb34e623..3679545020 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -10,12 +10,12 @@ SRCS= acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.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 msg.c progressmeter.c dns.c \ - entropy.c gss-genr.c umac.c jpake.c schnorr.c \ - ssh-pkcs11.c + monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c \ + kexdh.c kexgex.c kexdhc.c kexgexc.c bufec.c kexecdh.c kexecdhc.c \ + msg.c progressmeter.c dns.c entropy.c gss-genr.c umac.c jpake.c \ + schnorr.c ssh-pkcs11.c # Portability layer -SRCS+= bsd-misc.c getrrsetbyname.c port-tun.c +SRCS+= bsd-misc.c getrrsetbyname.c port-tun.c timingsafe_bcmp.c # FreeBSD additions SRCS+= version.c @@ -23,9 +23,6 @@ MAN= moduli.5 WARNS?= 0 -DPADD+= ${LIBZ} -LDADD+= -lz - .include "../../Makefile.ssh.common" .include diff --git a/secure/lib/libssh/config.h b/secure/lib/libssh/config.h index 927020b370..d3ec45df41 100644 --- a/secure/lib/libssh/config.h +++ b/secure/lib/libssh/config.h @@ -112,7 +112,7 @@ /* #undef DISABLE_UTMP */ /* Define if you don't want to use utmpx */ -/* #define DISABLE_UTMPX */ +/* #undef DISABLE_UTMPX */ /* Define if you don't want to use wtmp */ /* #undef DISABLE_WTMP */ @@ -126,6 +126,9 @@ /* Builtin PRNG command timeout */ #define ENTROPY_TIMEOUT_MSEC 200 +/* File names may not contain backslash characters */ +/* #undef FILESYSTEM_NO_BACKSLASH */ + /* fsid_t has member val */ /* #undef FSID_HAS_VAL */ @@ -144,6 +147,9 @@ /* Define if your system glob() function has gl_matchc options in glob_t */ #define GLOB_HAS_GL_MATCHC 1 +/* Define if your system glob() function has gl_statv options in glob_t */ +/* #undef GLOB_HAS_GL_STATV */ + /* Define this if you want GSSAPI support in the version 2 protocol */ /* #undef GSSAPI */ @@ -204,6 +210,9 @@ /* Define to 1 if you have the `bindresvport_sa' function. */ #define HAVE_BINDRESVPORT_SA 1 +/* Define to 1 if you have the `BN_is_prime_ex' function. */ +#define HAVE_BN_IS_PRIME_EX 1 + /* Define to 1 if you have the header file. */ /* #undef HAVE_BSM_AUDIT_H */ @@ -229,7 +238,7 @@ /* #undef HAVE_CRYPTO_SHA2_H */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_CRYPT_H */ +#define HAVE_CRYPT_H 1 /* Define if you are on Cygwin */ /* #undef HAVE_CYGWIN */ @@ -312,11 +321,14 @@ /* Define to 1 if you have the `dirname' function. */ #define HAVE_DIRNAME 1 +/* Define to 1 if you have the `DSA_generate_parameters_ex' function. */ +#define HAVE_DSA_GENERATE_PARAMETERS_EX 1 + /* Define to 1 if you have the header file. */ /* #undef HAVE_ENDIAN_H */ /* Define to 1 if you have the `endutent' function. */ -/* #undef HAVE_ENDUTENT */ +#define HAVE_ENDUTENT 1 /* Define to 1 if you have the `endutxent' function. */ #define HAVE_ENDUTXENT 1 @@ -436,7 +448,7 @@ #define HAVE_GETTTYENT 1 /* Define to 1 if you have the `getutent' function. */ -/* #undef HAVE_GETUTENT */ +#define HAVE_GETUTENT 1 /* Define to 1 if you have the `getutid' function. */ /* #undef HAVE_GETUTID */ @@ -448,10 +460,10 @@ #define HAVE_GETUTXENT 1 /* Define to 1 if you have the `getutxid' function. */ -/* #undef HAVE_GETUTXID */ +#define HAVE_GETUTXID 1 /* Define to 1 if you have the `getutxline' function. */ -/* #undef HAVE_GETUTXLINE */ +#define HAVE_GETUTXLINE 1 /* Define to 1 if you have the `getutxuser' function. */ /* #undef HAVE_GETUTXUSER */ @@ -505,7 +517,7 @@ /* #undef HAVE_ID_IN_UTMP */ /* Define if you have ut_id in utmpx.h */ -#define HAVE_ID_IN_UTMPX 1 +#define HAVE_ID_IN_UTMPX 1 /* Define to 1 if you have the `inet_aton' function. */ #define HAVE_INET_ATON 1 @@ -534,9 +546,15 @@ /* Define to 1 if the system has the type `in_port_t'. */ #define HAVE_IN_PORT_T 1 +/* Define if you have isblank(3C). */ +#define HAVE_ISBLANK 1 + /* Define to 1 if you have the header file. */ /* #undef HAVE_LASTLOG_H */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBAUDIT_H */ + /* Define to 1 if you have the `bsm' library (-lbsm). */ /* #undef HAVE_LIBBSM */ @@ -580,7 +598,7 @@ /* #undef HAVE_LINUX_IF_TUN_H */ /* Define if your libraries define login() */ -/* #undef HAVE_LOGIN */ +#define HAVE_LOGIN 1 /* Define to 1 if you have the header file. */ #define HAVE_LOGIN_CAP_H 1 @@ -739,6 +757,12 @@ /* Define to 1 if you have the `rresvport_af' function. */ #define HAVE_RRESVPORT_AF 1 +/* Define to 1 if you have the `RSA_generate_key_ex' function. */ +#define HAVE_RSA_GENERATE_KEY_EX 1 + +/* Define to 1 if you have the `RSA_get_default_method' function. */ +#define HAVE_RSA_GET_DEFAULT_METHOD 1 + /* define if you have sa_family_t data type */ #define HAVE_SA_FAMILY_T 1 @@ -806,10 +830,10 @@ #define HAVE_SETSID 1 /* Define to 1 if you have the `setutent' function. */ -/* #undef HAVE_SETUTENT */ +#define HAVE_SETUTENT 1 /* Define to 1 if you have the `setutxdb' function. */ -/* #undef HAVE_SETUTXDB */ +#define HAVE_SETUTXDB 1 /* Define to 1 if you have the `setutxent' function. */ #define HAVE_SETUTXENT 1 @@ -1045,6 +1069,9 @@ /* Define if you have ut_time in utmpx.h */ /* #undef HAVE_TIME_IN_UTMPX */ +/* Define to 1 if you have the `timingsafe_bcmp' function. */ +/* #undef HAVE_TIMINGSAFE_BCMP */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_TMPDIR_H */ @@ -1085,7 +1112,7 @@ /* #undef HAVE_UPDWTMP */ /* Define to 1 if you have the `updwtmpx' function. */ -/* #undef HAVE_UPDWTMPX */ +#define HAVE_UPDWTMPX 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_USERSEC_H */ @@ -1103,10 +1130,10 @@ #define HAVE_UTIME_H 1 /* Define to 1 if you have the `utmpname' function. */ -/* #undef HAVE_UTMPNAME */ +#define HAVE_UTMPNAME 1 /* Define to 1 if you have the `utmpxname' function. */ -/* #undef HAVE_UTMPXNAME */ +#define HAVE_UTMPXNAME 1 /* Define to 1 if you have the header file. */ #define HAVE_UTMPX_H 1 @@ -1260,6 +1287,9 @@ /* Define if EVP_DigestUpdate returns void */ /* #undef OPENSSL_EVP_DIGESTUPDATE_VOID */ +/* libcrypto includes complete ECC support */ +#define OPENSSL_HAS_ECC 1 + /* libcrypto is missing AES 192 and 256 bit functions */ /* #undef OPENSSL_LOBOTOMISED_AES */ @@ -1391,8 +1421,11 @@ /* Use libedit for sftp */ #define USE_LIBEDIT 1 +/* Use Linux audit module */ +/* #undef USE_LINUX_AUDIT */ + /* Enable OpenSSL engine support */ -/* #undef USE_OPENSSL_ENGINE */ +#define USE_OPENSSL_ENGINE 1 /* Define if you want to enable PAM support */ #define USE_PAM 1 @@ -1403,6 +1436,9 @@ /* Define if you have Solaris process contracts */ /* #undef USE_SOLARIS_PROCESS_CONTRACTS */ +/* Define if you have Solaris projects */ +/* #undef USE_SOLARIS_PROJECTS */ + /* Define if you shouldn't strip 'tty' from your ttyname in [uw]tmp */ /* #undef WITH_ABBREV_NO_TTY */ diff --git a/secure/lib/libssh/version.h b/secure/lib/libssh/version.h index 69334e4063..baca6e3dd6 100644 --- a/secure/lib/libssh/version.h +++ b/secure/lib/libssh/version.h @@ -5,8 +5,8 @@ #define SSH_VERSION (ssh_version_get()) #define SSH_RELEASE (ssh_version_get()) -#define SSH_VERSION_BASE "OpenSSH_5.6p1-hpn13v10" -#define SSH_VERSION_ADDENDUM "DragonFly-20100928" +#define SSH_VERSION_BASE "OpenSSH_5.8p1-hpn13v11" +#define SSH_VERSION_ADDENDUM "DragonFly-20110408" const char *ssh_version_get(void); void ssh_version_set_addendum(const char *add); diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile index 111ebfc89b..5b21fd685e 100644 --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -8,8 +8,5 @@ MAN= ssh-keysign.8 BINMODE=4511 .endif -DPADD+= ${LIBZ} -LDADD+= -lz - .include "../../Makefile.ssh.common" .include diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile index 880928709e..2c13e09911 100644 --- a/secure/libexec/ssh-pkcs11-helper/Makefile +++ b/secure/libexec/ssh-pkcs11-helper/Makefile @@ -2,8 +2,5 @@ PROG= ssh-pkcs11-helper SRCS= ssh-pkcs11-helper.c roaming_dummy.c MAN= ssh-pkcs11-helper.8 -DPADD+= ${LIBZ} -LDADD+= -lz - .include "../../Makefile.ssh.common" .include diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index a4f3da35a6..b3a8152eff 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -2,7 +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 +SRCS= scp.c progressmeter.c bufaux.c roaming_dummy.c WARNS?= 3 .include "../../Makefile.ssh.common" diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 2392e26a44..bb2c4a7d22 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -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 roaming_dummy.c +SRCS= progressmeter.c sftp.c sftp-client.c sftp-common.c sftp-glob.c roaming_dummy.c WARNS?= 0 # Portability layer diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index edf34851c7..f62d05d626 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -2,7 +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 +SRCS= ssh-agent.c ssh-pkcs11-client.c roaming_dummy.c WARNS?= 3 .include "../../Makefile.ssh.common" diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index 9db3de49f0..4d5ee52c37 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -2,11 +2,8 @@ # $DragonFly: src/secure/usr.bin/ssh-keyscan/Makefile,v 1.4 2008/04/07 01:20:18 pavalos Exp $ PROG= ssh-keyscan -SRCS= ssh-keyscan.c misc.c roaming_dummy.c +SRCS= ssh-keyscan.c roaming_dummy.c WARNS?= 3 -DPADD+= ${LIBZ} -LDADD+= -lz - .include "../../Makefile.ssh.common" .include diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 4f9d2946dd..c02ac10fb9 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -16,8 +16,5 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \ CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\" .endif -LDADD+= -lutil -lz -DPADD+= ${LIBUTIL} ${LIBZ} - .include "../../Makefile.ssh.common" .include diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 4a84568f06..7894e5e617 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -4,17 +4,19 @@ PROG= sshd SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ + audit.c audit-bsm.c platform.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 \ + monitor_mm.c monitor.c monitor_wrap.c kexdhs.c kexgexs.c kexecdhs.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 \ + sftp-server.c sftp-common.c \ roaming_common.c roaming_serv.c + WARNS?= 0 # Portability layer @@ -36,8 +38,8 @@ DPADD+= ${LIBOPIE} CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\" .endif -LDADD+= -lcrypt -lutil -lz -lwrap ${MINUSLPAM} -DPADD+= ${LIBCRYPT} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM} +LDADD+= -lcrypt -lwrap ${MINUSLPAM} +DPADD+= ${LIBCRYPT} ${LIBWRAP} ${LIBPAM} .include "../../Makefile.ssh.common" .include -- 2.41.0