[CUWiN-Dev] patch-sshd_config fails

[Bill Comisky]

The new src/boot-image/patches/patch-sshd_config won't patch cleanly using 
netbsd from ~dyound/radix-nbsd/src.  Maybe a difference between linux and 
netbsd patch?  I get the output below (see attached .rej file):

patching file etc/ssh/sshd_config
Hunk #1 succeeded at 34 with fuzz 2 (offset 1 line).
Hunk #2 FAILED at 79.
1 out of 2 hunks FAILED -- saving rejects to file etc/ssh/sshd_config.rej

I applied manually then generated a patch that works on my build machine, 
see attached.

bill

--
Bill Comisky
bcomisky at pobox.com
-------------- next part --------------
***************
*** 79,85 ****
- #TCPKeepAlive yes
  #UseLogin no
  #UsePrivilegeSeparation yes
- UsePam yes
  #PermitUserEnvironment no
  #Compression yes
  #ClientAliveInterval 0
--- 79,85 ----
+ TCPKeepAlive no
  #UseLogin no
  #UsePrivilegeSeparation yes
+ #UsePam yes
  #PermitUserEnvironment no
  #Compression yes
  #ClientAliveInterval 0
-------------- next part --------------
--- etc/ssh/sshd_config	2004-05-05 14:28:49.000000000 -0500
+++ etc/ssh/sshd_config	2004-11-23 15:26:22.000000000 -0600
@@ -34,7 +34,7 @@
 
 # Slow machines or long keys may require more processing time.
 LoginGraceTime 600
-#PermitRootLogin no
+PermitRootLogin yes
 #StrictModes yes
 #MaxAuthTries 6
 
@@ -76,10 +76,10 @@
 #X11UseLocalhost yes
 #PrintMotd yes
 #PrintLastLog yes
-#TCPKeepAlive yes
+TCPKeepAlive no
 #UseLogin no
 #UsePrivilegeSeparation yes
-UsePam yes
+#UsePam yes
 #PermitUserEnvironment no
 #Compression yes
 #ClientAliveInterval 0