Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Feb 2015 12:24:05 +0000 (13:24 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Feb 2015 12:24:05 +0000 (13:24 +0100)
Conflicts:
make.sh

1  2 
config/rootfiles/common/armv5tel/initscripts
lfs/initscripts
lfs/strongswan
make.sh

index e529e66,60ef0ef..6347caf
mode 100755,100644..100755
@@@ -52,7 -52,6 +52,7 @@@ etc/rc.d/init.d/mISD
  #etc/rc.d/init.d/mldonkey
  etc/rc.d/init.d/modules
  #etc/rc.d/init.d/motion
 +#etc/rc.d/init.d/monit
  etc/rc.d/init.d/mountfs
  etc/rc.d/init.d/mountkernfs
  etc/rc.d/init.d/mounttmpfs
@@@ -118,6 -117,7 +118,7 @@@ etc/rc.d/init.d/ssh
  etc/rc.d/init.d/static-routes
  #etc/rc.d/init.d/stunnel
  etc/rc.d/init.d/swap
+ etc/rc.d/init.d/swconfig
  etc/rc.d/init.d/sysctl
  etc/rc.d/init.d/sysklogd
  etc/rc.d/init.d/teamspeak
@@@ -224,6 -224,7 +225,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/S73swconfig
  etc/rc.d/rcsysinit.d/S75firstsetup
  etc/rc.d/rcsysinit.d/S80localnet
  etc/rc.d/rcsysinit.d/S85firewall
diff --combined lfs/initscripts
index 4894710,f656c72..f656c72
mode 100755,100644..100755
@@@ -1,7 -1,7 +1,7 @@@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
- # Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+ # Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@@ -194,10 -194,12 +194,12 @@@ $(TARGET) 
                ln -sf any /etc/rc.d/init.d/networking/$$i; \
        done
  
-       # ARM does not need checkfstab and acpid
+       # ARM does not need checkfstab and acpid, intel no swconfig
  ifeq "$(MACHINE_TYPE)" "arm"
        rm -vf /etc/rc.d/init.d/{acpid,checkfstab}
+       ln -sf ../init.d/swconfig    /etc/rc.d/rcsysinit.d/S73swconfig
  else
+       rm -vf /etc/rc.d/init.d/swconfig
        ln -sf ../init.d/acpid       /etc/rc.d/rc3.d/S12acpid
        ln -sf ../init.d/acpid       /etc/rc.d/rc0.d/K87acpid
        ln -sf ../init.d/acpid       /etc/rc.d/rc6.d/K87acpid
diff --combined lfs/strongswan
@@@ -24,7 -24,7 +24,7 @@@
  
  include Config
  
 -VER        = 5.2.1
 +VER        = 5.2.2
  
  THISAPP    = strongswan-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
@@@ -48,7 -48,7 +48,7 @@@ objects = $(DL_FILE
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
 -$(DL_FILE)_MD5 = dd3717c0aa59ab4591ca1812941ebb82
 +$(DL_FILE)_MD5 = 7ee1a33060b2bde35be0f6d78a1d26d0
  
  install : $(TARGET)
  
@@@ -78,6 -78,7 +78,7 @@@ $(subst %,%_MD5,$(objects)) 
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.1.2-5.2.1_modp_custom.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.0.2_ipfire.patch
  
        cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh
diff --combined make.sh
+++ b/make.sh
@@@ -25,7 -25,7 +25,7 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.17"                                                        # Version number
- CORE="87"                                                     # Core Level (Filename)
+ CORE="87-rc1"                                                 # Core Level (Filename)
  PAKFIRE_CORE="86"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
@@@ -733,11 -733,9 +733,11 @@@ buildipfire() 
    ipfiremake iftop
    ipfiremake motion
    ipfiremake joe
 +  ipfiremake monit
    ipfiremake nut
    ipfiremake watchdog
    ipfiremake libpri
 +  ipfiremake libsrtp
    ipfiremake asterisk
    ipfiremake lcr
    ipfiremake usb_modeswitch
    ipfiremake squid-accounting
    ipfiremake pigz
    ipfiremake tmux
+   ipfiremake swconfig
  }
  
  buildinstaller() {