Merge branch 'seventeen-geoip' into next-geoip

diff --cc config/firewall/rules.pl
index 8abc675f7f6f8d5693598ade0523748a5b20f20d,a12ab56670f92342527cc4748349fc0301cbde2e..fa7edee1bec2fb36645c144dc1bc77fd054ed937
mode 100755,100644..100644
--- 1/config/firewall/rules.pl
--- 2/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@@ -102,13 -95,11 +103,16 @@@ sub main 
        # Load P2P block rules.
        &p2pblock();
  
+       # Load GeoIP block rules.
+       &geoipblock();
+ 
        # Reload firewall policy.
        run("/usr/sbin/firewall-policy");
 +
 +      #Reload firewall.local if present
 +      if ( -f '/etc/sysconfig/firewall.local'){
 +              run("/etc/sysconfig/firewall.local reload");
 +      }
  }
  
  sub run {

diff --cc config/rootfiles/common/stage2
Simple merge

diff --cc html/cgi-bin/firewall.cgi
Simple merge

diff --cc html/cgi-bin/fwhosts.cgi
Simple merge

diff --cc langs/en/cgi-bin/en.pl
Simple merge

diff --cc make.sh
index 7d41b591c27ed551fbbd9ccd5dcea31345014005,9f77df59bebf7fe9846fbe56bfdfb2473e2b6006..395c21f2d7a524e76c43640b4ca6cb10657b51ac
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -810,8 -815,8 +816,9 @@@ buildipfire() 
    ipfiremake squid-accounting
    ipfiremake pigz
    ipfiremake tmux
+   ipfiremake perl-Text-CSV_XS
    ipfiremake swconfig
 +  ipfiremake haproxy
  }
  
  buildinstaller() {