[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 97c73abc88358e084af84500ad1cbff649d4f2a0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 97c73abc88358e084af84500ad1cbff649d4f2a0

[git]

[-- Attachment #1: Type: text/plain, Size: 5429 bytes --]

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, master has been updated
       via  97c73abc88358e084af84500ad1cbff649d4f2a0 (commit)
       via  2bb836df110ec8c7e30fc93ca638f445dd586fd2 (commit)
      from  864a8efff39035ac7ab7c667b0d5821285c7db43 (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 97c73abc88358e084af84500ad1cbff649d4f2a0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Jan 4 20:26:59 2015 +0100

    hostapd/wpa_supplicant: update to 2.3.

commit 2bb836df110ec8c7e30fc93ca638f445dd586fd2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Jan 4 20:17:26 2015 +0100

    hostapd: change default channel to 6.

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

Summary of changes:
 config/hostapd/hostapd.conf                                       | 2 +-
 config/rootfiles/{oldcore/80 => core/86}/filelists/wpa_supplicant | 0
 html/cgi-bin/wlanap.cgi                                           | 2 +-
 lfs/hostapd                                                       | 8 ++++----
 lfs/wpa_supplicant                                                | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)
 copy config/rootfiles/{oldcore/80 => core/86}/filelists/wpa_supplicant (100%)

Difference in files:
diff --git a/config/hostapd/hostapd.conf b/config/hostapd/hostapd.conf
index e1f493f..33fd304 100644
--- a/config/hostapd/hostapd.conf
+++ b/config/hostapd/hostapd.conf
@@ -3,7 +3,7 @@ driver=nl80211
 #
 interface=blue0
 hw_mode=g
-channel=05
+channel=6
 logger_syslog=-1
 logger_syslog_level=3
 logger_stdout=-1
diff --git a/config/rootfiles/core/86/filelists/wpa_supplicant b/config/rootfiles/core/86/filelists/wpa_supplicant
new file mode 120000
index 0000000..1d04c03
--- /dev/null
+++ b/config/rootfiles/core/86/filelists/wpa_supplicant
@@ -0,0 +1 @@
+../../../common/wpa_supplicant
\ No newline at end of file
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 50806ac..2f0cb55 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -65,7 +65,7 @@ $wlanapsettings{'SSID'} = 'IPFire';
 $wlanapsettings{'HIDESSID'} = 'off';
 $wlanapsettings{'ENC'} = 'wpa2';               # none / wpa1 /wpa2
 $wlanapsettings{'TXPOWER'} = 'auto';
-$wlanapsettings{'CHANNEL'} = '05';
+$wlanapsettings{'CHANNEL'} = '6';
 $wlanapsettings{'COUNTRY'} = '00';
 $wlanapsettings{'HW_MODE'} = 'g';
 $wlanapsettings{'PWD'} = 'IPFire-2.x';
diff --git a/lfs/hostapd b/lfs/hostapd
index dbf909d..c381a0a 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2015  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 @@
 
 include Config
 
-VER        = 2.2
+VER        = 2.3
 
 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    = 30
+PAK_VER    = 31
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 23c1f78a693c3288802d516adb7fd289
+$(DL_FILE)_MD5 = 40b89c61036add0c2dd1fc10767d3b5f
 
 install : $(TARGET)
 
diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant
index 5b1125c..1cebaab 100644
--- a/lfs/wpa_supplicant
+++ b/lfs/wpa_supplicant
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2015  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 @@
 
 include Config
 
-VER        = 2.2
+VER        = 2.3
 
 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 = 238e8e888bbd558e1a57e3eb28d1dd07
+$(DL_FILE)_MD5 = f2ed8fef72cf63d8d446a2d0a6da630a
 
 install : $(TARGET)
 


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