Bug#480572: [pkg-wpa-devel] Bug#480572: wpasupplicant: FTBFS on kfreebsd-gnu

2009-09-06 Thread Emmanuel Bouthenot
Hi,
 
> I will submit you a cleaner one soon :)
Attached is an updated patch which works with version 0.6.9-3. This
one should be ok to be sent upstream.

Regards,  

-- 
Emmanuel Bouthenot
--- wpasupplicant-0.6.9/debian/control	2009-09-06 12:16:07.0 +0200
+++ wpasupplicant-0.6.9.new/debian/control	2009-09-06 03:32:08.0 +0200
@@ -11,12 +11,13 @@
  libreadline5-dev,
  libqt4-dev,
  libdbus-1-dev,
- libnl-dev,
+ libnl-dev [!kfreebsd-i386 !kfreebsd-amd64],
  docbook,
  docbook-utils,
  pkg-config,
  libpcap-dev [kfreebsd-i386 kfreebsd-amd64],
- libbsd [kfreebsd-i386 kfreebsd-amd64]
+ libbsd-dev [kfreebsd-i386 kfreebsd-amd64],
+ kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64]
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/pkg-wpa/wpasupplicant/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/
--- wpasupplicant-0.6.9/debian/patches/20_kfreebsd_support	1970-01-01 01:00:00.0 +0100
+++ wpasupplicant-0.6.9.new/debian/patches/20_kfreebsd_support	2009-09-06 04:05:25.0 +0200
@@ -0,0 +1,54 @@
+--- a/src/drivers/driver_bsd.c
 b/src/drivers/driver_bsd.c
+@@ -22,6 +22,22 @@
+ 
+ #include 
+ 
++/* systems based on GNU libc like kfreebsd-gnu */
++#ifdef __GLIBC__
++#include 
++#endif
++
++/* on systems based on GNU libc, some functions like strlcpy
++   or strlcat are missing and provided by the libbsd */
++#ifdef __GLIBC__
++#include "bsd/string.h"
++#endif
++
++/* kfreebsd-gnu */
++#ifdef __FreeBSD_kernel__
++#include 
++#endif
++
+ #ifdef __NetBSD__
+ #include 
+ #define COMPAT_FREEBSD_NET80211
+--- a/src/l2_packet/l2_packet_freebsd.c
 b/src/l2_packet/l2_packet_freebsd.c
+@@ -14,9 +14,9 @@
+  */
+ 
+ #include "includes.h"
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD_kernel__)
+ #include 
+-#endif /* __APPLE__ */
++#endif /* __APPLE__ / __FreeBSD_kernel__ */
+ #include 
+ 
+ #include 
+--- a/src/utils/common.h
 b/src/utils/common.h
+@@ -17,10 +17,10 @@
+ 
+ #include "os.h"
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD_kernel__)
+ #include 
+ #include 
+-#endif /* __linux__ */
++#endif /* __linux__ / __FreeBSD_kernel__ */
+ 
+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #include 
--- wpasupplicant-0.6.9/debian/patches/series	2009-09-06 12:16:07.0 +0200
+++ wpasupplicant-0.6.9.new/debian/patches/series	2009-09-06 12:25:32.0 +0200
@@ -5,3 +5,4 @@
 07_dbus_service_syslog.patch
 10_multi_driver.patch
 11_syslog.patch
+20_kfreebsd_support


Bug#480572: [pkg-wpa-devel] Bug#480572: wpasupplicant: FTBFS on kfreebsd-gnu

2008-06-04 Thread Emmanuel Bouthenot
Hi,

> What about the comments made by upstream Developer?
yes, i saw them. They are right, my patch is not ready to be applied
upstream.

I will submit you a cleaner one soon :)
 
Cheers,

-- 
Emmanuel Bouthenot



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#480572: [pkg-wpa-devel] Bug#480572: wpasupplicant: FTBFS on kfreebsd-gnu

2008-06-04 Thread Kel Modderman
On Monday 12 May 2008 00:25:51 Emmanuel Bouthenot wrote:
> Hi,
> 
> > I think that this:
> > libpcap-dev [kfreebsd], libbsd [kfreebsd]
> > 
> > should be:
> > libpcap-dev [kfreebsd-i386 kfreebsd-amd64], libbsd [kfreebsd-i386 
> > kfreebsd-amd64]
> oops
> 
>  
> > What do you think?
> You are right, we have to enumarate the archs.
> 
> 
> Thanks.
> 
> M.
> 

Hi,

What about the comments made by upstream Developer?

http://lists.shmoo.com/pipermail/hostap/2008-May/017822.html

Did you receive the email by CC?

Thanks, Kel.




-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#480572: [pkg-wpa-devel] Bug#480572: wpasupplicant: FTBFS on kfreebsd-gnu

2008-05-11 Thread Emmanuel Bouthenot
Hi,

> I think that this:
> libpcap-dev [kfreebsd], libbsd [kfreebsd]
> 
> should be:
> libpcap-dev [kfreebsd-i386 kfreebsd-amd64], libbsd [kfreebsd-i386 
> kfreebsd-amd64]
oops

 
> What do you think?
You are right, we have to enumarate the archs.


Thanks.

M.



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#480572: [pkg-wpa-devel] Bug#480572: wpasupplicant: FTBFS on kfreebsd-gnu

2008-05-11 Thread Kel Modderman
tags 480572 pending
thanks
(BCC'd control server)

On Sunday 30 September 2007 04:39:15 Emmanuel Bouthenot wrote:
> Package: wpasupplicant
> Version: 0.6.3-1
> Severity: important
> 
> 
> Hi,
> 
> The current version fails to build on GNU/kFreeBSD due to linux
> specific build options.
> 
> The attached patch fix the FTBFS and makes the package working 
> fine on kfreebsd.
> 
> I will be glad if you can include it.

Thanks.

One query; lintian alerted me that the arch specific build dependencies
introduced by this patch may be incorrect:

E: wpasupplicant source: invalid-arch-string-in-source-relation kfreebsd-gnu 
[build-depends: libpcap-dev [kfreebsd-gnu]]
N:
N:   The architecture string in the source relation does not follow policy.
N:   A common cause of this is a comma in the arch, i.e. [i386, m68k], it
N:   should be [i386 m68k].
N:
N:   Refer to Policy Manual, section 5.6.8 for details.
N:
E: wpasupplicant source: invalid-arch-string-in-source-relation kfreebsd-gnu 
[build-depends: libbsd [kfreebsd-gnu]]

I think that this:
libpcap-dev [kfreebsd], libbsd [kfreebsd]

should be:
libpcap-dev [kfreebsd-i386 kfreebsd-amd64], libbsd [kfreebsd-i386 
kfreebsd-amd64]

What do you think?

Thanks, Kel.



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#480572: wpasupplicant: FTBFS on kfreebsd-gnu

2008-05-10 Thread Emmanuel Bouthenot
Package: wpasupplicant
Version: 0.6.3-1
Severity: important


Hi,

The current version fails to build on GNU/kFreeBSD due to linux
specific build options.

The attached patch fix the FTBFS and makes the package working 
fine on kfreebsd.

I will be glad if you can include it.

Cheers,

--
Emmanuel Bouthenot

-- System Information:
Debian Release: lenny/sid
Architecture: kfreebsd-i386 (i686)

Kernel: kFreeBSD 6.3-1-486
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages wpasupplicant depends on:
ii  adduser3.105 add and remove users and groups
ii  libbsd00.0-1.2+r1710 BSD compatibility library - shared
ii  libc0.12.7-10GNU C Library: Shared libraries
ii  libdbus-1-31.2.1-2   simple interprocess messaging syst
ii  libpcap0.8 0.9.8-3   system interface for user-level pa
ii  libpcsclite1   1.4.101-2 Middleware to access a smart card 
ii  libreadline5   5.2-3 GNU readline and history libraries
ii  libssl0.9.80.9.8g-8  SSL shared libraries
ii  lsb-base   3.1-24Linux Standard Base 3.1 init scrip

wpasupplicant recommends no packages.

-- no debconf information
diff -Naur wpasupplicant-0.6.3.orig/debian/config.kfreebsd 
wpasupplicant-0.6.3.new/debian/config.kfreebsd
--- wpasupplicant-0.6.3.orig/debian/config.kfreebsd 1970-01-01 
01:00:00.0 +0100
+++ wpasupplicant-0.6.3.new/debian/config.kfreebsd  2008-05-11 
00:24:31.0 +0200
@@ -0,0 +1,332 @@
+# Debian's wpa_supplicant build time configuration
+
+# Driver interface for Host AP driver
+#CONFIG_DRIVER_HOSTAP=y
+
+# Driver interface for Agere driver
+# XXX: Non-GPL header required
+#CONFIG_DRIVER_HERMES=y
+# Change include directories to match with the local setup
+#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
+#CFLAGS += -I../../include/wireless
+
+# Driver interface for madwifi driver
+#CONFIG_DRIVER_MADWIFI=y
+# Change include directories to match with the local setup
+#CFLAGS += -I../debian/madwifi-headers
+
+# Driver interface for Prism54 driver
+# (Note: Prism54 is not yet supported, i.e., this will not work as-is and is
+# for developers only)
+#CONFIG_DRIVER_PRISM54=y
+
+# Driver interface for ndiswrapper
+# XXX: Deprecated since Linux 2.6.14
+#CONFIG_DRIVER_NDISWRAPPER=y
+
+# Driver interface for Atmel driver
+#CONFIG_DRIVER_ATMEL=y
+
+# Driver interface for Broadcom driver
+# XXX: Non-GPL header required
+#CONFIG_DRIVER_BROADCOM=y
+# Example path for wlioctl.h; change to match your configuration
+#CFLAGS += -I/opt/WRT54GS/release/src/include
+
+# Driver interface for Intel ipw2100/2200 driver
+# XXX: Deprecated since Linux 2.6.14
+#CONFIG_DRIVER_IPW=y
+
+# Driver interface for Ralink driver
+# XXX: rt2x00 supports DRIVER_WEXT, the legacy drivers hardly work at all
+#CONFIG_DRIVER_RALINK=y
+
+# Driver interface for generic Linux wireless extensions
+#CONFIG_DRIVER_WEXT=y
+
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
+# XXX: we are not FreeBSD
+CONFIG_DRIVER_BSD=y
+#CFLAGS += -I/usr/local/include
+LIBS += -lbsd
+
+# Driver interface for Windows NDIS
+# XXX: we don't cater for the win32 arch
+#CONFIG_DRIVER_NDIS=y
+#CFLAGS += -I/usr/include/w32api/ddk
+#LIBS += -L/usr/local/lib
+# For native build using mingw
+#CONFIG_NATIVE_WINDOWS=y
+# Additional directories for cross-compilation on Linux host for mingw target
+#CFLAGS += -I/opt/mingw/mingw32/include/ddk
+#LIBS += -L/opt/mingw/mingw32/lib
+#CC=mingw32-gcc
+# By default, driver_ndis uses WinPcap for low-level operations. This can be
+# replaced with the following option which replaces WinPcap calls with NDISUIO.
+# However, this requires that WZC is disabled (net stop wzcsvc) before starting
+# wpa_supplicant.
+# CONFIG_USE_NDISUIO=y
+
+# Driver interface for development testing
+CONFIG_DRIVER_TEST=y
+
+# Driver interface for wired Ethernet drivers
+#CONFIG_DRIVER_WIRED=y
+
+# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
+# included)
+CONFIG_IEEE8021X_EAPOL=y
+
+# EAP-MD5
+CONFIG_EAP_MD5=y
+
+# EAP-MSCHAPv2
+CONFIG_EAP_MSCHAPV2=y
+
+# EAP-TLS
+CONFIG_EAP_TLS=y
+
+# EAL-PEAP
+CONFIG_EAP_PEAP=y
+
+# EAP-TTLS
+CONFIG_EAP_TTLS=y
+
+# EAP-FAST
+# Note: Default OpenSSL package does not include support for all the
+# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
+# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
+# to add the needed functions.
+#CONFIG_EAP_FAST=y
+
+# EAP-GTC
+CONFIG_EAP_GTC=y
+
+# EAP-OTP
+CONFIG_EAP_OTP=y
+
+# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
+CONFIG_EAP_SIM=y
+
+# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
+CONFIG_EAP_PSK=y
+
+# EAP-PAX
+CONFIG_EAP_PAX=y
+
+# LEAP
+CONFIG_EAP_LEAP=y
+
+# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
+CONFIG_EAP_AKA=y
+
+# EAP-SAK