From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 15 Mar 2015 10:38:45 +0000 (+0100)
Subject: Merge branch 'seventeen-geoip' into next-geoip
X-Git-Tag: v2.17-core91~128^2~6^2~12
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=93bfe63d55bf611887fbc25c251c6fb0ce2ab1d4

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

93bfe63d55bf611887fbc25c251c6fb0ce2ab1d4
diff --cc config/firewall/rules.pl
index 8abc675f7f,a12ab56670..fa7edee1be
mode 100755,100644..100644
--- a/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 make.sh
index 7d41b591c2,9f77df59be..395c21f2d7
--- a/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() {