From 467db274dc81e0cd9bc860593ad75c4ca6709a61 Mon Sep 17 00:00:00 2001
From: Simon Schubert <corecode@dragonflybsd.org>
Date: Thu, 16 Jun 2005 08:14:02 +0000
Subject: [PATCH] Add notes how to get xauth forwarding going with pkgsrc

---
 secure/usr.bin/ssh/ssh_config.no_obj.patch    | 16 ++++++++---
 secure/usr.sbin/sshd/sshd_config.no_obj.patch | 27 ++++++++++++++-----
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/secure/usr.bin/ssh/ssh_config.no_obj.patch b/secure/usr.bin/ssh/ssh_config.no_obj.patch
index 1bc0392afc..18bfd7d581 100644
--- a/secure/usr.bin/ssh/ssh_config.no_obj.patch
+++ b/secure/usr.bin/ssh/ssh_config.no_obj.patch
@@ -1,6 +1,11 @@
-$DragonFly: src/secure/usr.bin/ssh/Attic/ssh_config.no_obj.patch,v 1.1 2004/07/31 20:05:00 geekgod Exp $
---- ssh_config.orig	2003-08-13 12:37:05.000000000 +0200
-+++ ssh_config	2004-07-23 13:16:14.000000000 +0200
+$DragonFly: src/secure/usr.bin/ssh/Attic/ssh_config.no_obj.patch,v 1.2 2005/06/16 08:14:02 corecode Exp $
+Index: ssh_config
+===================================================================
+RCS file: /space/cvs/dragonfly/src/crypto/openssh-3.9p1/ssh_config,v
+retrieving revision 1.1
+diff -u -r1.1 ssh_config
+--- ssh_config	30 Aug 2004 21:59:58 -0000	1.1
++++ ssh_config	16 Jun 2005 08:08:13 -0000
 @@ -23,7 +23,7 @@
  #   PasswordAuthentication yes
  #   HostbasedAuthentication no
@@ -10,8 +15,11 @@ $DragonFly: src/secure/usr.bin/ssh/Attic/ssh_config.no_obj.patch,v 1.1 2004/07/3
  #   AddressFamily any
  #   ConnectTimeout 0
  #   StrictHostKeyChecking ask
-@@ -35,3 +35,4 @@
+@@ -35,3 +35,7 @@
  #   Cipher 3des
  #   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
  #   EscapeChar ~
 +#   VersionAddendum DragonFly-20040710
++
++#   XAuthLocation /usr/X11R6/bin/xauth		# default ports/dfports
++#   XAuthLocation /usr/pkg/xorg/bin/xauth	# location for pkgsrc
diff --git a/secure/usr.sbin/sshd/sshd_config.no_obj.patch b/secure/usr.sbin/sshd/sshd_config.no_obj.patch
index 4a65f755ea..1018e5cf0a 100644
--- a/secure/usr.sbin/sshd/sshd_config.no_obj.patch
+++ b/secure/usr.sbin/sshd/sshd_config.no_obj.patch
@@ -1,6 +1,11 @@
-$DragonFly: src/secure/usr.sbin/sshd/Attic/sshd_config.no_obj.patch,v 1.1 2004/07/31 20:05:00 geekgod Exp $
---- sshd_config.orig	2004-07-23 14:26:51.000000000 +0200
-+++ sshd_config	2004-07-23 14:25:05.000000000 +0200
+$DragonFly: src/secure/usr.sbin/sshd/Attic/sshd_config.no_obj.patch,v 1.2 2005/06/16 08:14:02 corecode Exp $
+Index: sshd_config
+===================================================================
+RCS file: /space/cvs/dragonfly/src/crypto/openssh-3.9p1/sshd_config,v
+retrieving revision 1.1
+diff -u -r1.1 sshd_config
+--- sshd_config	30 Aug 2004 21:59:58 -0000	1.1
++++ sshd_config	16 Jun 2005 08:11:07 -0000
 @@ -10,15 +10,19 @@
  # possible, but leave them commented.  Uncommented options change a
  # default value.
@@ -30,9 +35,9 @@ $DragonFly: src/secure/usr.sbin/sshd/Attic/sshd_config.no_obj.patch,v 1.1 2004/0
 -#PermitRootLogin yes
 +#PermitRootLogin no
  #StrictModes yes
+ #MaxAuthTries 6
  
- #RSAAuthentication yes
-@@ -54,7 +58,7 @@
+@@ -55,7 +59,7 @@
  #PasswordAuthentication yes
  #PermitEmptyPasswords no
  
@@ -41,7 +46,7 @@ $DragonFly: src/secure/usr.sbin/sshd/Attic/sshd_config.no_obj.patch,v 1.1 2004/0
  #ChallengeResponseAuthentication yes
  
  # Kerberos options
-@@ -74,7 +78,7 @@
+@@ -80,7 +84,7 @@
  
  #AllowTcpForwarding yes
  #GatewayPorts no
@@ -50,3 +55,13 @@ $DragonFly: src/secure/usr.sbin/sshd/Attic/sshd_config.no_obj.patch,v 1.1 2004/0
  #X11DisplayOffset 10
  #X11UseLocalhost yes
  #PrintMotd yes
+@@ -96,6 +100,9 @@
+ #PidFile /var/run/sshd.pid
+ #MaxStartups 10
+ 
++#XAuthLocation /usr/X11R6/bin/xauth		# default ports/dfports
++#XAuthLocation /usr/pkg/xorg/bin/xauth		# localtion for pkgsrc
++
+ # no default banner path
+ #Banner /some/path
+ 
-- 
2.32.0