Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/drbd/PKGBUILD
	community/dumb/PKGBUILD
	community/echat/PKGBUILD
	community/librcc/PKGBUILD
	community/linux-tools/PKGBUILD
	community/python2-pysqlite-legacy/PKGBUILD
	community/python2-pyxmpp/PKGBUILD
	core/libksba/PKGBUILD
	core/ncurses/PKGBUILD
	extra/libbonobo/PKGBUILD
	extra/libmpeg2/PKGBUILD
	extra/qt/PKGBUILD
	extra/rarian/PKGBUILD
	extra/wpa_supplicant_gui/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD

5 files changed, 77 insertions, 33 deletions

diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD
index 9d1eff719..d9aa4660c 100644
--- a/core/iw/PKGBUILD
+++ b/core/iw/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166323 2012-09-06 08:36:59Z thomas $
+# $Id: PKGBUILD 177059 2013-02-05 10:01:13Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=iw
-pkgver=3.6
+pkgver=3.8
 pkgrel=1
 pkgdesc="nl80211 based CLI configuration utility for wireless devices"
 arch=("i686" "x86_64" 'mips64el')
@@ -11,7 +11,7 @@ license=("GPL")
 depends=("libnl")
 makedepends=("linux-api-headers")
 source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('df11036ac11df31f44083da962a6e9c74bdea7c01c596c4b5840f948cdb6c857')
+sha256sums=('3dae92ca5989cbc21155941fa01907a5536da3c5f6898642440c61484fc7e0f9')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/core/libksba/PKGBUILD b/core/libksba/PKGBUILD
index 9f3ddeec3..feca2fa5d 100644
--- a/core/libksba/PKGBUILD
+++ b/core/libksba/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149815 2012-02-11 07:14:25Z tpowa $
-# Maintainer: damir <damir@archlinux.org>
+# $Id: PKGBUILD 177036 2013-02-05 00:36:51Z allan $
+# Maintainer: 
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=libksba
 pkgver=1.2.0
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A CMS and X.509 access library"
 arch=(i686 x86_64 mips64el)
 license=('GPL')
diff --git a/core/ncurses/PKGBUILD b/core/ncurses/PKGBUILD
index df3ac7938..48d2dd65d 100644
--- a/core/ncurses/PKGBUILD
+++ b/core/ncurses/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150103 2012-02-12 13:47:59Z allan $
+# $Id: PKGBUILD 177037 2013-02-05 00:36:51Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=ncurses
 pkgver=5.9
-pkgrel=3.2
+pkgrel=4
 pkgdesc="System V Release 4.0 curses emulation library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/ncurses/"
@@ -21,23 +21,21 @@ build() {
   cd ${srcdir}/ncursesw-build
   ../${pkgname}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \
      --with-shared --with-normal --without-debug --without-ada \
-     --with-install-prefix=${pkgdir} --enable-widec \
-     --enable-pc-files
-  # add --enable-ext-colors with next soname bump
+     --enable-widec --enable-pc-files
+  # add --enable-ext-colors and --enable-ext-mouse with next soname bump
   make
 
   # libncurses.so.5 for external binary support 
   cd ${srcdir}/ncurses-build
   [ $CARCH = "x86_64" ] && CONFIGFLAG="--with-chtype=long"
   ../${pkgname}-${pkgver}/configure --prefix=/usr \
-    --with-shared --with-normal --without-debug --without-ada \
-    --with-install-prefix=${pkgdir} $CONFIGFLAG
+    --with-shared --with-normal --without-debug --without-ada $CONFIGFLAG
   make
 }
 
 package() {
   cd ${srcdir}/ncursesw-build
-  make install
+  make DESTDIR=${pkgdir} install
 
   # Fool packages looking to link to non-wide-character ncurses libraries
   for lib in ncurses form panel menu; do
diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD
index 80a58c795..256ca9e13 100644
--- a/core/wpa_supplicant/PKGBUILD
+++ b/core/wpa_supplicant/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168766 2012-10-15 19:16:03Z thomas $
+# $Id: PKGBUILD 177060 2013-02-05 10:02:51Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=wpa_supplicant
-pkgver=1.0
-pkgrel=2
+pkgver=2.0
+pkgrel=1
 pkgdesc="A utility providing key negotiation for WPA wireless networks"
 url="http://hostap.epitest.fi/wpa_supplicant"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,17 +12,12 @@ optdepends=('wpa_supplicant_gui: wpa_gui program')
 license=('GPL')
 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'
-         'c035e45e8e240239eecd7402f235fb3b'
-         '473fb6b77909ec5a50b6f4d91370e86b')
+	config)
+md5sums=('3be2ebfdcced52e00eda0afe2889839d'
+         '4aa1e5accd604091341b989b47fe1076')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/"
-
-  # from fedora
-  patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch"
-
   cd "${pkgname}"
 
   cp "${srcdir}/config" ./.config
diff --git a/core/wpa_supplicant/config b/core/wpa_supplicant/config
index 5e6dfedc8..50426bf92 100644
--- a/core/wpa_supplicant/config
+++ b/core/wpa_supplicant/config
@@ -204,6 +204,8 @@ CONFIG_WPS=y
 # Disable credentials for an open network by default when acting as a WPS
 # registrar.
 #CONFIG_WPS_REG_DISABLE_OPEN=y
+# Enable WPS support with NFC config method
+CONFIG_WPS_NFC=y
 
 # EAP-IKEv2
 #CONFIG_EAP_IKEV2=y
@@ -220,6 +222,9 @@ CONFIG_SMARTCARD=y
 # Enable this if EAP-SIM or EAP-AKA is included
 #CONFIG_PCSC=y
 
+# Support HT overrides (disable HT/HT40, mask MCS rates, etc.)
+CONFIG_HT_OVERRIDES=y
+
 # Development testing
 #CONFIG_EAPOL_TEST=y
 
@@ -227,6 +232,7 @@ CONFIG_SMARTCARD=y
 # unix = UNIX domain sockets (default for Linux/*BSD)
 # udp = UDP sockets using localhost (127.0.0.1)
 # named_pipe = Windows Named Pipe (default for Windows)
+# udp-remote = UDP sockets with remote access (only for tests systems/purpose)
 # y = use default (backwards compatibility)
 # If this option is commented out, control interface is not included in the
 # build.
@@ -303,6 +309,9 @@ CONFIG_BACKEND=file
 # eloop_none = Empty template
 #CONFIG_ELOOP=eloop
 
+# Should we use poll instead of select? Select is used by default.
+#CONFIG_ELOOP_POLL=y
+
 # Select layer 2 packet implementation
 # linux = Linux packet socket (default)
 # pcap = libpcap/libdnet/WinPcap
@@ -315,9 +324,7 @@ CONFIG_BACKEND=file
 # 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.
+# IEEE 802.11w (management frame protection), also known as PMF
 # Driver support is also needed for IEEE 802.11w.
 #CONFIG_IEEE80211W=y
 
@@ -335,6 +342,13 @@ CONFIG_PEERKEY=y
 # sent prior to negotiating which version will be used)
 #CONFIG_TLSV11=y
 
+# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2)
+# can be enabled to enable use of stronger crypto algorithms. It should be
+# noted that some existing TLS v1.0 -based implementation may not be compatible
+# with TLS v1.2 message (ClientHello is sent prior to negotiating which version
+# will be used)
+#CONFIG_TLSV12=y
+
 # If CONFIG_TLS=internal is used, additional library and include paths are
 # needed for LibTomMath. Alternatively, an integrated, minimal version of
 # LibTomMath can be used. See beginning of libtommath.c for details on benefits
@@ -400,6 +414,12 @@ CONFIG_DEBUG_FILE=y
 # Set syslog facility for debug messages
 #CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
 
+# Add support for sending all debug messages (regardless of debug verbosity)
+# to the Linux kernel tracing facility. This helps debug the entire stack by
+# making it easy to record everything happening from the driver up into the
+# same file, e.g., using trace-cmd.
+#CONFIG_DEBUG_LINUX_TRACING=y
+
 # Enable privilege separation (see README 'Privilege separation' for details)
 #CONFIG_PRIVSEP=y
 
@@ -459,22 +479,53 @@ CONFIG_NO_RANDOM_POOL=y
 # IEEE 802.11n (High Throughput) support (mainly for AP mode)
 #CONFIG_IEEE80211N=y
 
+# Wireless Network Management (IEEE Std 802.11v-2011)
+# Note: This is experimental and not complete implementation.
+#CONFIG_WNM=y
+
 # Interworking (IEEE 802.11u)
 # This can be used to enable functionality to improve interworking with
 # external networks (GAS/ANQP to learn more about the networks and network
 # selection based on available credentials).
 #CONFIG_INTERWORKING=y
 
-CONFIG_LIBNL32=y
-
-# More options that are not in defconfig:
+# Hotspot 2.0
+#CONFIG_HS20=y
 
-# Lightweight AP mode
+# AP mode operations with wpa_supplicant
+# This can be used for controlling AP mode operations with wpa_supplicant. It
+# should be noted that this is mainly aimed at simple cases like
+# WPA2-Personal while more complex configurations like WPA2-Enterprise with an
+# external RADIUS server can be supported with hostapd.
 CONFIG_AP=y
 
-# P2P (WiFi Direct)
+# P2P (Wi-Fi Direct)
+# This can be used to enable P2P support in wpa_supplicant. See README-P2P for
+# more information on P2P operations.
 CONFIG_P2P=y
 
+# Autoscan
+# This can be used to enable automatic scan support in wpa_supplicant.
+# See wpa_supplicant.conf for more information on autoscan usage.
+#
+# Enabling directly a module will enable autoscan support.
+# For exponential module:
+CONFIG_AUTOSCAN_EXPONENTIAL=y
+# For periodic module:
+CONFIG_AUTOSCAN_PERIODIC=y
+
+# Password (and passphrase, etc.) backend for external storage
+# These optional mechanisms can be used to add support for storing passwords
+# and other secrets in external (to wpa_supplicant) location. This allows, for
+# example, operating system specific key storage to be used
+#
+# External password backend for testing purposes (developer use)
+#CONFIG_EXT_PASSWORD_TEST=y
+
+CONFIG_LIBNL32=y
+
+# More options that are not in defconfig:
+
 # RSN IBSS/AdHoc support
 CONFIG_IBSS_RSN=y