[Lunar-commits] r17455 - moonbase/trunk/crypto/openssh

[Stefan Wold]

Author: ratler
Date: 2005-11-25 12:55:34 +0000 (Fri, 25 Nov 2005)
New Revision: 17455

Added:
   moonbase/trunk/crypto/openssh/CONFIGURE
Modified:
   moonbase/trunk/crypto/openssh/BUILD
   moonbase/trunk/crypto/openssh/DETAILS
Log:
Patch for openssh to fully take advantage of kerberos keytabs as trusted host key

Modified: moonbase/trunk/crypto/openssh/BUILD
===================================================================
--- moonbase/trunk/crypto/openssh/BUILD	2005-11-25 03:30:37 UTC (rev 17454)
+++ moonbase/trunk/crypto/openssh/BUILD	2005-11-25 12:55:34 UTC (rev 17455)
@@ -13,6 +13,9 @@
 
   if echo $OPTS | grep -q -- "--with-kerberos5="; then
     patch_it $SOURCE2 1
+    if [[ "$KEX" == "y" ]]; then 
+    	patch_it $SOURCE3 0
+    fi
   fi &&
 
   OPTS=$OPTS" --sysconfdir=/etc/ssh --with-md5-passwords"                &&

Added: moonbase/trunk/crypto/openssh/CONFIGURE
===================================================================
--- moonbase/trunk/crypto/openssh/CONFIGURE	2005-11-25 03:30:37 UTC (rev 17454)
+++ moonbase/trunk/crypto/openssh/CONFIGURE	2005-11-25 12:55:34 UTC (rev 17455)
@@ -0,0 +1 @@
+mquery KEX "Patch openssh with kex patch (NOT RECOMMENDED)?" n

Modified: moonbase/trunk/crypto/openssh/DETAILS
===================================================================
--- moonbase/trunk/crypto/openssh/DETAILS	2005-11-25 03:30:37 UTC (rev 17454)
+++ moonbase/trunk/crypto/openssh/DETAILS	2005-11-25 12:55:34 UTC (rev 17455)
@@ -1,14 +1,18 @@
           MODULE=openssh
          VERSION=4.2p1
           SOURCE=$MODULE-$VERSION.tar.gz
+         SOURCE2=openssh-4.1p1-heimdal_no_des.patch.gz
+         SOURCE3=openssh-4.2p1-gsskex-20050926-2.patch
    SOURCE_URL[0]=ftp://reflection.ncsa.uiuc.edu/pub/OpenBSD/OpenSSH/portable/
    SOURCE_URL[1]=ftp://ftp3.usa.openbsd.org/pub/OpenBSD/OpenSSH/portable/
    SOURCE_URL[2]=ftp://ftp5.usa.openbsd.org/pub/OpenBSD/OpenSSH/portable/
    SOURCE_URL[3]=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
       SOURCE_VFY=sha1:5e7231cfa8ec673ea856ce291b78fac8b380eb78
-         SOURCE2=openssh-4.1p1-heimdal_no_des.patch.gz
      SOURCE2_URL=$PATCH_URL/
      SOURCE2_VFY=sha1:4b6f185167f6d266f119386527f73aecd02a43d8
+  SOURCE3_URL[0]=http://www.sxw.org.uk/computing/patches/
+  SOURCE3_URL[1]=$PATCH_URL/
+     SOURCE3_VFY=sha1:00f277d052e7f202e7fa8785ee9268946bd48cf2
         WEB_SITE=http://www.openssh.com/
          ENTERED=20010922
          UPDATED=20050901