[Lunar-commits] <moonbase> openssh: Update to 5.0p1.

[Moritz Heiber]

commit 2738222a1bae9c424f71e1ff12d78ced9eee0611
Author: Moritz Heiber <moe at lunar-linux.org>
Date:   Fri Apr 4 10:32:17 2008 +0200

    openssh: Update to 5.0p1.
    
    Patch 2 is commented out since there is no newer version yet. I confirmed
    with Ratler about it. Whipped up a new patch for the first one. Tested.
---
 crypto/openssh/BUILD     |    6 +++---
 crypto/openssh/CONFIGURE |    1 -
 crypto/openssh/DEPENDS   |   10 +++++-----
 crypto/openssh/DETAILS   |   16 ++++++++--------
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/crypto/openssh/BUILD b/crypto/openssh/BUILD
index 0b0de3a..40c47fd 100644
--- a/crypto/openssh/BUILD
+++ b/crypto/openssh/BUILD
@@ -13,9 +13,9 @@
 
   if echo $OPTS | grep -q -- "--with-kerberos5="; then
     patch_it $SOURCE2 1
-    if [[ "$KEX" == "y" ]]; then 
-        patch_it $SOURCE3 0
-    fi
+#    if [[ "$KEX" == "y" ]]; then 
+#        patch_it $SOURCE3 0
+#    fi
   fi &&
 
   OPTS=$OPTS" --sysconfdir=/etc/ssh --with-md5-passwords"                &&
diff --git a/crypto/openssh/CONFIGURE b/crypto/openssh/CONFIGURE
deleted file mode 100644
index 8c5a8a3..0000000
--- a/crypto/openssh/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-mquery KEX "Patch openssh with kex patch (NOT RECOMMENDED)?" n
diff --git a/crypto/openssh/DEPENDS b/crypto/openssh/DEPENDS
index a511f0b..8da819f 100644
--- a/crypto/openssh/DEPENDS
+++ b/crypto/openssh/DEPENDS
@@ -3,17 +3,17 @@ depends  openssl                  &&
 depends  coreutils                &&
 depends  psmisc                   &&
 
-optional_depends  "tcp_wrappers"         \
-                  "--with-tcp-wrappers"  \
-                  ""                     \
-                  "for an optional method of controlling ssh access."  &&
+optional_depends "tcp_wrappers"         \
+                 "--with-tcp-wrappers"  \
+                 ""                     \
+                 "for an optional method of controlling ssh access."  &&
 
 optional_depends "Linux-PAM"             \
                  "--with-pam"            \
                  "--without-pam"         \
                  "for Linux PAM support"  &&
 
-optional_depends heimdal \
+optional_depends "heimdal" \
                  "--with-kerberos5=/usr" \
                  "" \
                  "Heimdal Kerberos5/GSSAPI Support"
diff --git a/crypto/openssh/DETAILS b/crypto/openssh/DETAILS
index aced58e..e73d9a0 100644
--- a/crypto/openssh/DETAILS
+++ b/crypto/openssh/DETAILS
@@ -1,18 +1,18 @@
           MODULE=openssh
-         VERSION=4.7p1
+         VERSION=5.0p1
           SOURCE=$MODULE-$VERSION.tar.gz
-         SOURCE2=openssh-4.1p1-heimdal_no_des.patch.gz
-         SOURCE3=openssh-4.7p1-gsskex-20070927.patch
+         SOURCE2=openssh-${VERSION}-heimdal_no_des.patch.gz
+#         SOURCE3=openssh-4.7p1-gsskex-20070927.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:58357db9e64ba6382bef3d73d1d386fcdc0508f4
+      SOURCE_VFY=sha1:121cea3a730c0b0353334b6f46f438de30ab4928
      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:d40a827416bf6a45f6ea5ba49e12f511d02b7e2e
+     SOURCE2_VFY=sha1:88a83441c9f70fe26f700a9bec6b74a2d073b002
+#  SOURCE3_URL[0]=http://www.sxw.org.uk/computing/patches/
+#  SOURCE3_URL[1]=$PATCH_URL
+#     SOURCE3_VFY=sha1:d40a827416bf6a45f6ea5ba49e12f511d02b7e2e
         WEB_SITE=http://www.openssh.com/
          ENTERED=20010922
          UPDATED=20070912