diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-25 10:25:19 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-25 10:25:19 +0100 |
commit | d8eb584da3a24a7b4cccf1b4b39b19ca8fc19495 (patch) | |
tree | 8e5ea3b068852a348646a0543fdacbd7de7a937e /community/hostapd | |
parent | 82e1a8e4caf3318dbb60adda8c2649ae7ac15661 (diff) | |
parent | 299e917c17619f800f0c21cf43209065b608223f (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/pigeonhole/PKGBUILD
community/mingw32-pthreads/PKGBUILD
community/openbsd-netcat/PKGBUILD
community/remmina/PKGBUILD
core/crda/PKGBUILD
core/libnl/PKGBUILD
core/wpa_supplicant/PKGBUILD
extra/fontconfig/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gvfs/PKGBUILD
extra/libcdio/PKGBUILD
extra/maxima/PKGBUILD
extra/vcdimager/PKGBUILD
extra/vlc/PKGBUILD
extra/xfdesktop/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/q4wine/PKGBUILD
testing/dovecot/PKGBUILD
Diffstat (limited to 'community/hostapd')
-rw-r--r-- | community/hostapd/PKGBUILD | 61 | ||||
-rw-r--r-- | community/hostapd/config | 96 | ||||
-rw-r--r-- | community/hostapd/hostap_allow-linking-with-libnl-3.2.patch | 42 |
3 files changed, 166 insertions, 33 deletions
diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD index 8a9458dd2..3874b2aa8 100644 --- a/community/hostapd/PKGBUILD +++ b/community/hostapd/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 48888 2011-06-07 11:05:59Z spupykin $ +# $Id: PKGBUILD 66310 2012-02-23 14:02:47Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> _madwifiver=0.9.4.4133 pkgname=hostapd pkgver=0.7.3 -pkgrel=5 +pkgrel=7 pkgdesc="daemon for wireless software access points" arch=('i686' 'x86_64' 'mips64el') url="http://hostap.epitest.fi/hostapd/" license=('custom') depends=('openssl' 'libnl') -makedepends=('svn') +makedepends=() provides=('hostapd') conflicts=('hostapd') backup=('etc/hostapd/hostapd.conf' @@ -27,51 +27,46 @@ backup=('etc/hostapd/hostapd.conf' install=hostapd.install source=(http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz ftp://ftp.archlinux.org/other/madwifi/madwifi-${_madwifiver}.tar.bz2 - config.bz2 + hostap_allow-linking-with-libnl-3.2.patch + config hostapd hostapd.conf.d) md5sums=('91a7c8d0f090b7104152d3455a84c112' 'ca3c3504d000e7b3d7063af46271c932' - '5d087e2e047ffceb3218e6b2b68fb3bf' + 'e904e62b12c5d64132dd9441e8b45dce' + 'bfe5701bc93d5d091e6f1a93f1a32dd6' 'd570327c385f34a4af24d3a0d61cea19' 'f169534b0f59b341f6df1a21e0344511') build() { - cd $srcdir/$pkgname-$pkgver/hostapd + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch" - cp ../../config ./.config + cd hostapd + cp "$srcdir/config" ./.config - sed -i "s|/usr|$srcdir/madwifi|" .config - sed -i "s|/usr/local/bin|$pkgdir/usr/bin|" Makefile - - mkdir -p $pkgdir/usr/bin $pkgdir/etc/hostapd \ - $pkgdir/usr/man/man1 $pkgdir/usr/man/man8 \ - $pkgdir/usr/share/licenses/$pkgname $pkgdir/etc/rc.d + sed -i "s|@@madwifi@@|$srcdir/madwifi|" .config + sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf make } package() { - cd $srcdir/$pkgname-$pkgver/hostapd - make DESTDIR=$pkg install + cd "$srcdir/$pkgname-$pkgver/hostapd" + + install -D hostapd "$pkgdir/usr/bin/hostapd" + install hostapd_cli "$pkgdir/usr/bin/hostapd_cli" + + install -Dm644 hlr_auc_gw.milenage_db "$pkgdir/etc/hostapd/hlr_auc_gw.milenage_db" + install -m644 -t "$pkgdir/etc/hostapd" \ + hostapd.{accept,conf,deny,eap_user,radius_clients,sim_db,vlan,wpa_psk} \ + wired.conf + + install -Dm644 hostapd.8 "$pkgdir/usr/share/man/man8/hostapd.8" + install -Dm644 hostapd_cli.1 "$pkgdir/usr/share/man/man1/hostapd_cli.1" - cp hlr_auc_gw.milenage_db $pkgdir/etc/hostapd - cp hostapd.accept $pkgdir/etc/hostapd - cp hostapd.conf $pkgdir/etc/hostapd - cp hostapd.deny $pkgdir/etc/hostapd - cp hostapd.eap_user $pkgdir/etc/hostapd - cp hostapd.radius_clients $pkgdir/etc/hostapd - cp hostapd.sim_db $pkgdir/etc/hostapd - cp hostapd.vlan $pkgdir/etc/hostapd - cp hostapd.wpa_psk $pkgdir/etc/hostapd - cp wired.conf $pkgdir/etc/hostapd - cp hostapd.8 $pkgdir/usr/man/man8 - cp hostapd_cli.1 $pkgdir/usr/man/man1 - cp ../COPYING $pkgdir/usr/share/licenses/hostapd - cp ../../hostapd $pkgdir/etc/rc.d - mkdir -p $pkgdir/etc/conf.d - cp ../../hostapd.conf.d $pkgdir/etc/conf.d/hostapd + install -D "$srcdir/hostapd" "$pkgdir/etc/rc.d/hostapd" + install -Dm644 "$srcdir/hostapd.conf.d" "$pkgdir/etc/conf.d/hostapd" - mv $pkgdir/usr/man $pkgdir/usr/share/ - sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' $pkgdir/etc/hostapd/hostapd.conf + install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/community/hostapd/config b/community/hostapd/config new file mode 100644 index 000000000..d77e77461 --- /dev/null +++ b/community/hostapd/config @@ -0,0 +1,96 @@ +# Example hostapd build time configuration +# +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cass, these lines should use += in order not +# to override previous values of the variables. + +# Driver interface for Host AP driver +CONFIG_DRIVER_HOSTAP=y + +# Driver interface for wired authenticator +CONFIG_DRIVER_WIRED=y + +# Driver interface for madwifi driver +CONFIG_DRIVER_MADWIFI=y +CFLAGS += -I@@madwifi@@ # change to reflect local setup; directory for madwifi src + +# Driver interface for Prism54 driver +CONFIG_DRIVER_PRISM54=y + +# IEEE 802.11F/IAPP +CONFIG_IAPP=y + +# WPA2/IEEE 802.11i RSN pre-authentication +CONFIG_RSN_PREAUTH=y + +# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) +CONFIG_PEERKEY=y + +# IEEE 802.11w (management frame protection) +# This version is an experimental implementation based on IEEE 802.11w/D1.0 +# draft and is subject to change since the standard has not yet been finalized. +# Driver support is also needed for IEEE 802.11w. +CONFIG_IEEE80211W=y + +# Integrated EAP server +CONFIG_EAP=y + +# EAP-MD5 for the integrated EAP server +CONFIG_EAP_MD5=y + +# EAP-TLS for the integrated EAP server +CONFIG_EAP_TLS=y + +# EAP-MSCHAPv2 for the integrated EAP server +CONFIG_EAP_MSCHAPV2=y + +# EAP-PEAP for the integrated EAP server +CONFIG_EAP_PEAP=y + +# EAP-GTC for the integrated EAP server +CONFIG_EAP_GTC=y + +# EAP-TTLS for the integrated EAP server +CONFIG_EAP_TTLS=y + +# EAP-SIM for the integrated EAP server +CONFIG_EAP_SIM=y + +# EAP-AKA for the integrated EAP server +CONFIG_EAP_AKA=y + +# EAP-PAX for the integrated EAP server +CONFIG_EAP_PAX=y + +# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK) +CONFIG_EAP_PSK=y + +# EAP-SAKE for the integrated EAP server +CONFIG_EAP_SAKE=y + +# EAP-GPSK for the integrated EAP server +CONFIG_EAP_GPSK=y +# Include support for optional SHA256 cipher suite in EAP-GPSK +CONFIG_EAP_GPSK_SHA256=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) +CONFIG_PKCS12=y + +# RADIUS authentication server. This provides access to the integrated EAP +# server from external hosts using RADIUS. +CONFIG_RADIUS_SERVER=y + +# Build IPv6 support for RADIUS operations +CONFIG_IPV6=y + +CONFIG_DRIVER_NL80211=y + +CONFIG_IEEE80211N=y + +CONFIG_LIBNL32=y diff --git a/community/hostapd/hostap_allow-linking-with-libnl-3.2.patch b/community/hostapd/hostap_allow-linking-with-libnl-3.2.patch new file mode 100644 index 000000000..8e7cd9a97 --- /dev/null +++ b/community/hostapd/hostap_allow-linking-with-libnl-3.2.patch @@ -0,0 +1,42 @@ +Subject: [RFC] hostap: Allow linking with libnl-3. +Date: Tue, 15 Nov 2011 14:30:04 -0000 +From: Ben Greear <greearb@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@candelatech.com> +rediffed against 0.7.3 by Stefan Lippers-Hollmann <s.l-h@gmx.de> + +--- +:100644 100644 5caeec5... 0cc81f9... M src/drivers/drivers.mak + src/drivers/drivers.mak | 21 ++++++++++++++------- + 2 files changed, 29 insertions(+), 14 deletions(-) + +--- 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 ++ 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 + |