Zwischencommit fuer LFS.

[ipfire-2.x.git] / lfs / openssh

diff --git a/lfs/openssh b/lfs/openssh
index b9db94f86df563a6b5599b61891bc8d9eac7753b..6c346321456d5ca06d8d778b672c743569616422 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: openssh,v 1.7.2.5 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 3.9p1
+VER        = 4.3p2
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8e1774d0b52aff08f817f3987442a16e
+$(DL_FILE)_MD5 = 7e9880ac20a9b9db0d3fea30a9ff3d46
 
 install : $(TARGET)
 
@@ -78,13 +72,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --sysconfdir=/etc/ssh --disable-nls \
-           --prefix=/usr --target=$(MACHINE) \
-           --with-privsep-path=/var/empty \
-           --with-ipv4-default \
-           --with-default-path=/bin:/usr/bin \
-           --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
-       cd $(DIR_APP) && make -j 3
+       cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure
+       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/ssh \
+                   --libexecdir=/usr/lib/openssh --with-md5-passwords \
+                   --with-privsep-path=/var/empty --disable-nls \
+                   --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        sed -i -e 's/^#\?Port .*$$/Port 222/' \
            -e 's/^#\?Protocol .*$$/Protocol 2/' \