Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

Conflicts:
	make.sh

diff --combined config/rootfiles/common/initscripts
index 87da362db51c8aef675796253cf57c0399755e4f,1d6194983d276369881ca1cb4bbe16c11c7e2b55..8370f3f323262c31eda2a40115b1f0eeff6f7fcd
--- 1/config/rootfiles/common/initscripts
--- 2/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@@ -15,6 -15,7 +15,7 @@@ etc/rc.d/init.d/checkf
  etc/rc.d/init.d/checkfstab
  #etc/rc.d/init.d/clamav
  etc/rc.d/init.d/cleanfs
+ #etc/rc.d/init.d/client175
  etc/rc.d/init.d/collectd
  etc/rc.d/init.d/connectd
  etc/rc.d/init.d/console
@@@ -27,6 -28,7 +28,7 @@@ etc/rc.d/init.d/dnsmas
  etc/rc.d/init.d/fcron
  #etc/rc.d/init.d/fetchmail
  etc/rc.d/init.d/firewall
+ etc/rc.d/init.d/firstsetup
  etc/rc.d/init.d/functions
  #etc/rc.d/init.d/gnump3d
  etc/rc.d/init.d/halt
@@@ -44,7 -46,6 +46,7 @@@ etc/rc.d/init.d/mISD
  #etc/rc.d/init.d/mediatomb
  #etc/rc.d/init.d/messagebus
  #etc/rc.d/init.d/miau
 +#etc/rc.d/init.d/miniupnpd
  #etc/rc.d/init.d/mldonkey
  etc/rc.d/init.d/modules
  #etc/rc.d/init.d/motion
@@@ -64,13 -65,11 +66,13 @@@ etc/rc.d/init.d/networking/re
  #etc/rc.d/init.d/networking/red.down
  etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
  etc/rc.d/init.d/networking/red.down/10-ipsec
 +etc/rc.d/init.d/networking/red.down/10-miniupnpd
  etc/rc.d/init.d/networking/red.down/10-ovpn
  etc/rc.d/init.d/networking/red.down/20-RL-firewall
  etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
  #etc/rc.d/init.d/networking/red.up
  etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
 +etc/rc.d/init.d/networking/red.up/10-miniupnpd
  etc/rc.d/init.d/networking/red.up/10-multicast
  etc/rc.d/init.d/networking/red.up/20-RL-firewall
  etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl
@@@ -130,6 -129,7 +132,7 @@@ etc/rc.d/init.d/upnp
  etc/rc.d/rc0.d/K08fcron
  etc/rc.d/rc0.d/K28apache
  etc/rc.d/rc0.d/K30sshd
+ #etc/rc.d/rc0.d/K34client175
  etc/rc.d/rc0.d/K45random
  etc/rc.d/rc0.d/K49cyrus-sasl
  etc/rc.d/rc0.d/K78snort
@@@ -159,6 -159,7 +162,7 @@@ etc/rc.d/rc3.d/S25rando
  etc/rc.d/rc3.d/S30sshd
  etc/rc.d/rc3.d/S32apache
  etc/rc.d/rc3.d/S40fcron
+ #etc/rc.d/rc3.d/S66client175
  #etc/rc.d/rc3.d/S98mediatomb
  etc/rc.d/rc3.d/S98rc.local
  #etc/rc.d/rc3.d/S98sslh
@@@ -175,6 -176,7 +179,7 @@@ etc/rc.d/rc3.d/S99bee
  etc/rc.d/rc6.d/K08fcron
  etc/rc.d/rc6.d/K28apache
  etc/rc.d/rc6.d/K30sshd
+ #etc/rc.d/rc6.d/K34client175
  etc/rc.d/rc6.d/K45random
  etc/rc.d/rc6.d/K49cyrus-sasl
  etc/rc.d/rc6.d/K78snort
@@@ -202,6 -204,7 +207,7 @@@ etc/rc.d/rcsysinit.d/S45udev_retr
  etc/rc.d/rcsysinit.d/S50cleanfs
  etc/rc.d/rcsysinit.d/S60setclock
  etc/rc.d/rcsysinit.d/S70console
+ etc/rc.d/rcsysinit.d/S75firstsetup
  etc/rc.d/rcsysinit.d/S80localnet
  etc/rc.d/rcsysinit.d/S90sysctl
  #etc/sysconfig
@@@ -210,3 -213,4 +216,3 @@@ etc/sysconfig/firewall.loca
  etc/sysconfig/modules
  etc/sysconfig/rc
  etc/sysconfig/rc.local
 -etc/init.d

diff --combined config/rootfiles/core/43/filelists/files
index 995b690700903b151d24a3d48c03c26133223148,eb3c9517ec5ed2bf72776cee588bf735a7d97665..49c6586bb6f7b68da7cc8abc54b06d3dc5c6e37d
--- 1/config/rootfiles/core/43/filelists/files
--- 2/config/rootfiles/core/43/filelists/files
+++ b/config/rootfiles/core/43/filelists/files
@@@ -1,2 -1,11 +1,12 @@@
 +etc/init.d/firewall
  etc/system-release
+ etc/rc.d/init.d/checkfs
+ etc/rc.d/init.d/checkfstab
+ etc/rc.d/init.d/squid
+ srv/web/ipfire/cgi-bin/proxy.cgi
+ srv/web/ipfire/cgi-bin/speed.cgi
+ srv/web/ipfire/cgi-bin/vpnmain.cgi
+ srv/web/ipfire/html/images/urlfilter/copy.gif
+ var/ipfire/general-functions.pl
+ usr/local/bin/rebuild-initrd
+ usr/bin/ldd

diff --combined make.sh
index fa13d0d796050a4c70a37f7e346e3d8e01a04757,d9abd2a4746d416499e8b67996cfa95001263c02..a3671e9e5abfdfb0a9f9ed97a27d68329e166484
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,7 -24,7 +24,7 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
- VERSION="2.7"                                                 # Version number
+ VERSION="2.8test"                                             # Version number
  CORE="43"                                                     # Core Level (Filename)
  PAKFIRE_CORE="42"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
@@@ -37,7 -37,7 +37,7 @@@ KVER=`grep --max-count=1 VER lfs/linux 
  MACHINE=`uname -m`
  GIT_TAG=$(git tag | tail -1)                                  # Git Tag
  GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)        # Last commit
- TOOLCHAINVER=3
+ TOOLCHAINVER=1
  IPFVER="full"                         # Which versions should be compiled? (full|devel)
  
  BUILDMACHINE=$MACHINE
@@@ -234,9 -234,12 +234,12 @@@ prepareenv() 
  }
  
  buildtoolchain() {
-     if [ "$MACHINE" = "x86_64" ]; then
+     if [ "$(uname -m)" = "x86_64" ]; then
          exiterror "Cannot build toolchain on x86_64. Please use the download."
      fi
+     if [ "$(uname -r | grep ipfire)" ]; then
+         exiterror "Cannot build toolchain on ipfire. Please use the download."
+     fi
  
      LOGFILE="$BASEDIR/log/_build.toolchain.log"
      export LOGFILE
@@@ -324,7 -327,6 +327,6 @@@ buildbase() 
      lfsmake2 man
      lfsmake2 mktemp
      lfsmake2 module-init-tools
-     lfsmake2 mtd
      lfsmake2 net-tools
      lfsmake2 patch
      lfsmake2 psmisc
@@@ -369,6 -371,22 +371,22 @@@ buildipfire() 
    ipfiremake e1000                    XEN=1
    ipfiremake e1000e                   XEN=1
    ipfiremake igb                      XEN=1
+   ipfiremake linux                    PAE=1
+   ipfiremake kqemu                    PAE=1
+   ipfiremake kvm-kmod                 PAE=1
+   ipfiremake v4l-dvb                  PAE=1
+   ipfiremake madwifi                  PAE=1
+   ipfiremake alsa                     PAE=1 KMOD=1
+   ipfiremake mISDN                    PAE=1
+   ipfiremake dahdi                    PAE=1 KMOD=1
+   ipfiremake cryptodev                        PAE=1
+   ipfiremake compat-wireless          PAE=1
+   ipfiremake r8169                    PAE=1
+   ipfiremake r8168                    PAE=1
+   ipfiremake r8101                    PAE=1
+   ipfiremake e1000                    PAE=1
+   ipfiremake e1000e                   PAE=1
+   ipfiremake igb                      PAE=1
    ipfiremake linux
    ipfiremake kqemu
    ipfiremake kvm-kmod
@@@ -388,9 -406,10 +406,10 @@@
    ipfiremake pkg-config
    ipfiremake linux-atm
    ipfiremake cpio
-   ipfiremake klibc
-   ipfiremake mkinitcpio
-   ipfiremake udev                     KLIBC=1
+ 
+   installmake strip
+ 
+   ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
    ipfiremake gmp
@@@ -411,6 -430,7 +430,7 @@@
    ipfiremake pcre
    ipfiremake slang
    ipfiremake newt
+   ipfiremake attr
    ipfiremake libcap
    ipfiremake pciutils
    ipfiremake usbutils
@@@ -429,7 -449,6 +449,6 @@@
    ipfiremake cdrtools
    ipfiremake dnsmasq
    ipfiremake dosfstools
-   ipfiremake squashfstools
    ipfiremake reiserfsprogs
    ipfiremake xfsprogs
    ipfiremake sysfsutils
@@@ -652,14 -671,16 +671,17 @@@
    ipfiremake asterisk
    ipfiremake lcr
    ipfiremake usb_modeswitch
+   ipfiremake usb_modeswitch_data
    ipfiremake zerofree
    ipfiremake mdadm
    ipfiremake eject
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
+   ipfiremake tcl
    ipfiremake imspector
 +  ipfiremake miniupnpd
+   ipfiremake client175
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild
@@@ -683,34 -704,10 +705,10 @@@ buildinstaller() 
    ipfiremake as86
    ipfiremake mbr
    ipfiremake memtest
-   installmake linux-libc-header
-   installmake binutils
-   ipfiremake uClibc                   PASS=1
-   ipfiremake gcc                      INST=1
-   installmake uClibc                  PASS=2
-   installmake gcc                     INST=2
-   installmake uClibc                  PASS=3
-   installmake busybox
-   installmake udev
-   installmake slang
-   installmake newt
-   installmake gettext
-   installmake kbd
-   installmake popt
-   installmake sysvinit
-   installmake misc-progs
-   installmake reiserfsprogs
-   installmake sysfsutils
-   installmake util-linux
-   installmake pciutils
-   installmake zlib
-   installmake mtd
-   installmake wget
-   installmake hwdata
-   installmake kudzu
-   installmake pcmciautils
-   installmake installer
-   installmake initrd
+   ipfiremake installer
+   cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/
+   installmake strip
+   ipfiremake initrd
  }
  
  buildpackages() {
@@@ -718,7 -715,6 +716,6 @@@
    export LOGFILE
    echo "... see detailed log in _build.*.log files" >> $LOGFILE
  
-   installmake strip
    
    # Generating list of packages used
    echo -n "Generating packages list from logs" | tee -a $LOGFILE