Hello community,
here is the log from the commit of package hostapd for openSUSE:Factory
checked in at Wed Jun 9 17:09:32 CEST 2010.
--------
--- hostapd/hostapd.changes 2008-09-24 00:59:11.000000000 +0200
+++ /mounts/work_src_done/STABLE/hostapd/hostapd.changes 2010-06-09 10:19:17.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Jun 9 05:32:08 CEST 2010 - sndirsch@suse.de
+
+- udpated to release 0.6.10
+- updated hostapd.dif
+- git-commit-eb1f744.diff:
+ * Move DTIM period configuration into Beacon set operation; fixes
+ "Could not set DTIM period for kernel driver; wlan0: Unable to
+ setup interface.rmdir[ctrl_interface]: No such file or
+ directory" error when using "nl80211" driver
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
hostapd-0.5.10.tar.bz2
New:
----
git-commit-eb1f744.diff
hostapd-0.6.10.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hostapd.spec ++++++
--- /var/tmp/diff_new_pack.dUWeeA/_old 2010-06-09 17:08:34.000000000 +0200
+++ /var/tmp/diff_new_pack.dUWeeA/_new 2010-06-09 17:08:34.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package hostapd (Version 0.5.10)
+# spec file for package hostapd (Version 0.6.10)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,20 +19,21 @@
Name: hostapd
-BuildRequires: openssl-devel
+BuildRequires: libnl-devel openssl-devel
Summary: Turns Your WLAN Card into a WPA capable Access Point
-Version: 0.5.10
+Version: 0.6.10
Release: 1
Group: Hardware/Wifi
-License: BSD 3-Clause; GPL v2 or later
+License: BSD3c ; GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#Provides:
#Requires:
#Conflicts:
Url: http://hostap.epitest.fi/
AutoReqProv: on
-Source: hostapd-%{version}.tar.bz2
+Source: hostapd-%{version}.tar.gz
Patch: hostapd.dif
+Patch1: git-commit-eb1f744.diff
%description
hostapd is a user space daemon for access point and authentication
@@ -49,8 +50,10 @@
Jouni Malinen
%prep
-%setup -n hostapd-%{version}
-%patch -p1
+%setup -n hostapd-%{version}/hostapd
+%patch -p0
+%patch1 -p2
+cp defconfig .config
%build
CFLAGS="$RPM_OPT_FLAGS" make %{?jobs:-j%jobs}
@@ -58,6 +61,7 @@
%install
mkdir -p %{buildroot}/%{_sbindir}
mkdir %{buildroot}/etc
+mkdir -p %{buildroot}/%{_mandir}/man8
install -m 755 hostapd %{buildroot}/%{_sbindir}
install -m 755 hostapd_cli %{buildroot}/%{_sbindir}
install -m 644 hostapd.conf %{buildroot}/etc
@@ -66,7 +70,9 @@
install -m 644 hostapd.eap_user %{buildroot}/etc
install -m 644 hostapd.radius_clients %{buildroot}/etc
install -m 644 hostapd.sim_db %{buildroot}/etc
+install -m 644 hostapd.vlan %{buildroot}/etc
install -m 644 hostapd.wpa_psk %{buildroot}/etc
+install -m 644 hostapd.8 %{buildroot}/%{_mandir}/man8
%clean
rm -rf $RPM_BUILD_ROOT
@@ -75,6 +81,7 @@
%defattr(-,root,root)
%config(noreplace) /etc/*
%{_sbindir}/*
-%doc ChangeLog COPYING README madwifi.conf wired.conf
+%doc ChangeLog ../COPYING README wired.conf
+%doc %{_mandir}/man8/*
%changelog
++++++ git-commit-eb1f744.diff ++++++
commit eb1f7446b5b86cceb1508f060f5e66e5dd791a4d
Author: Jouni Malinen
Date: Thu Mar 12 21:57:08 2009 +0200
Move DTIM period configuration into Beacon set operation
This is needed to make mac80211 work with multi-BSS configuration. The
previous design ended up setting DTIM period for secondary BSSes before
setting the Beacon and driver_nl80211.c was not really prepared for
that. Eventually, the Beacon configuration routines should be combined
into a single driver operation, but for now, just moving this call is
the simplest workaround.
diff --git a/hostapd/beacon.c b/hostapd/beacon.c
index b7eb86a..8ccfa12 100644
--- a/hostapd/beacon.c
+++ b/hostapd/beacon.c
@@ -434,6 +434,10 @@ void ieee802_11_set_beacon(struct hostapd_data *hapd)
os_free(tail);
os_free(head);
+ if (hostapd_set_dtim_period(hapd, hapd->conf->dtim_period))
+ wpa_printf(MSG_ERROR, "Could not set DTIM period for kernel "
+ "driver");
+
if (hostapd_set_cts_protect(hapd, cts_protection))
wpa_printf(MSG_ERROR, "Failed to set CTS protect in kernel "
"driver");
diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index 308d816..8531d0a 100644
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -1292,12 +1292,6 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
return -1;
}
- if (hostapd_set_dtim_period(hapd, hapd->conf->dtim_period)) {
- wpa_printf(MSG_ERROR, "Could not set DTIM period for kernel "
- "driver");
- return -1;
- }
-
/* Set SSID for the kernel driver (to be used in beacon and probe
* response frames) */
if (set_ssid && hostapd_set_ssid(hapd, (u8 *) conf->ssid.ssid,
++++++ hostapd.dif ++++++
--- /var/tmp/diff_new_pack.dUWeeA/_old 2010-06-09 17:08:34.000000000 +0200
+++ /var/tmp/diff_new_pack.dUWeeA/_new 2010-06-09 17:08:34.000000000 +0200
@@ -1,116 +1,54 @@
-Index: hostapd-0.5.7/.config
-================================================================================
---- hostapd-0.5.8/.config
-+++ hostapd-0.5.8/.config
-@@ -0,0 +1,80 @@
-+# Example hostapd build time configuration
-+#
-+# This file lists the configuration options that are used when building the
-+# hostapd binary. All lines starting with # are ignored. Configuration option
-+# lines must be commented out complete, if they are not to be included, i.e.,
-+# just setting VARIABLE=n is not disabling that variable.
-+#
-+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-+# be modified from here. In most cass, these lines should use += in order not
-+# to override previous values of the variables.
-+
-+# Driver interface for Host AP driver
-+CONFIG_DRIVER_HOSTAP=y
-+
-+# Driver interface for wired authenticator
+--- defconfig.orig 2010-06-09 01:28:31.000000000 +0200
++++ defconfig 2010-06-09 01:34:34.000000000 +0200
+@@ -13,17 +13,17 @@
+ CONFIG_DRIVER_HOSTAP=y
+
+ # Driver interface for wired authenticator
+-#CONFIG_DRIVER_WIRED=y
+CONFIG_DRIVER_WIRED=y
-+
-+# Driver interface for madwifi driver
-+MADWIFI_SOURCE=$(shell echo /usr/include/madwifi*)
-+MADWIFI_AVAIL=$(shell test -x ${MADWIFI_SOURCE} && echo y)
-+ifeq ($(MADWIFI_AVAIL),y)
-+CFLAGS += -I$(shell echo /usr/include/madwifi*)
-+CONFIG_DRIVER_MADWIFI=y
-+endif
-+
-+# Driver interface for Prism54 driver
+
+ # Driver interface for madwifi driver
+ #CONFIG_DRIVER_MADWIFI=y
+ #CFLAGS += -I../../madwifi # change to the madwifi source directory
+
+ # Driver interface for Prism54 driver
+-#CONFIG_DRIVER_PRISM54=y
+CONFIG_DRIVER_PRISM54=y
-+
-+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
-+#CONFIG_DRIVER_BSD=y
-+#CFLAGS += -I/usr/local/include
-+#LIBS += -L/usr/local/lib
-+
-+# IEEE 802.11F/IAPP
-+CONFIG_IAPP=y
-+
-+# WPA2/IEEE 802.11i RSN pre-authentication
-+CONFIG_RSN_PREAUTH=y
-+
-+# Integrated EAP authenticator
-+CONFIG_EAP=y
-+
-+# EAP-MD5 for the integrated EAP authenticator
-+CONFIG_EAP_MD5=y
-+
-+# EAP-TLS for the integrated EAP authenticator
-+CONFIG_EAP_TLS=y
-+
-+# EAP-MSCHAPv2 for the integrated EAP authenticator
-+CONFIG_EAP_MSCHAPV2=y
-+
-+# EAP-PEAP for the integrated EAP authenticator
-+CONFIG_EAP_PEAP=y
-+
-+# EAP-GTC for the integrated EAP authenticator
-+CONFIG_EAP_GTC=y
-+
-+# EAP-TTLS for the integrated EAP authenticator
-+CONFIG_EAP_TTLS=y
-+
-+# EAP-SIM for the integrated EAP authenticator
+
+ # Driver interface for drivers using the nl80211 kernel interface
+-#CONFIG_DRIVER_NL80211=y
++CONFIG_DRIVER_NL80211=y
+ # driver_nl80211.c requires a rather new libnl (version 1.1) which may not be
+ # shipped with your distribution yet. If that is the case, you need to build
+ # newer libnl version and point the hostapd build to use it.
+@@ -76,7 +76,7 @@
+ CONFIG_EAP_TTLS=y
+
+ # EAP-SIM for the integrated EAP server
+-#CONFIG_EAP_SIM=y
+CONFIG_EAP_SIM=y
-+
-+# EAP-PAX for the integrated EAP server
+
+ # EAP-AKA for the integrated EAP server
+ #CONFIG_EAP_AKA=y
+@@ -86,10 +86,10 @@
+ #CONFIG_EAP_AKA_PRIME=y
+
+ # EAP-PAX for the integrated EAP server
+-#CONFIG_EAP_PAX=y
+CONFIG_EAP_PAX=y
-+
-+# EAP-PSK for the integrated EAP server
+
+ # EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK)
+-#CONFIG_EAP_PSK=y
+CONFIG_EAP_PSK=y
-+
-+# PKCS#12 (PFX) support (used to read private key and certificate file from
-+# a file that usually has extension .p12 or .pfx)
-+CONFIG_PKCS12=y
-+
-+# RADIUS authentication server. This provides access to the integrated EAP
-+# authenticator from external hosts using RADIUS.
+
+ # EAP-SAKE for the integrated EAP server
+ #CONFIG_EAP_SAKE=y
+@@ -123,7 +123,7 @@
+
+ # RADIUS authentication server. This provides access to the integrated EAP
+ # server from external hosts using RADIUS.
+-#CONFIG_RADIUS_SERVER=y
+CONFIG_RADIUS_SERVER=y
-+
-+# Build IPv6 support for RADIUS operations
-+CONFIG_IPV6=y
-+
---- hostapd-0.5.8/Makefile
-+++ hostapd-0.5.8/Makefile
-@@ -18,6 +18,8 @@
-
- -include .config
-
-+BINDIR ?= /usr/local/bin
-+
- ifndef CONFIG_OS
- ifdef CONFIG_NATIVE_WINDOWS
- CONFIG_OS=win32
-@@ -333,7 +335,8 @@
- fi
-
- install: all
-- for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
-+ mkdir -p $(INSTROOT)$(BINDIR)
-+ for i in $(ALL); do install -m755 $$i $(INSTROOT)$(BINDIR)/$$i; done
-
- hostapd: $(OBJS)
- $(CC) -o hostapd $(OBJS) $(LIBS)
---- hostapd-0.5.8/driver_madwifi.c
-+++ hostapd-0.5.8/driver_madwifi.c
-@@ -19,6 +19,7 @@
- #include
-
- #include
-+#include
- #include
- #ifdef WME_NUM_AC
- /* Assume this is built against BSD branch of madwifi driver. */
+
+ # Build IPv6 support for RADIUS operations
+ CONFIG_IPV6=y
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org