openssh: Update to 7.0p1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/94/filelists/openssh b/config/rootfiles/core/94/filelists/openssh
new file mode 120000 (symlink)
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/94/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file

diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh
index e679ecfffd06628bc6b2cd97167da529a09ad02a..38ca3316a49f73eeb2f109a887c287533315f9d3 100644 (file)
--- a/config/rootfiles/core/94/update.sh
+++ b/config/rootfiles/core/94/update.sh
@@ -32,6 +32,7 @@ do
 done
 
 # Stop services
+/etc/init.d/sshd stop
 
 # Extract files
 extract_files
@@ -39,7 +40,12 @@ extract_files
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
+# Update SSH configuration
+sed -i /etc/ssh/sshd_config \
+       -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/'
+
 # Start services
+/etc/init.d/sshd start
 
 # This update need a reboot...
 #touch /var/run/need_reboot

diff --git a/lfs/openssh b/lfs/openssh
index 7e6e3764152c30b6a8badca9a76114085ab74a10..ef70f2068e91a12375997e6dc3cac045792ffa10 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 6.8p1
+VER        = 7.0p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 08f72de6751acfbd0892b5f003922701
+$(DL_FILE)_MD5 = 831883f251ac34f0ab9c812acc24ee69
 
 install : $(TARGET)
 
@@ -90,6 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
            -e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \
            -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
            -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
+           -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \
            /etc/ssh/sshd_config
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)