merge gssapi branch

1 files changed, 5 insertions, 6 deletions

diff --git a/debian/patches/gssapi.patch b/debian/patches/gssapi.patch
index 692437142..112b31fdf 100644
--- a/debian/patches/gssapi.patch
+++ b/debian/patches/gssapi.patch
@@ -137,16 +137,15 @@ Index: b/Makefile.in
 ===================================================================
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -75,7 +75,7 @@
+@@ -74,6 +74,7 @@
+        atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
         monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \
         kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
++       kexgssc.o \
         msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o jpake.o \
--       schnorr.o ssh-pkcs11.o
-+       schnorr.o kexgssc.o ssh-pkcs11.o
+        schnorr.o ssh-pkcs11.o
  
- SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
-        sshconnect.o sshconnect1.o sshconnect2.o mux.o \
-@@ -90,7 +90,7 @@
+@@ -90,7 +91,7 @@
         auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \
         monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \
         auth-krb5.o \