diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-17 10:20:19 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-17 10:20:19 -0300 |
| commit | 66e4c91d4531eef5adcd9dbe4a71e63c9b72cd7e (patch) | |
| tree | 19e3e26a15f15fc8405ba2016fe9d4cc19919833 /core/wpa_supplicant | |
| parent | c646bdd97c63b2d81bc27060203fabfebabda716 (diff) | |
| parent | c84b2cd310f86dc50c4f52a5907cb17652e8c87c (diff) | |
Merged upstream, mesa needs revision
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gigi/PKGBUILD
community-staging/lxdm/PKGBUILD
community-staging/lxdm/lxdm-pam
community-staging/lxdm/lxdm.install
community-staging/lxdm/service
community-testing/gigi/PKGBUILD
community/calf/PKGBUILD
community/freedroidrpg/PKGBUILD
community/gmic/PKGBUILD
community/gnash/PKGBUILD
community/prboom/PKGBUILD
community/scorched3d/PKGBUILD
community/tmux/PKGBUILD
community/torcs/PKGBUILD
core/curl/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit/PKGBUILD
extra/akonadi/PKGBUILD
extra/bzflag/PKGBUILD
extra/dhcp/PKGBUILD
extra/ftgl/PKGBUILD
extra/gcin/PKGBUILD
extra/imagemagick/PKGBUILD
extra/mesa/PKGBUILD
extra/python-telepathy/PKGBUILD
extra/qtiplot/PKGBUILD
extra/ruby/PKGBUILD
extra/wireshark/PKGBUILD
extra/xfce4-xkb-plugin/PKGBUILD
extra/xine-lib/PKGBUILD
extra/xorg-server/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/baobab/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/gdm/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gnome-games/PKGBUILD
gnome-unstable/gnome-screensaver/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/libpeas/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/networkmanager/PKGBUILD
multilib/lib32-glew/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-sqlite/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
staging/calligra/PKGBUILD
staging/inkscape/PKGBUILD
staging/kdebase-workspace/PKGBUILD
staging/kdebase-workspace/kde-np.pam
staging/kdebase-workspace/kde.pam
staging/kdebase-workspace/kdm.service
staging/libreoffice/PKGBUILD
staging/libreoffice/libreoffice-common.csh
staging/libreoffice/libreoffice-common.sh
staging/poppler/PKGBUILD
testing/dbus-python/PKGBUILD
testing/e2fsprogs/PKGBUILD
testing/iproute2/PKGBUILD
testing/iptables/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdebase-workspace/kde-np.pam
testing/kdebase-workspace/kde.pam
testing/kdebindings-python/PKGBUILD
testing/lvm2/PKGBUILD
testing/lvm2/lvm-on-crypt.service
testing/lvm2/lvm.service
testing/miro/PKGBUILD
testing/postgresql/PKGBUILD
testing/postgresql/postgresql.install
testing/postgresql/postgresql.service
testing/ppp/PKGBUILD
testing/ppp/ip-down
testing/pyqt/PKGBUILD
testing/qscintilla/PKGBUILD
testing/sip/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
testing/util-linux/PKGBUILD
testing/wpa_supplicant/PKGBUILD
testing/wpa_supplicant/config
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'core/wpa_supplicant')
| -rw-r--r-- | core/wpa_supplicant/PKGBUILD | 7 | ||||
| -rw-r--r-- | core/wpa_supplicant/config | 14 |
2 files changed, 17 insertions, 4 deletions
diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD index d2f0af04d..80a58c795 100644 --- a/core/wpa_supplicant/PKGBUILD +++ b/core/wpa_supplicant/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 162909 2012-07-03 19:16:48Z dreisner $ +# $Id: PKGBUILD 168766 2012-10-15 19:16:03Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64' 'mips64el') depends=('openssl' 'dbus-core' 'readline' 'libnl') optdepends=('wpa_supplicant_gui: wpa_gui program') license=('GPL') -groups=('base') backup=('etc/wpa_supplicant/wpa_supplicant.conf') source=("http://w1.fi/releases/${pkgname}-${pkgver}.tar.gz" config hostap_allow-linking-with-libnl-3.2.patch) md5sums=('8650f6aa23646ef634402552d0669640' - '380d8d1fe24bccb2a2636cb2a6038c39' + 'c035e45e8e240239eecd7402f235fb3b' '473fb6b77909ec5a50b6f4d91370e86b') build() { diff --git a/core/wpa_supplicant/config b/core/wpa_supplicant/config index 59da1e27e..5e6dfedc8 100644 --- a/core/wpa_supplicant/config +++ b/core/wpa_supplicant/config @@ -466,3 +466,17 @@ CONFIG_NO_RANDOM_POOL=y #CONFIG_INTERWORKING=y CONFIG_LIBNL32=y + +# More options that are not in defconfig: + +# Lightweight AP mode +CONFIG_AP=y + +# P2P (WiFi Direct) +CONFIG_P2P=y + +# RSN IBSS/AdHoc support +CONFIG_IBSS_RSN=y + +# Simple background scan +CONFIG_BGSCAN_SIMPLE=y |