diff options
| author | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
| commit | d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2 (patch) | |
| tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.sbin/wpa/hostapd | |
| parent | 3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff) | |
| parent | 4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff) | |
| download | FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz | |
Merge head from 7/28
Diffstat (limited to 'usr.sbin/wpa/hostapd')
| -rw-r--r-- | usr.sbin/wpa/hostapd/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/wpa/hostapd/Makefile.depend | 1 | ||||
| -rw-r--r-- | usr.sbin/wpa/hostapd/hostapd.8 | 2 | ||||
| -rw-r--r-- | usr.sbin/wpa/hostapd/hostapd.conf.5 | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile index 7f0304c..7ab542f 100644 --- a/usr.sbin/wpa/hostapd/Makefile +++ b/usr.sbin/wpa/hostapd/Makefile @@ -46,8 +46,8 @@ CFLAGS+=-DCONFIG_DRIVER_BSD \ CFLAGS+= -DCONFIG_IPV6 .endif #CFLAGS+= -g -DPADD+= ${LIBPCAP} -LDADD+= -lpcap +DPADD+= ${LIBPCAP} ${LIBUTIL} +LDADD+= -lpcap -lutil # User customizations for wpa_supplicant/hostapd build environment CFLAGS+=${HOSTAPD_CFLAGS} diff --git a/usr.sbin/wpa/hostapd/Makefile.depend b/usr.sbin/wpa/hostapd/Makefile.depend index ae45e7b..5acb789 100644 --- a/usr.sbin/wpa/hostapd/Makefile.depend +++ b/usr.sbin/wpa/hostapd/Makefile.depend @@ -12,6 +12,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libpcap \ + lib/libutil \ secure/lib/libcrypto \ secure/lib/libssl \ diff --git a/usr.sbin/wpa/hostapd/hostapd.8 b/usr.sbin/wpa/hostapd/hostapd.8 index f624cac..9edbd65 100644 --- a/usr.sbin/wpa/hostapd/hostapd.8 +++ b/usr.sbin/wpa/hostapd/hostapd.8 @@ -129,7 +129,7 @@ utility first appeared in The .Nm utility was written by -.An Jouni Malinen Aq j@w1.fi . +.An Jouni Malinen Aq Mt j@w1.fi . This manual page is derived from the .Pa README file included in the diff --git a/usr.sbin/wpa/hostapd/hostapd.conf.5 b/usr.sbin/wpa/hostapd/hostapd.conf.5 index 08a04fe..e166f36 100644 --- a/usr.sbin/wpa/hostapd/hostapd.conf.5 +++ b/usr.sbin/wpa/hostapd/hostapd.conf.5 @@ -208,4 +208,4 @@ and files in the .Nm hostapd distribution provided by -.An Jouni Malinen Aq j@w1.fi . +.An Jouni Malinen Aq Mt j@w1.fi . |
