From owner-svn-ports-all@freebsd.org Mon Jul 27 18:41:03 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 926389ACB44; Mon, 27 Jul 2015 18:41:03 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 82BB32D8; Mon, 27 Jul 2015 18:41:03 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6RIf3O3005281; Mon, 27 Jul 2015 18:41:03 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6RIf2wi005278; Mon, 27 Jul 2015 18:41:02 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201507271841.t6RIf2wi005278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 27 Jul 2015 18:41:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393002 - in head/security/openssh-portable: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2015 18:41:03 -0000 Author: bdrewery Date: Mon Jul 27 18:41:02 2015 New Revision: 393002 URL: https://svnweb.freebsd.org/changeset/ports/393002 Log: Fix accidental revert of PermitRootLogin default to NO. This was due to the patch not being needed in the snapshot version which I based the 6.9 update off of. The default is changed in the upcoming 7.0 release Modified: head/security/openssh-portable/Makefile head/security/openssh-portable/files/patch-servconf.c Modified: head/security/openssh-portable/Makefile ============================================================================== --- head/security/openssh-portable/Makefile Mon Jul 27 18:39:32 2015 (r393001) +++ head/security/openssh-portable/Makefile Mon Jul 27 18:41:02 2015 (r393002) @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 6.9p1 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= OPENBSD/OpenSSH/portable Modified: head/security/openssh-portable/files/patch-servconf.c ============================================================================== --- head/security/openssh-portable/files/patch-servconf.c Mon Jul 27 18:39:32 2015 (r393001) +++ head/security/openssh-portable/files/patch-servconf.c Mon Jul 27 18:41:02 2015 (r393002) @@ -17,6 +17,15 @@ /* X.509 Standard Options */ #ifdef OPENSSL_FIPS +@@ -277,7 +278,7 @@ fill_default_server_options(ServerOption + if (options->key_regeneration_time == -1) + options->key_regeneration_time = 3600; + if (options->permit_root_login == PERMIT_NOT_SET) +- options->permit_root_login = PERMIT_YES; ++ options->permit_root_login = PERMIT_NO; + if (options->ignore_rhosts == -1) + options->ignore_rhosts = 1; + if (options->ignore_user_known_hosts == -1) @@ -287,7 +288,7 @@ fill_default_server_options(ServerOption if (options->print_lastlog == -1) options->print_lastlog = 1;