[pkg-wpa-devel] r890 - in /wpasupplicant/trunk: debian/ debian/patches/ src/l2_packet/ src/radius/ wpa_supplicant/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Fri Nov 9 11:13:26 UTC 2007
Author: kelmo-guest
Date: Fri Nov 9 11:13:26 2007
New Revision: 890
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=890
Log:
- support for dbus >= 1.1.1 dbus_watch_get_unix_fd() api
Removed:
wpasupplicant/trunk/debian/patches/60_dbus_deprecated_get_fd.dpatch
Modified:
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/control
wpasupplicant/trunk/debian/patches/00list
wpasupplicant/trunk/src/l2_packet/l2_packet_linux.c
wpasupplicant/trunk/src/radius/radius.c
wpasupplicant/trunk/wpa_supplicant/Makefile
wpasupplicant/trunk/wpa_supplicant/ctrl_iface_dbus.c
wpasupplicant/trunk/wpa_supplicant/defconfig
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=890&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Fri Nov 9 11:13:26 2007
@@ -1,6 +1,7 @@
-wpasupplicant (0.6.1~git20071103-1) UNRELEASED; urgency=low
+wpasupplicant (0.6.1~git20071109-1) UNRELEASED; urgency=low
* New upstream git snapshot.
+ - support for dbus >= 1.1.1 dbus_watch_get_unix_fd() api
* Convert to non-cdbs traditional debhelper-centric debian/rules and remove
build dependency on cdbs. This converges with style of hostapd package.
* Correct poorly formatted debian/NEWS entry that was causing lintian to
@@ -14,10 +15,6 @@
* No longer build "ndiswrapper" or "ipw" backends. Etch shipped with a
kernel in which neither of these backends could work (> Linux 2.6.14) so
it is about time we no longer pretended to support for them.
- * Add debian/patches/60_dbus_deprecated_get_fd.dpatch to fix deprecated
- usage of dbus_watch_get_fd(). Instead use dbus_watch_get_unix_fd().
- * dbus_watch_get_unix_fd() requires versioned build dependency on
- libdbus-1-dev (>= 1.1.1-1).
* Activate D-Bus system activation support. Install the service file into
/usr/share/dbus-1/system-service/. The filename reflects the service bus
name of "fi.epitest.hostap.WPASupplicant". In addition, the service must
@@ -35,7 +32,7 @@
has ensued. If the interface is not recorded in ifupdown's state file
attempt reassociation. (Closes: #428304).
- -- Kel Modderman <kel at otaku42.de> Sun, 04 Nov 2007 08:24:52 +1000
+ -- Kel Modderman <kel at otaku42.de> Fri, 09 Nov 2007 21:11:50 +1000
wpasupplicant (0.6.0-4) unstable; urgency=low
Modified: wpasupplicant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/control?rev=890&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Fri Nov 9 11:13:26 2007
@@ -4,7 +4,7 @@
Maintainer: Debian/Ubuntu wpasupplicant Maintainers <pkg-wpa-devel at lists.alioth.debian.org>
Uploaders: Kyle McMartin <kyle at debian.org>, Reinhard Tartler <siretart at tauware.de>, Kel Modderman <kel at otaku42.de>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), dpatch, libssl-dev, libreadline5-dev, libqt4-dev, libdbus-1-dev (>= 1.1.1-1), docbook, docbook-utils
+Build-Depends: debhelper (>= 5), dpatch, libssl-dev, libreadline5-dev, libqt4-dev, libdbus-1-dev, docbook, docbook-utils
Vcs-Svn: svn://svn.debian.org/pkg-wpa/wpasupplicant/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/
Homepage: http://w1.fi/wpa_supplicant/
Modified: wpasupplicant/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/00list?rev=890&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/00list (original)
+++ wpasupplicant/trunk/debian/patches/00list Fri Nov 9 11:13:26 2007
@@ -1,3 +1,2 @@
10_dbus_policy
20_madwifi_headers
-60_dbus_deprecated_get_fd
Modified: wpasupplicant/trunk/src/l2_packet/l2_packet_linux.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/src/l2_packet/l2_packet_linux.c?rev=890&op=diff
==============================================================================
--- wpasupplicant/trunk/src/l2_packet/l2_packet_linux.c (original)
+++ wpasupplicant/trunk/src/l2_packet/l2_packet_linux.c Fri Nov 9 11:13:26 2007
@@ -178,7 +178,8 @@
os_memset(&ifr, 0, sizeof(ifr));
os_strlcpy(ifr.ifr_name, l2->ifname, sizeof(ifr.ifr_name));
if (ioctl(s, SIOCGIFADDR, &ifr) < 0) {
- perror("ioctl[SIOCGIFADDR]");
+ if (errno != EADDRNOTAVAIL)
+ perror("ioctl[SIOCGIFADDR]");
close(s);
return -1;
}
Modified: wpasupplicant/trunk/src/radius/radius.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/src/radius/radius.c?rev=890&op=diff
==============================================================================
--- wpasupplicant/trunk/src/radius/radius.c (original)
+++ wpasupplicant/trunk/src/radius/radius.c Fri Nov 9 11:13:26 2007
@@ -234,8 +234,9 @@
case RADIUS_ATTR_IP:
if (len == 4) {
- struct in_addr *addr = (struct in_addr *) pos;
- printf(" Value: %s\n", inet_ntoa(*addr));
+ struct in_addr addr;
+ os_memcpy(&addr, pos, 4);
+ printf(" Value: %s\n", inet_ntoa(addr));
} else
printf(" Invalid IP address length %d\n", len);
break;
Modified: wpasupplicant/trunk/wpa_supplicant/Makefile
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/Makefile?rev=890&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/Makefile (original)
+++ wpasupplicant/trunk/wpa_supplicant/Makefile Fri Nov 9 11:13:26 2007
@@ -757,6 +757,17 @@
ifndef DBUS_INCLUDE
DBUS_INCLUDE := $(shell pkg-config --cflags dbus-1)
endif
+dbus_version=$(subst ., ,$(shell pkg-config --modversion dbus-1))
+DBUS_VERSION_MAJOR=$(word 1,$(dbus_version))
+DBUS_VERSION_MINOR=$(word 2,$(dbus_version))
+ifeq ($(DBUS_VERSION_MAJOR),)
+DBUS_VERSION_MAJOR=0
+endif
+ifeq ($(DBUS_VERSION_MINOR),)
+DBUS_VERSION_MINOR=0
+endif
+DBUS_INCLUDE += -DDBUS_VERSION_MAJOR=$(DBUS_VERSION_MAJOR)
+DBUS_INCLUDE += -DDBUS_VERSION_MINOR=$(DBUS_VERSION_MINOR)
CFLAGS += $(DBUS_INCLUDE)
endif
Modified: wpasupplicant/trunk/wpa_supplicant/ctrl_iface_dbus.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/ctrl_iface_dbus.c?rev=890&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/ctrl_iface_dbus.c (original)
+++ wpasupplicant/trunk/wpa_supplicant/ctrl_iface_dbus.c Fri Nov 9 11:13:26 2007
@@ -21,6 +21,14 @@
#include "ctrl_iface_dbus.h"
#include "ctrl_iface_dbus_handlers.h"
+#define DBUS_VERSION (DBUS_VERSION_MAJOR << 8 | DBUS_VERSION_MINOR)
+#define DBUS_VER(major, minor) ((major) << 8 | (minor))
+
+#if DBUS_VERSION < DBUS_VER(1,1)
+#define dbus_watch_get_unix_fd dbus_watch_get_fd
+#endif
+
+
struct ctrl_iface_dbus_priv {
DBusConnection *con;
int should_dispatch;
@@ -83,7 +91,7 @@
return;
flags = dbus_watch_get_flags(watch);
- fd = dbus_watch_get_fd(watch);
+ fd = dbus_watch_get_unix_fd(watch);
eloop_register_sock(fd, EVENT_TYPE_EXCEPTION, process_watch_exception,
iface, watch);
@@ -108,7 +116,7 @@
int fd;
flags = dbus_watch_get_flags(watch);
- fd = dbus_watch_get_fd(watch);
+ fd = dbus_watch_get_unix_fd(watch);
eloop_unregister_sock(fd, EVENT_TYPE_EXCEPTION);
Modified: wpasupplicant/trunk/wpa_supplicant/defconfig
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/defconfig?rev=890&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/defconfig (original)
+++ wpasupplicant/trunk/wpa_supplicant/defconfig Fri Nov 9 11:13:26 2007
@@ -215,7 +215,9 @@
#CONFIG_NO_AES_EXTRAS=y
# Select configuration backend:
-# file = text file (e.g., wpa_supplicant.conf)
+# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
+# path is given on command line, not here; this option is just used to
+# select the backend that allows configuration files to be used)
# winreg = Windows registry (see win_example.reg for an example)
CONFIG_BACKEND=file
More information about the Pkg-wpa-devel
mailing list