From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 ece72ab98f2379caa3299647f2088a2ec6d4f1c6
Date: Wed, 19 Mar 2014 07:24:05 +0100
Message-ID: <20140319062411.A6A6220AF4@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2718998363594256117=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============2718998363594256117==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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  ece72ab98f2379caa3299647f2088a2ec6d4f1c6 (commit)
       via  f89678de2fe1b9b1fa711bcd72c1e2d771a059d7 (commit)
      from  b0d9fad3f94fb73b1686c5e6a948066497638d26 (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 ece72ab98f2379caa3299647f2088a2ec6d4f1c6
Merge: f89678d b0d9fad
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Mar 19 07:23:40 2014 +0100

    Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

commit f89678de2fe1b9b1fa711bcd72c1e2d771a059d7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Mar 19 07:22:49 2014 +0100

    hostapd: update to 2.1.

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

Summary of changes:
 config/hostapd/config   | 3 +++
 html/cgi-bin/wlanap.cgi | 3 ++-
 lfs/hostapd             | 8 ++++----
 lfs/wpa_supplicant      | 6 +++---
 4 files changed, 12 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/config/hostapd/config b/config/hostapd/config
index 6158e2c..a232073 100644
--- a/config/hostapd/config
+++ b/config/hostapd/config
@@ -142,3 +142,6 @@ CONFIG_IEEE80211N=3Dy
 # This can be used to reduce the size of the hostapd considerably if debuggi=
ng
 # code is not needed.
 CONFIG_NO_STDOUT_DEBUG=3Dy
+
+# IEEE 802.11ac (Very High Throughput) support
+CONFIG_IEEE80211AC=3Dy
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 79bd025..c544f73 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -2,7 +2,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2005-2013  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2014  IPFire Team  <info(a)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      =
  #
@@ -557,6 +557,7 @@ driver=3D$wlanapsettings{'DRIVER_HOSTAPD'}
 interface=3D$wlanapsettings{'INTERFACE'}
 country_code=3D$wlanapsettings{'COUNTRY'}
 ieee80211d=3D1
+ieee80211h=3D1
 channel=3D$wlanapsettings{'CHANNEL'}
 END
 ;
diff --git a/lfs/hostapd b/lfs/hostapd
index 9e01b06..424e407 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2013  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2014  IPFire Team  <info(a)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      =
  #
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 2.0
+VER        =3D 2.1
=20
 THISAPP    =3D hostapd-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D hostapd
-PAK_VER    =3D 26
+PAK_VER    =3D 27
=20
 DEPS       =3D ""
=20
@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D ba22e639bc57aa4035d2ea8ffa9bbbee
+$(DL_FILE)_MD5 =3D bb9c50e87c5af6f89f387e63911effac
=20
 install : $(TARGET)
=20
diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant
index 1172e60..754bb01 100644
--- a/lfs/wpa_supplicant
+++ b/lfs/wpa_supplicant
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2013  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2014  IPFire Team  <info(a)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      =
  #
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 2.0
+VER        =3D 2.1
=20
 THISAPP    =3D wpa_supplicant-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 3be2ebfdcced52e00eda0afe2889839d
+$(DL_FILE)_MD5 =3D e96b8db5a8171cd17a5b2012d6ad7cc7
=20
 install : $(TARGET)
=20


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

--===============2718998363594256117==--