kernel: disable grsecurity for i586 because it fails to build

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

diff --git a/lfs/openssh b/lfs/openssh
index 013dffacd5a0ea9b45a5131830414a3d67f28a1e..371d0df4ac09c4106f761886fa4e3f6107bd2265 100644 (file)
--- 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        = 5.1p1
+VER        = 7.3p1
 
 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)
-openssh-5.1p1-hpn13v5.diff = $(DL_FROM)/openssh-5.1p1-hpn13v5.diff
 
-$(DL_FILE)_MD5 = 03f2d0c1b5ec60d4ac9997a146d2faec
-openssh-5.1p1-hpn13v5.diff_MD5 = a3d3deec7369363224d97df658440216
+$(DL_FILE)_MD5 = dfadd9f035d38ce5d58a3bf130b86d08
 
 install : $(TARGET)
 
@@ -72,10 +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) && patch -Np1 -i $(DIR_DL)/openssh-5.1p1-hpn13v5.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,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)