diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/hostapd | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/hostapd')
| -rw-r--r-- | package/hostapd/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 44a5ae16c..dbb46ee3c 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= hostapd PKG_VERSION:= 2.0 PKG_RELEASE:= 1 PKG_MD5SUM:= ba22e639bc57aa4035d2ea8ffa9bbbee -PKG_DESCR:= IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator -PKG_SECTION:= wifi +PKG_DESCR:= wireless authenticator +PKG_SECTION:= net/wifi PKG_DEPENDS:= libnl PKG_BUILDDEP:= libnl PKG_URL:= http://hostap.epitest.fi/ @@ -18,10 +18,10 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_SUBPKGS:= HOSTAPD HOSTAPD_UTILS PKG_CHOICES_HOSTAPD:= WITH_GNUTLS WITH_OPENSSL -PKGCD_WITH_OPENSSL:= use OpenSSL for crypto +PKGCD_WITH_OPENSSL:= use openssl for crypto PKGCS_WITH_OPENSSL:= libopenssl PKGCB_WITH_OPENSSL:= openssl -PKGCD_WITH_GNUTLS:= use GnuTLS for crypto +PKGCD_WITH_GNUTLS:= use gnutls for crypto PKGCS_WITH_GNUTLS:= libgnutls PKGCB_WITH_GNUTLS:= gnutls PKGSN_HOSTAPD_UTILS:= hostapd |