Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen-geoip

Conflicts:
	make.sh

diff --cc config/firewall/rules.pl
index 834e248716fc3cb1e91f8a8c4a4eed1808176a14,97b8897af87bba6f84ec2e961e3bbb62849a17ef..cd2f3a63590cb2428d7ba9e0fbcbc7f3bf4fa22e
mode 100644,100755..100644
--- 1/config/firewall/rules.pl
--- 2/config/firewall/rules.pl
+++ b/config/firewall/rules.pl

diff --cc config/rootfiles/common/stage2
index cbfde185c8d69c0d69ef8fe0e5ec6bbfe4730922,663aef57aed0bfc25dba38bbe6777ea8921fb9f8..4e8b750c8b645c9617087593e541687e4014ca4f
--- 1/config/rootfiles/common/stage2
--- 2/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@@ -136,9 -143,7 +143,8 @@@ usr/share/doc/licenses/GPLv
  #usr/share/man/man8
  #usr/share/misc
  #usr/share/terminfo
 +#usr/share/xt_geoip
  #usr/share/zoneinfo
- run
  #var
  #var/cache
  var/empty

diff --cc lfs/stage2
Simple merge

diff --cc make.sh
index d4899f9a370353132b6a1d776a15d37c0ec5fced,92edf78ceaa4d76a8a36809061cc731448bc896c..9f77df59bebf7fe9846fbe56bfdfb2473e2b6006
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -431,8 -428,8 +433,9 @@@ buildipfire() 
        armv5tel)
                # arm-rpi (Raspberry Pi) kernel build
                ipfiremake linux                        KCFG="-rpi"
+               ipfiremake backports                    KCFG="-rpi"
                ipfiremake cryptodev                    KCFG="-rpi"
 +              ipfiremake xtables-addons               KCFG="-rpi"
                ipfiremake linux-initrd                 KCFG="-rpi"
  
                # arm multi platform (Panda, Wandboard ...) kernel build
@@@ -810,7 -809,7 +815,8 @@@
    ipfiremake squid-accounting
    ipfiremake pigz
    ipfiremake tmux
 +  ipfiremake perl-Text-CSV_XS
+   ipfiremake swconfig
  }
  
  buildinstaller() {