###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2020 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 #
include Config
-VER = 6.6p1
+VER = 8.4p1
THISAPP = openssh-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3e9800e6bca1fbac0eea4d41baa7f239
+$(DL_FILE)_MD5 = 8f897870404c088e4aa7d1c1c58b526b
install : $(TARGET)
$(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 \
- --with-privsep-path=/var/empty --disable-nls \
- --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/OpenSSH-8.2p1_glibc-2.31_clock_nanosleep_time64.patch
+ 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/' \
- /etc/ssh/sshd_config
+
+ # 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)