From owner-svn-ports-head@FreeBSD.ORG  Wed Apr  1 18:57:33 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AE9BE380;
 Wed,  1 Apr 2015 18:57:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7F202A1C;
 Wed,  1 Apr 2015 18:57:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t31IvXnw040194;
 Wed, 1 Apr 2015 18:57:33 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t31IvWFB040192;
 Wed, 1 Apr 2015 18:57:32 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201504011857.t31IvWFB040192@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Wed, 1 Apr 2015 18:57:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r382939 - head/net/hostapd/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Apr 2015 18:57:33 -0000

Author: marino
Date: Wed Apr  1 18:57:32 2015
New Revision: 382939
URL: https://svnweb.freebsd.org/changeset/ports/382939

Log:
  net/hostapd: Unbreak new version on DragonFly

Added:
  head/net/hostapd/files/patch-src_drivers_driver__bsd.c   (contents, props changed)
  head/net/hostapd/files/patch-src_wps_wps__upnp.c   (contents, props changed)

Added: head/net/hostapd/files/patch-src_drivers_driver__bsd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/hostapd/files/patch-src_drivers_driver__bsd.c	Wed Apr  1 18:57:32 2015	(r382939)
@@ -0,0 +1,14 @@
+--- src/drivers/driver_bsd.c.orig	2015-03-15 17:30:39 UTC
++++ src/drivers/driver_bsd.c
+@@ -623,7 +623,11 @@ rtbuf_len(void)
+ static int bsd_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
+ 			  int reason_code);
+ 
++#ifdef __DragonFly__
++const char *
++#else
+ static const char *
++#endif
+ ether_sprintf(const u8 *addr)
+ {
+ 	static char buf[sizeof(MACSTR)];

Added: head/net/hostapd/files/patch-src_wps_wps__upnp.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/hostapd/files/patch-src_wps_wps__upnp.c	Wed Apr  1 18:57:32 2015	(r382939)
@@ -0,0 +1,20 @@
+--- src/wps/wps_upnp.c.orig	2015-03-15 17:30:39 UTC
++++ src/wps/wps_upnp.c
+@@ -837,7 +837,7 @@ fail:
+ }
+ 
+ 
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+ #include <sys/sysctl.h>
+ #include <net/route.h>
+ #include <net/if_dl.h>
+@@ -924,7 +924,7 @@ int get_netif_info(const char *net_if, u
+ 		goto fail;
+ 	}
+ 	os_memcpy(mac, req.ifr_addr.sa_data, 6);
+-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+ 	if (eth_get(net_if, mac) < 0) {
+ 		wpa_printf(MSG_ERROR, "WPS UPnP: Failed to get MAC address");
+ 		goto fail;