X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fopenssh;h=ab25d6233acbdbc28d6884d1fc5f60c8339053db;hb=251cde3dfc36c03d171dd6532787d7b5202445d3;hp=9e61bd156ce8903b46fde11deb793b2a213fb84a;hpb=f24c9564f015f017b07f8498bbe51edf9ba1c801;p=ipfire-2.x.git

diff --git a/lfs/openssh b/lfs/openssh
index 9e61bd156c..ab25d6233a 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-2016  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        = 4.7p1
+VER        = 7.2p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 50a800fd2c6def9e9a53068837e87b91
+$(DL_FILE)_MD5 = b984775f0cfff1f7ff18b8797fce8a28
 
 install : $(TARGET)
 
@@ -70,9 +70,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(PADLOCK)" "1"
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssh-4.7p1-padlock.patch
-endif
 	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 \
@@ -90,7 +87,14 @@ 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/' \
+	    -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \
+	    -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \
+	    -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \
+	    -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \
+	    -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
 	    /etc/ssh/sshd_config
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)