This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via d7636b6fa3462eb3437fd2d18e88916962a04056 (commit) via 724912e6fd3f0d2c251a3ebefe7460b72f95a1ba (commit) via f4d84254936c3e7cf20234ae5d450d51e93ec051 (commit) via cd5f645968825b308fa12799bb754834335a52ee (commit) from 449adc2a7b668928cf1ed541a6b4bc4a208ea9c3 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit d7636b6fa3462eb3437fd2d18e88916962a04056 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jul 12 18:47:56 2014 +0200

core80: finished.

commit 724912e6fd3f0d2c251a3ebefe7460b72f95a1ba Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jul 12 18:47:03 2014 +0200

core80: stop/start strongswan at update.

commit f4d84254936c3e7cf20234ae5d450d51e93ec051 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jul 12 18:40:02 2014 +0200

hostapd: update to 2.2.

commit cd5f645968825b308fa12799bb754834335a52ee Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jul 12 18:39:34 2014 +0200

wpa_supplicant: update to 2.2.

-----------------------------------------------------------------------

Summary of changes: .../rootfiles/{oldcore/28 => core/80}/filelists/wpa_supplicant | 0 config/rootfiles/core/80/update.sh | 9 +++++++-- lfs/hostapd | 6 +++--- lfs/wpa_supplicant | 4 ++-- make.sh | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) copy config/rootfiles/{oldcore/28 => core/80}/filelists/wpa_supplicant (100%)

Difference in files: diff --git a/config/rootfiles/core/80/filelists/wpa_supplicant b/config/rootfiles/core/80/filelists/wpa_supplicant new file mode 120000 index 0000000..1d04c03 --- /dev/null +++ b/config/rootfiles/core/80/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh index 830481d..27e5bde 100644 --- a/config/rootfiles/core/80/update.sh +++ b/config/rootfiles/core/80/update.sh @@ -31,19 +31,24 @@ do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done

+# Stop services +/etc/init.d/ipsec stop + # Remove old strongswan files rm -f \ /etc/strongswan.d/charon/unity.conf \ /usr/lib/ipsec/plugins/libstrongswan-unity.so \ /usr/share/strongswan/templates/config/plugins/unity.conf

-# Stop services - # Extract files extract_files

# Start services /etc/init.d/dnsmasq restart +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi +

# Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" diff --git a/lfs/hostapd b/lfs/hostapd index 5560a42..dbf909d 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -24,7 +24,7 @@

include Config

-VER = 2.1 +VER = 2.2

THISAPP = hostapd-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 29 +PAK_VER = 30

DEPS = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = bb9c50e87c5af6f89f387e63911effac +$(DL_FILE)_MD5 = 23c1f78a693c3288802d516adb7fd289

install : $(TARGET)

diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant index 754bb01..5b1125c 100644 --- a/lfs/wpa_supplicant +++ b/lfs/wpa_supplicant @@ -24,7 +24,7 @@

include Config

-VER = 2.1 +VER = 2.2

THISAPP = wpa_supplicant-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = e96b8db5a8171cd17a5b2012d6ad7cc7 +$(DL_FILE)_MD5 = 238e8e888bbd558e1a57e3eb28d1dd07

install : $(TARGET)

diff --git a/make.sh b/make.sh index ba83801..b50a07b 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.15" # Version number CORE="80" # Core Level (Filename) -PAKFIRE_CORE="79" # Core Level (PAKFIRE) +PAKFIRE_CORE="80" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir

hooks/post-receive -- IPFire 2.x development tree