X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fopenssh;h=ffcf476818a914b8a4c2d63a827d5c7d9e07760b;hb=0dcb85e89ef1c6aa6c55cc0f4528f4d57f31226f;hp=59172fc73dfefd5cd589668c6f71a527c2901ef9;hpb=6f5bb9b8bd28554660c07d5ace25bf1e7cb21126;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/openssh b/lfs/openssh
index 59172fc73d..ffcf476818 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.1p1
+VER        = 5.4p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -36,13 +36,11 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) openssh5.1-dynwindow_noneswitch.diff.gz
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-openssh5.1-dynwindow_noneswitch.diff.gz = $(DL_FROM)/openssh5.1-dynwindow_noneswitch.diff.gz
 
-$(DL_FILE)_MD5 = 03f2d0c1b5ec60d4ac9997a146d2faec
-openssh5.1-dynwindow_noneswitch.diff.gz_MD5 = 6b6ef30f4fefc462f61df57dd6ae8756
+$(DL_FILE)_MD5 = da10af8a789fa2e83e3635f3a1b76f5e
 
 install : $(TARGET)
 
@@ -75,7 +73,6 @@ $(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 $(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 \
@@ -93,6 +90,8 @@ endif
 	    -e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \
 	    -e 's/^#\?UsePAM .*$$//' \
 	    -e 's/^#\?X11Forwarding .*$$/X11Forwarding no/' \
+	    -e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \
+	    -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
 	    -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
 	    /etc/ssh/sshd_config
 	@rm -rf $(DIR_APP)