X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fopenssh;h=3d4ef2f960431b69d529ec4d27626af66137b9cd;hb=25848b36da1363f46ad85570501e6aff7a3eec1e;hp=ededfab299a495199a330c7a2fe557537a540637;hpb=25414d25eb4b4105f225fa803d62bc758f1f0bee;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/openssh b/lfs/openssh
index ededfab29..3d4ef2f96 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.2p2
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -39,10 +39,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-openssh5.1-dynwindow_noneswitch.diff = $(DL_FROM)/openssh5.1-dynwindow_noneswitch.diff
 
-$(DL_FILE)_MD5 = 03f2d0c1b5ec60d4ac9997a146d2faec
-openssh5.1-dynwindow_noneswitch.diff_MD5 = a3d3deec7369363224d97df658440216
+$(DL_FILE)_MD5 = be46174dcbb77ebb4ea88ef140685de1
 
 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) && patch -Np1 -i $(DIR_DL)/openssh5.1-dynwindow_noneswitch.diff
 	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)