Merge branch 'seventeen-geoip' into next-guardian-geoip

diff --cc config/cfgroot/general-functions.pl
Simple merge

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 38fc846f2567ce9b41aff28ce4c6ef11ef6001cb,9f77df59bebf7fe9846fbe56bfdfb2473e2b6006..0495222ad19052124cb3ecd9d103e8c391123a28
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -810,10 -815,8 +816,11 @@@ buildipfire() 
    ipfiremake squid-accounting
    ipfiremake pigz
    ipfiremake tmux
+   ipfiremake perl-Text-CSV_XS
    ipfiremake swconfig
 +  ipfiremake haproxy
 +  ipfiremake perl-common-sense
 +  ipfiremake perl-inotify2
  }
  
  buildinstaller() {