Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next

config/etc/sysctl.conf

@@ -3,19 +3,18 @@ net.ipv4.ip_dynaddr = 1
 net.ipv4.icmp_echo_ignore_broadcasts = 1
 net.ipv4.icmp_ignore_bogus_error_responses = 1
 
-net.ipv4.tcp_sack = 0
-net.ipv4.tcp_timestamps = 0
 net.ipv4.tcp_syncookies = 1
 net.ipv4.tcp_fin_timeout = 30
-net.ipv4.tcp_window_scaling = 0
 net.ipv4.tcp_syn_retries = 3
 net.ipv4.tcp_synack_retries = 3
 
+net.ipv4.conf.default.arp_filter = 1
 net.ipv4.conf.default.rp_filter = 0
 net.ipv4.conf.default.accept_redirects = 0
 net.ipv4.conf.default.accept_source_route = 0
 net.ipv4.conf.default.log_martians = 1
 
+net.ipv4.conf.all.arp_filter = 1
 net.ipv4.conf.all.rp_filter = 0
 net.ipv4.conf.all.accept_redirects = 0
 net.ipv4.conf.all.accept_source_route = 0

config/rootfiles/core/50/filelists/files

@@ -1,3 +1,4 @@
+etc/sysctl.conf
 etc/system-release
 var/ipfire/langs/
 etc/rc.d/init.d/console

langs/pl/install/lang_pl.c

@@ -1,5 +1,5 @@
 /*
- * English (en) Data File
+ * Polish (pl) Data File
  *
  * This file is part of the IPFire.
  * 
@@ -19,10 +19,6 @@
  * 
  * (c) IPFire Team  <info@ipfire.org>
  *
- * based on work of SmoothWall and IPCop
- *
- * (c) The SmoothWall Team
- *  
  */
  
 #include "libsmooth.h"