Merge remote-tracking branch 'origin/master' into core124

diff --git a/config/ssh/sshd_config b/config/ssh/sshd_config
index 4a25e83838956d95a0b3d3f907b037f34abda44e..60bb0a9e635dc1797a2417036f8d074fc9415282 100644 (file)
--- a/config/ssh/sshd_config
+++ b/config/ssh/sshd_config
@@ -12,7 +12,7 @@ ListenAddress 0.0.0.0
 
 # limit authentication thresholds
 LoginGraceTime 30s
-MaxAuthTries 3
+MaxAuthTries 6
 
 # limit maximum instanctes to prevent DoS
 MaxStartups 5

diff --git a/lfs/nano b/lfs/nano
index 9783c2917bd4b987cfbed22884713c359192f67f..671cf673130104d5a444666f87c09bfc0230e2b5 100644 (file)
--- a/lfs/nano
+++ b/lfs/nano
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.9.8
+VER        = 3.1
 
 THISAPP    = nano-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nano
-PAK_VER    = 23
+PAK_VER    = 24
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fd58e87c20abbf029e5c4b153c89232a
+$(DL_FILE)_MD5 = 2fb85e86c5b14ac9e9465d3ba7506364
 
 install : $(TARGET)