slang: revert parallelized build

[ipfire-2.x.git] / lfs / openssh

diff --git a/lfs/openssh b/lfs/openssh
index 9d551f19889593c0f7e3e893ed637f0f2894416a..7fbb5a9288cb552329baf5b13dcbe27d1a4feba6 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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.7p1
+VER        = 7.9p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 68ba883aff6958297432e5877e9a0fe2
+$(DL_FILE)_MD5 = c6af50b7a474d04726a5aa747a5dce8f
 
 install : $(TARGET)
 
@@ -70,7 +70,6 @@ $(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 \
@@ -82,23 +81,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       sed -i -e 's/^#\?Port .*$$/Port 22/' \
-               -e 's/^#\?Protocol .*$$/Protocol 2/' \
-               -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \
-               -e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \
-               -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication yes/' \
-               -e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \
-               -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|' \
+
+       # install custom OpenSSH server configuration
+       install -v -m 644 $(DIR_SRC)/config/ssh/sshd_config \
                /etc/ssh/sshd_config
+
+       # install custom OpenSSH client configuration
+       install -v -m 644 $(DIR_SRC)/config/ssh/ssh_config \
+               /etc/ssh/ssh_config
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)