[108352] trunk/dports/net/openssh/files/GSSAPITrustDNS.patch

[cal at macports.org]

Revision: 108352
          https://trac.macports.org/changeset/108352
Author:   cal at macports.org
Date:     2013-07-20 10:02:50 -0700 (Sat, 20 Jul 2013)
Log Message:
-----------
openssh: refresh patch file

Modified Paths:
--------------
    trunk/dports/net/openssh/files/GSSAPITrustDNS.patch

Modified: trunk/dports/net/openssh/files/GSSAPITrustDNS.patch
===================================================================
--- trunk/dports/net/openssh/files/GSSAPITrustDNS.patch	2013-07-20 16:59:57 UTC (rev 108351)
+++ trunk/dports/net/openssh/files/GSSAPITrustDNS.patch	2013-07-20 17:02:50 UTC (rev 108352)
@@ -1,5 +1,8 @@
---- readconf.c.orig	2012-07-14 14:37:12.000000000 +0300
-+++ readconf.c	2012-07-14 14:46:48.000000000 +0300
+Common subdirectories: ../openssh-6.2p2.orig/contrib and ./contrib
+Common subdirectories: ../openssh-6.2p2.orig/openbsd-compat and ./openbsd-compat
+diff -u ../openssh-6.2p2.orig/readconf.c ./readconf.c
+--- ../openssh-6.2p2.orig/readconf.c	2013-04-05 02:18:58.000000000 +0200
++++ ./readconf.c	2013-07-20 18:58:50.000000000 +0200
 @@ -129,6 +129,7 @@
  	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
  	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
@@ -20,7 +23,7 @@
  #endif
  	{ "fallbacktorsh", oDeprecated },
  	{ "usersh", oDeprecated },
-@@ -487,6 +490,10 @@
+@@ -507,6 +510,10 @@
  		intptr = &options->gss_deleg_creds;
  		goto parse_flag;
  
@@ -31,7 +34,7 @@
  	case oBatchMode:
  		intptr = &options->batch_mode;
  		goto parse_flag;
-@@ -1140,6 +1147,7 @@
+@@ -1159,6 +1166,7 @@
  	options->challenge_response_authentication = -1;
  	options->gss_authentication = -1;
  	options->gss_deleg_creds = -1;
@@ -39,7 +42,7 @@
  	options->password_authentication = -1;
  	options->kbd_interactive_authentication = -1;
  	options->kbd_interactive_devices = NULL;
-@@ -1241,6 +1249,8 @@
+@@ -1260,6 +1268,8 @@
  		options->gss_authentication = 0;
  	if (options->gss_deleg_creds == -1)
  		options->gss_deleg_creds = 0;
@@ -48,8 +51,10 @@
  	if (options->password_authentication == -1)
  		options->password_authentication = 1;
  	if (options->kbd_interactive_authentication == -1)
---- readconf.h.orig	2012-07-14 14:37:12.000000000 +0300
-+++ readconf.h	2012-07-14 14:47:18.000000000 +0300
+Only in .: readconf.c.orig
+diff -u ../openssh-6.2p2.orig/readconf.h ./readconf.h
+--- ../openssh-6.2p2.orig/readconf.h	2013-04-05 02:18:58.000000000 +0200
++++ ./readconf.h	2013-07-20 18:58:50.000000000 +0200
 @@ -49,6 +49,7 @@
  					/* Try S/Key or TIS, authentication. */
  	int     gss_authentication;	/* Try GSS authentication */
@@ -58,9 +63,12 @@
  	int     password_authentication;	/* Try password
  						 * authentication. */
  	int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
---- ssh_config.5.orig	2012-07-14 14:37:39.000000000 +0300
-+++ ssh_config.5	2012-07-14 14:48:57.000000000 +0300
-@@ -531,7 +531,16 @@
+Common subdirectories: ../openssh-6.2p2.orig/regress and ./regress
+Common subdirectories: ../openssh-6.2p2.orig/scard and ./scard
+diff -u ../openssh-6.2p2.orig/ssh_config.5 ./ssh_config.5
+--- ../openssh-6.2p2.orig/ssh_config.5	2013-01-09 06:12:19.000000000 +0100
++++ ./ssh_config.5	2013-07-20 18:58:50.000000000 +0200
+@@ -534,7 +534,16 @@
  Forward (delegate) credentials to the server.
  The default is
  .Dq no .
@@ -78,9 +86,11 @@
  .It Cm HashKnownHosts
  Indicates that
  .Xr ssh 1
---- sshconnect2.c.orig	2012-07-14 14:38:04.000000000 +0300
-+++ sshconnect2.c	2012-07-14 14:51:41.000000000 +0300
-@@ -626,6 +626,12 @@
+Only in .: ssh_config.5.orig
+diff -u ../openssh-6.2p2.orig/sshconnect2.c ./sshconnect2.c
+--- ../openssh-6.2p2.orig/sshconnect2.c	2013-04-05 02:13:31.000000000 +0200
++++ ./sshconnect2.c	2013-07-20 18:58:50.000000000 +0200
+@@ -627,6 +627,12 @@
  	static u_int mech = 0;
  	OM_uint32 min;
  	int ok = 0;
@@ -93,7 +103,7 @@
  
  	/* Try one GSSAPI method at a time, rather than sending them all at
  	 * once. */
-@@ -638,7 +644,7 @@
+@@ -639,7 +645,7 @@
  		/* My DER encoding requires length<128 */
  		if (gss_supported->elements[mech].length < 128 &&
  		    ssh_gssapi_check_mechanism(&gssctxt, 
@@ -102,3 +112,4 @@
  			ok = 1; /* Mechanism works */
  		} else {
  			mech++;
+Only in .: sshconnect2.c.orig
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130720/a1d3e196/attachment.html>