sshd-keygen: do not exit as failure if restorecon is missing

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

diff --git a/openssh-config.patch b/openssh-config.patch
index e124f108bca35c92b4268fa6f6f4c11b5abaf705..c8140e6417d24b214f58be64e0d0aa683dbe9f49 100644 (file)
--- a/openssh-config.patch
+++ b/openssh-config.patch
@@ -1,14 +1,15 @@
 --- 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
-@@ -34,6 +35,7 @@
+@@ -41,7 +41,7 @@
+ # Authentication:
  
  #LoginGraceTime 2m
- #PermitRootLogin yes
+-#PermitRootLogin prohibit-password
 +PermitRootLogin no
  #StrictModes yes
  #MaxAuthTries 6
- 
-@@ -50,10 +51,13 @@
+ #MaxSessions 10
+@@ -50,10 +51,16 @@
  #IgnoreUserKnownHosts no
  # Don't read the user's ~/.rhosts and ~/.shosts files
  #IgnoreRhosts yes
@@ -19,10 +20,13 @@
  #PermitEmptyPasswords no
 +PasswordAuthentication yes
 +PermitEmptyPasswords no
++
++# Allow DSA keys
++PubkeyAcceptedKeyTypes +ssh-dss
  
  # Change to no to disable s/key passwords
  #ChallengeResponseAuthentication yes
-@@ -66,6 +67,8 @@
+@@ -66,6 +70,8 @@
  # GSSAPI options
  #GSSAPIAuthentication no
  #GSSAPICleanupCredentials yes
@@ -31,7 +35,7 @@
  
  # Set this to 'yes' to enable PAM authentication, account processing, 
  # and session processing. If this is enabled, PAM authentication will 
-@@ -89,10 +89,12 @@
+@@ -89,10 +92,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'.
@@ -46,16 +50,27 @@
  #GatewayPorts no
  #X11Forwarding no
  #X11DisplayOffset 10
-@@ -106,6 +109,9 @@
+@@ -106,6 +112,9 @@
  # no default banner path
  #Banner /some/path
  
-+# Accept locale-related environment variables, also accept GIT vars
-+AcceptEnv LANG LC_* LANGUAGE TZ GIT_*
++# 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 +133,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 @@
@@ -74,10 +89,10 @@
  #   BatchMode no
  #   CheckHostIP yes
  #   AddressFamily any
-@@ -42,3 +45,19 @@
- #   PermitLocalCommand no
+@@ -42,3 +45,22 @@
  #   VisualHostKey no
  #   ProxyCommand ssh -q -W %h:%p gateway.example.com
+ #   RekeyLimit 1G 1h
 +
 +Host *
 +      GSSAPIAuthentication yes
@@ -92,6 +107,9 @@
 +      ServerAliveInterval 60
 +      ServerAliveCountMax 10
 +      TCPKeepAlive no
-+# Send locale-related environment variables, also pass GIT vars
-+      SendEnv LANG LC_* LANGUAGE TZ GIT_*
++      # Allow DSA keys
++#     PubkeyAcceptedKeyTypes +ssh-dss
++#     HostkeyAlgorithms +ssh-dss
++# 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