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

config/httpd/server-tuning.conf

@@ -20,7 +20,7 @@ KeepAliveTimeout 15
 MinSpareServers 1
 MaxSpareServers 10
 StartServers 2
-MaxClients 1000
+MaxClients 256
 
 #
 # The following directives modify normal HTTP response behavior to

config/rootfiles/core/110/update.sh

@@ -44,6 +44,9 @@ ldconfig
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
+# Remove deprecated options
+sed -e "/^RSAAuthentication/d" -i /etc/ssh/sshd_config
+
 # Start services
 /etc/init.d/unbound start
 /etc/init.d/sshd restart

lfs/openssh

@@ -80,7 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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/' \