saving uncommitted changes in /etc prior to emerge run

diff --git a/ssh/ssh_config b/ssh/ssh_config
index 42874fe9bd2e033fd8d14c1a9d4b494966ace67e..0f76947f6cc6ebb9e7dc68c445d8c7234e08b39c 100644 (file)
--- a/ssh/ssh_config
+++ b/ssh/ssh_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: ssh_config,v 1.28 2013/09/16 11:35:43 sthen Exp $
+#      $OpenBSD: ssh_config,v 1.30 2016/02/20 23:06:23 sobrado Exp $
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
@@ -34,8 +34,10 @@
 #   IdentityFile ~/.ssh/identity
 #   IdentityFile ~/.ssh/id_rsa
 #   IdentityFile ~/.ssh/id_dsa
+#   IdentityFile ~/.ssh/id_ecdsa
+#   IdentityFile ~/.ssh/id_ed25519
 #   Port 22
-#   Protocol 2,1
+#   Protocol 2
 #   Cipher 3des
 #   Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
 #   MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160

diff --git a/ssh/sshd_config b/ssh/sshd_config
index ea37038dc4b9a364844da396f545b5c10b38fa76..c08c86e102dc7d990f2369c21c6923958b32da19 100644 (file)
--- a/ssh/sshd_config
+++ b/ssh/sshd_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.97 2015/08/06 14:53:21 deraadt Exp $
+#      $OpenBSD: sshd_config,v 1.98 2016/02/17 05:29:04 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -107,7 +107,7 @@ PrintMotd no
 PrintLastLog no
 #TCPKeepAlive yes
 #UseLogin no
-UsePrivilegeSeparation sandbox         # Default for new installations.
+#UsePrivilegeSeparation sandbox
 #PermitUserEnvironment no
 #Compression delayed
 #ClientAliveInterval 0
@@ -125,20 +125,6 @@ UsePrivilegeSeparation sandbox             # Default for new installations.
 # override default of no subsystems
 Subsystem      sftp    /usr/lib64/misc/sftp-server
 
-# the following are HPN related configuration options
-# tcp receive buffer polling. disable in non autotuning kernels
-#TcpRcvBufPoll yes
-
-# disable hpn performance boosts
-#HPNDisabled no
-
-# buffer size for hpn to non-hpn connections
-#HPNBufferSize 2048
-
-
-# allow the use of the none cipher
-#NoneEnabled no
-
 # Example of overriding settings on a per-user basis
 #Match User anoncvs
 #      X11Forwarding no