openssh: Update to 7.7p1

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

diff --git a/lfs/openssh b/lfs/openssh
index c4dff4d095c8d49f488efb9c4510e1b7799e7495..2db56b09cc3b0631c89a38580a67fb881e3f1358 100644 (file)
--- 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.2p2
+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 = 13009a9156510d8f27e752659075cced
+$(DL_FILE)_MD5 = 68ba883aff6958297432e5877e9a0fe2
 
 install : $(TARGET)
 
@@ -70,31 +70,35 @@ $(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 --sysconfdir=/etc/ssh \
-                   --libexecdir=/usr/lib/openssh --with-md5-passwords \
-                   --with-privsep-path=/var/empty --disable-nls \
-                   --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --sysconfdir=/etc/ssh \
+               --libexecdir=/usr/lib/openssh \
+               --with-md5-passwords \
+               --with-privsep-path=/var/empty \
+               --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        sed -i -e 's/^#\?Port .*$$/Port 222/' \
-           -e 's/^#\?Protocol .*$$/Protocol 2/' \
-           -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \
-           -e 's/^#\?RSAAuthentication .*$$/RSAAuthentication yes/' \
-           -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|' \
-           /etc/ssh/sshd_config
+               -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|' \
+               /etc/ssh/sshd_config
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)