X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fopenssh;h=9d551f19889593c0f7e3e893ed637f0f2894416a;hb=701c891b40dc7e115f7359b26babab86ba36602c;hp=20a5dc1156d34f1a3dc47a27c01512c3d2499e76;hpb=2723ef8721862b9d9565346bae8115773123e53e;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/openssh b/lfs/openssh
index 20a5dc1156..9d551f1988 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  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        = 7.4p1
+VER        = 7.7p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b2db2a83caf66a208bb78d6d287cdaa3
+$(DL_FILE)_MD5 = 68ba883aff6958297432e5877e9a0fe2
 
 install : $(TARGET)
 
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssh-7.7p1-openssl-1.1.0-1.patch
 	cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
@@ -81,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	sed -i -e 's/^#\?Port .*$$/Port 222/' \
+	sed -i -e 's/^#\?Port .*$$/Port 22/' \
 		-e 's/^#\?Protocol .*$$/Protocol 2/' \
 		-e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \
 		-e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \