3 files changed, 11 insertions, 25 deletions
diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD
index 4e003ed5a..05ebfe611 100644
--- a/extra/net-snmp/PKGBUILD
+++ b/extra/net-snmp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198340 2013-10-30 14:16:21Z allan $
+# $Id: PKGBUILD 206473 2014-02-27 12:21:34Z eric $
 # Maintainer:
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=net-snmp
-pkgver=5.7.2
-pkgrel=8
+pkgver=5.7.2.1
+pkgrel=1
 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
 arch=('i686' 'x86_64')
 url="http://www.net-snmp.org/"
@@ -17,7 +17,7 @@ optdepends=('perl-term-readkey: for snmpcheck application'
 options=('!emptydirs' '!makeflags')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
         snmpd.service snmptrapd.service libnl32.patch)
-sha1sums=('c493027907f32400648244d81117a126aecd27ee'
+sha1sums=('ea5b8952ca482eceac8cb1f3ffbac50e13c0a5b0'
           'SKIP'
           '84e32c54d32e6b608747054e04a3ddfe6d6638cc'
           '0244e91c7baa0abebfb5c0560e8ce04c966c5992'
@@ -25,6 +25,7 @@ sha1sums=('c493027907f32400648244d81117a126aecd27ee'
 
 prepare() {
   cd ${pkgname}-${pkgver}
+  make PERL_ARCHLIB=/usr/lib/perl5/core_perl PERL_INC=/usr/lib/perl5/core_perl/CORE distclean
 # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
   patch -Np1 -i "$srcdir/libnl32.patch"
   autoreconf -f -i
@@ -43,8 +44,7 @@ build() {
     --with-sys-location="Unknown" \
     --with-logfile="/var/log/snmpd.log" \
     --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \
-    --with-persistent-directory="/var/net-snmp" \
-    --disable-static
+    --with-persistent-directory="/var/net-snmp"
   make NETSNMP_DONT_CHECK_VERSION=1
 }
 
diff --git a/extra/wpa_supplicant_gui/PKGBUILD b/extra/wpa_supplicant_gui/PKGBUILD
index c90e36cc5..c454f8a17 100644
--- a/extra/wpa_supplicant_gui/PKGBUILD
+++ b/extra/wpa_supplicant_gui/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 187078 2013-06-03 11:17:10Z allan $
+# $Id: PKGBUILD 206486 2014-02-27 17:25:26Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=wpa_supplicant_gui
-pkgver=2.0
-pkgrel=3
+pkgver=2.1
+pkgrel=1
 pkgdesc="A Qt frontend to wpa_supplicant"
 url="http://hostap.epitest.fi/wpa_supplicant"
 arch=('i686' 'x86_64')
 depends=('qt4' "wpa_supplicant")
 license=('GPL')
 source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz")
-sha256sums=('2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09')
+sha256sums=('91632e7e3b49a340ce408e2f978a93546a697383abf2e5a60f146faae9e1b277')
 
 build() {
   cd wpa_supplicant-${pkgver}
   cd wpa_supplicant/wpa_gui-qt4
-  qmake-qt4 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" 
+  qmake-qt4 QMAKE_CFLAGS_RELEASE="$CPPFLAGS $CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CPPFLAGS $CXXFLAGS" QMAKE_LFLAGS_RELEASE="$LDFLAGS"
   make
 }
 
diff --git a/extra/wpa_supplicant_gui/compile-fix.patch b/extra/wpa_supplicant_gui/compile-fix.patch
deleted file mode 100644
index 3303b3699..000000000
--- a/extra/wpa_supplicant_gui/compile-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -u -r wpa_supplicant-1.0/wpa_supplicant/wpa_gui-qt4/wpagui.cpp wpa_supplicant-1.0-fix/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
---- wpa_supplicant-1.0/wpa_supplicant/wpa_gui-qt4/wpagui.cpp	2012-05-09 23:56:09.000000000 +0200
-+++ wpa_supplicant-1.0-fix/wpa_supplicant/wpa_gui-qt4/wpagui.cpp	2012-06-25 12:06:46.045261398 +0200
-@@ -12,10 +12,8 @@
-  * See README and COPYING for more details.
-  */
- 
--#ifdef __MINGW32__
- /* Need to get getopt() */
- #include <unistd.h>
--#endif
- 
- #ifdef CONFIG_NATIVE_WINDOWS
- #include <windows.h>