- tests require kernel with NO_NEW_PRIVS prctl support (the same for default configur...

[packages/openssh.git] / openssh-config.patch

diff --git a/openssh-config.patch b/openssh-config.patch
index 911a8d631fe84f8db998994db4c12b910aa96026..80c499508261e5d763d44847bead53a6449573f9 100644 (file)
--- a/openssh-config.patch
+++ b/openssh-config.patch
@@ -1,13 +1,5 @@
 --- openssh-4.6p1/sshd_config~ 2007-10-13 01:37:17.000000000 +0200
 +++ openssh-4.6p1/sshd_config  2007-10-13 01:47:12.000000000 +0200
-@@ -11,6 +11,7 @@
- # default value.
- 
- #Port 22
-+Protocol 2
- #Protocol 2,1
- #AddressFamily any
- #ListenAddress 0.0.0.0
 @@ -34,6 +35,7 @@
  
  #LoginGraceTime 2m
@@ -39,17 +31,15 @@
  
  # Set this to 'yes' to enable PAM authentication, account processing, 
  # and session processing. If this is enabled, PAM authentication will 
-@@ -78,8 +79,16 @@
+@@ -89,10 +89,12 @@
+ # If you just want the PAM account and session checks to run without
  # PAM authentication, then enable this but set PasswordAuthentication
  # and ChallengeResponseAuthentication to 'no'.
- #UsePAM no
+-#UsePAM no
 +UsePAM yes
-+
-+# Set this to 'yes' to enable support for chrooted user environment.
-+# You must create such environment before you can use this feature. 
-+#UseChroot yes
  
- #AllowTcpForwarding yes
+ #AllowAgentForwarding yes
+-#AllowTcpForwarding yes
 +# Security advisory:
 +# http://securitytracker.com/alerts/2004/Sep/1011143.html
 +AllowTcpForwarding no
@@ -60,12 +50,23 @@
  # no default banner path
  #Banner /some/path
  
-+# Accept locale-related environment variables
-+AcceptEnv LANG LC_* 
++# Accept locale-related environment variables, also accept some GIT vars
++AcceptEnv LANG LC_* LANGUAGE XMODIFIERS TZ GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
 +
  # override default of no subsystems
  Subsystem     sftp    /usr/libexec/sftp-server
  
+@@ -119,6 +130,10 @@
+ # override default of no subsystems
+ Subsystem     sftp    /usr/libexec/sftp-server
+ 
++# Uncomment this if you want to use .local domain
++#Host *.local
++#     CheckHostIP no
++
+ # Example of overriding settings on a per-user basis
+ #Match User anoncvs
+ #     X11Forwarding no
 --- openssh-4.6p1/ssh_config~  2006-06-13 05:01:10.000000000 +0200
 +++ openssh-4.6p1/ssh_config   2007-10-13 02:00:16.000000000 +0200
 @@ -20,12 +20,15 @@
@@ -85,9 +86,9 @@
  #   CheckHostIP yes
  #   AddressFamily any
 @@ -42,3 +45,19 @@
- #   Tunnel no
- #   TunnelDevice any:any
- #   PermitLocalCommand no
+ #   VisualHostKey no
+ #   ProxyCommand ssh -q -W %h:%p gateway.example.com
+ #   RekeyLimit 1G 1h
 +
 +Host *
 +      GSSAPIAuthentication yes
@@ -102,5 +103,6 @@
 +      ServerAliveInterval 60
 +      ServerAliveCountMax 10
 +      TCPKeepAlive no
-+# Send locale-related environment variables
-+      SendEnv LANG LC_*
++# Send locale-related environment variables, also pass some GIT vars
++      SendEnv LANG LC_* LANGUAGE XMODIFIERS TZ GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
++      HashKnownHosts yes