Merge branch '2.4' into 2.5

gvim/.md5sum

@@ -1 +1,2 @@
+9bd2e29c537b01a65a5bd02f3c3a5b0f  vim-7.2.001-051.tar.bz2
 f0901284b338e448bfd79ccca0041254  vim-7.2.tar.bz2

gvim/Pkgfile

@@ -4,13 +4,16 @@
 # Depends on:  vim, gtk
 
 name=gvim
-version=7.2
+version=7.2.51
 release=1
-source=(ftp://ftp.vim.org/pub/vim/unix/vim-7.2.tar.bz2)
+source=(ftp://ftp.vim.org/pub/vim/unix/vim-7.2.tar.bz2 \
+        http://crux.nu/~jue/files/dist/vim-7.2.001-051.tar.bz2)
 
 build () {
     cd vim72/src
 
+    cat $SRC/vim-7.2-patches/* | patch -p0 -d $SRC/vim72
+
     ./configure --prefix=/usr \
                 --with-vim-name=gvim \
                 --with-x=yes \

wpa_supplicant/.md5sum

@@ -1 +1 @@
-9e7b99da67c47d81121368c6d580d069  wpa_supplicant-0.5.10.tar.gz
+ad320af63f735531878e592f1ffd9b06  wpa_supplicant-0.5.11.tar.gz

wpa_supplicant/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  openssl
 
 name=wpa_supplicant
-version=0.5.10
+version=0.5.11
 release=1
 source=(http://hostap.epitest.fi/releases/$name-$version.tar.gz)