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

[Jerry Lundström]

Author: prox
Date: 2005-05-30 11:55:04 +0000 (Mon, 30 May 2005)
New Revision: 15168

Modified:
   moonbase/trunk/crypto/openssh/BUILD
   moonbase/trunk/crypto/openssh/DETAILS
Log:
remove -ldes if heimdal selected, des isnt supplied anymore and its being removed everywhere, guess openssh hasnt caught up yet.

Modified: moonbase/trunk/crypto/openssh/BUILD
===================================================================
--- moonbase/trunk/crypto/openssh/BUILD	2005-05-30 07:49:36 UTC (rev 15167)
+++ moonbase/trunk/crypto/openssh/BUILD	2005-05-30 11:55:04 UTC (rev 15168)
@@ -8,6 +8,10 @@
 
   add_priv_user sshd:sshd                                                &&
 
+  if echo $OPTS | grep -q -- "--with-kerberos5="; then
+    patch_it $SOURCE2 1
+  fi &&
+
   OPTS=$OPTS" --sysconfdir=/etc/ssh --with-md5-passwords"                &&
   default_build                                                          &&
   if [ ! -f /etc/ssh/Makefile ] ; then

Modified: moonbase/trunk/crypto/openssh/DETAILS
===================================================================
--- moonbase/trunk/crypto/openssh/DETAILS	2005-05-30 07:49:36 UTC (rev 15167)
+++ moonbase/trunk/crypto/openssh/DETAILS	2005-05-30 11:55:04 UTC (rev 15168)
@@ -6,6 +6,9 @@
    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:e85d389da8ad8290f5031b8f9972e2623c674e46
+         SOURCE2=openssh-4.1p1-heimdal_no_des.patch.gz
+     SOURCE2_URL=$PATCH_URL/
+     SOURCE2_VFY=sha1:4b6f185167f6d266f119386527f73aecd02a43d8
         WEB_SITE=http://www.openssh.com/
          ENTERED=20010922
          UPDATED=20050527