Fix openssh patch part II

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

diff --git a/lfs/openssh b/lfs/openssh
index 9e61bd156ce8903b46fde11deb793b2a213fb84a..f3bf4f5a1783340fe5ce0e7b1ac19e83cd2c2657 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.7p1
+VER        = 5.1p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -36,11 +36,13 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) openssh5.1-dynwindow_noneswitch.diff.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+openssh5.1-dynwindow_noneswitch.diff.gz = $(DL_FROM)/openssh5.1-dynwindow_noneswitch.diff.gz
 
-$(DL_FILE)_MD5 = 50a800fd2c6def9e9a53068837e87b91
+$(DL_FILE)_MD5 = 03f2d0c1b5ec60d4ac9997a146d2faec
+openssh5.1-dynwindow_noneswitch.diff.gz_MD5 = 6b6ef30f4fefc462f61df57dd6ae8756
 
 install : $(TARGET)
 
@@ -73,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifeq "$(PADLOCK)" "1"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssh-4.7p1-padlock.patch
 endif
+       cd $(DIR_APP) && gzip -d -c $(DIR_DL)/openssh5.1-dynwindow_noneswitch.diff.gz | patch -Np1
        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 \