X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fopenssh;h=17772c14db15e5ece45b70065c7c05c7c1a73bd8;hb=80469a89354a686b5fc56066828ed763f81e55a4;hp=f3bf4f5a1783340fe5ce0e7b1ac19e83cd2c2657;hpb=97f224cf55d2c354a614083ce6e084e18c7a87c7;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/openssh b/lfs/openssh
index f3bf4f5a1..17772c14d 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.1p1
+VER        = 6.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 = a62b88b884df0b09b8a8c5789ac9e51b
 
 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 -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 \
@@ -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)