[pkg-wpa-devel] r1679 - in /wpa/trunk/debian: changelog patches/hostap_allow-linking-with-libnl-3.2.patch patches/series

[slh-guest at users.alioth.debian.org]

Author: slh-guest
Date: Sat Apr  7 23:20:28 2012
New Revision: 1679

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1679
Log:
  - rebase patches:
    - hostap_allow-linking-with-libnl-3.2

Modified:
    wpa/trunk/debian/changelog
    wpa/trunk/debian/patches/hostap_allow-linking-with-libnl-3.2.patch
    wpa/trunk/debian/patches/series

Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1679&op=diff
==============================================================================
--- wpa/trunk/debian/changelog (original)
+++ wpa/trunk/debian/changelog Sat Apr  7 23:20:28 2012
@@ -4,6 +4,8 @@
   * import new upstream snapshot 1.0-rc2:
     - import git patches up to hostap_0_7_2-1504-g03de63c.
     - temporarily disable conflicting patches.
+    - rebase patches:
+      - hostap_allow-linking-with-libnl-3.2
   * merge source packages for hostapd and wpasupplicant under the new name
     "wpa", which is also used by upstream.
   * restrict wpasupplicant to linux-any and kfreebsd-any, hurd lacks kernel
@@ -12,7 +14,7 @@
   * update dep-5 version to final 1.0, no changes necessary:
     - order licenses alphabetically.
 
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Sun, 08 Apr 2012 01:06:52 +0200
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Sun, 08 Apr 2012 01:20:07 +0200
 
 wpasupplicant (0.7.3-6) unstable; urgency=low
 

Modified: wpa/trunk/debian/patches/hostap_allow-linking-with-libnl-3.2.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/hostap_allow-linking-with-libnl-3.2.patch?rev=1679&op=diff
==============================================================================
--- wpa/trunk/debian/patches/hostap_allow-linking-with-libnl-3.2.patch (original)
+++ wpa/trunk/debian/patches/hostap_allow-linking-with-libnl-3.2.patch Sat Apr  7 23:20:28 2012
@@ -1,42 +1,11 @@
-Subject: [RFC] hostap: Allow linking with libnl-3.
-Date: Tue, 15 Nov 2011 14:30:04 -0000
-From: Ben Greear <greearb at candelatech.com>
-
-I needed this patch to compile against the latest
-libnl code.  I added this to my config file:
-
-CONFIG_LIBNL32=y
-
-Signed-hostap: Ben Greear <greearb at candelatech.com>
-rediffed against 0.7.3 by Stefan Lippers-Hollmann <s.l-h at gmx.de>
-
----
-:100644 100644 5caeec5... 0cc81f9... M	src/drivers/drivers.mak
- src/drivers/drivers.mak |   21 ++++++++++++++-------
- 2 files changed, 29 insertions(+), 14 deletions(-)
-
+FIXME: this should be done more elegantly.
 --- a/src/drivers/drivers.mak
 +++ b/src/drivers/drivers.mak
-@@ -31,11 +31,18 @@ NEED_SME=y
- NEED_AP_MLME=y
- NEED_NETLINK=y
- NEED_LINUX_IOCTL=y
--DRV_LIBS += -lnl
-+ifdef CONFIG_LIBNL32
-+  DRV_LIBS += -lnl-3
-+  DRV_LIBS += -lnl-genl-3
-+  DRV_CFLAGS += -DCONFIG_LIBNL20
+@@ -49,6 +49,7 @@ ifdef CONFIG_LIBNL32
+   DRV_LIBS += -lnl-3
+   DRV_LIBS += -lnl-genl-3
+   DRV_CFLAGS += -DCONFIG_LIBNL20
 +  DRV_CFLAGS += -I/usr/include/libnl3/
-+else
-+  DRV_LIBS += -lnl
- 
--ifdef CONFIG_LIBNL20
--DRV_LIBS += -lnl-genl
--DRV_CFLAGS += -DCONFIG_LIBNL20
-+  ifdef CONFIG_LIBNL20
-+    DRV_LIBS += -lnl-genl
-+    DRV_CFLAGS += -DCONFIG_LIBNL20
-+  endif
- endif
- endif
- 
+ else
+   ifdef CONFIG_LIBNL_TINY
+     DRV_LIBS += -lnl-tiny

Modified: wpa/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/series?rev=1679&op=diff
==============================================================================
--- wpa/trunk/debian/patches/series (original)
+++ wpa/trunk/debian/patches/series Sat Apr  7 23:20:28 2012
@@ -64,4 +64,4 @@
 #09_dbus_emit_change_events.patch
 12_wpa_gui_knotify_support.patch
 13_human_readable_signal.patch
-#hostap_allow-linking-with-libnl-3.2.patch
+hostap_allow-linking-with-libnl-3.2.patch