--- security/openssh-portable/Makefile (revision 436510) +++ security/openssh-portable/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= openssh -DISTVERSION= 7.4p1 -PORTREVISION= 1 +DISTVERSION= 7.5p1 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= OPENBSD/OpenSSH/portable @@ -17,8 +16,7 @@ CONFLICTS?= openssh-3.* ssh-1.* ssh2-3.* openssh-portable-devel-* -USES= alias ncurses ssl -USE_AUTOTOOLS= autoconf autoheader +USES= alias autoreconf ncurses ssl GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_func_strnvis=no CONFIGURE_ARGS= --prefix=${PREFIX} --with-md5-passwords \ --- security/openssh-portable/distinfo (revision 436510) +++ security/openssh-portable/distinfo (working copy) @@ -1,9 +1,3 @@ -TIMESTAMP = 1484161900 -SHA256 (openssh-7.4p1.tar.gz) = 1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1 -SIZE (openssh-7.4p1.tar.gz) = 1511780 -SHA256 (openssh-7.2_p1-sctp.patch.gz) = fb67e3e23f39fabf44ef198e3e19527417c75c9352747547448512032365dbfc -SIZE (openssh-7.2_p1-sctp.patch.gz) = 8501 -SHA256 (openssh-7.4p1+x509-9.3.diff.gz) = 1d3fd23b3d02a3baad50890bf5498ef01af6dab6375da0aeb00a0d59fd3ac9ee -SIZE (openssh-7.4p1+x509-9.3.diff.gz) = 446572 -SHA256 (openssh-7.4p1-gsskex-all-20141021-debian-rh-20161228.patch.gz) = f77ac434e6914814bc2f16d1581efd74baedaa86f1249a3cee00566d458c5f6b -SIZE (openssh-7.4p1-gsskex-all-20141021-debian-rh-20161228.patch.gz) = 27091 +TIMESTAMP = 1490017286 +SHA256 (openssh-7.5p1.tar.gz) = 9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0 +SIZE (openssh-7.5p1.tar.gz) = 1510857 --- security/openssh-portable/files/patch-auth2.c (revision 436510) +++ security/openssh-portable/files/patch-auth2.c (working copy) @@ -5,9 +5,9 @@ Apply class-imposed login restrictions. ---- auth2.c.orig 2012-12-02 16:53:20.000000000 -0600 -+++ auth2.c 2013-05-22 17:21:37.979631466 -0500 -@@ -46,6 +46,7 @@ +--- auth2.c.orig 2017-03-20 02:39:27 UTC ++++ auth2.c +@@ -47,6 +47,7 @@ #include "key.h" #include "hostfile.h" #include "auth.h" @@ -15,12 +15,11 @@ #include "dispatch.h" #include "pathnames.h" #include "buffer.h" -@@ -216,6 +217,14 @@ input_userauth_request(int type, u_int32 +@@ -217,6 +218,13 @@ input_userauth_request(int type, u_int32 Authmethod *m = NULL; char *user, *service, *method, *style = NULL; int authenticated = 0; +#ifdef HAVE_LOGIN_CAP -+ struct ssh *ssh = active_state; /* XXX */ + login_cap_t *lc; + const char *from_host, *from_ip; + @@ -30,7 +29,7 @@ if (authctxt == NULL) fatal("input_userauth_request: no authctxt"); -@@ -262,6 +271,27 @@ input_userauth_request(int type, u_int32 +@@ -266,6 +274,27 @@ input_userauth_request(int type, u_int32 "(%s,%s) -> (%s,%s)", authctxt->user, authctxt->service, user, service); } --- security/openssh-portable/pkg-plist (revision 436510) +++ security/openssh-portable/pkg-plist (working copy) @@ -9,7 +9,7 @@ @sample %%ETCDIR%%/ssh_config.sample @sample %%ETCDIR%%/sshd_config.sample %%X509%%@dir %%ETCDIR%%/ca -@exec if [ -f %D/%%ETCDIR%%/ssh_host_ecdsa_key ] && grep -q DSA %D/%%ETCDIR%%/ssh_host_ecdsa_key; then echo; echo "\!/ Warning \!/"; echo; echo "Your %D/%%ETCDIR%%/ssh_host_ecdsa_key is not a valid ECDSA key. It is incorrectly"; echo "a DSA key due to a bug fixed in 2012 in the security/openssh-portable port."; echo; echo "Regenerate a proper one with: rm -f %D/%%ETCDIR%%/ssh_host_ecdsa_key*; service openssh restart"; echo; echo "Clients should not see any key change warning since the ECDSA was not valid and was not actually"; echo "used by the server."; echo; echo "\!/ Warning \!/"; fi +@postexec if [ -f %D/%%ETCDIR%%/ssh_host_ecdsa_key ] && grep -q DSA %D/%%ETCDIR%%/ssh_host_ecdsa_key; then echo; echo "\!/ Warning \!/"; echo; echo "Your %D/%%ETCDIR%%/ssh_host_ecdsa_key is not a valid ECDSA key. It is incorrectly"; echo "a DSA key due to a bug fixed in 2012 in the security/openssh-portable port."; echo; echo "Regenerate a proper one with: rm -f %D/%%ETCDIR%%/ssh_host_ecdsa_key*; service openssh restart"; echo; echo "Clients should not see any key change warning since the ECDSA was not valid and was not actually"; echo "used by the server."; echo; echo "\!/ Warning \!/"; fi sbin/sshd libexec/sftp-server libexec/ssh-keysign