Merge branch '2.6' into 2.7

dovecot/.md5sum

@@ -1,3 +1,3 @@
 7eaa958040fbd7169c86134439d4b632  dovecot
-f58749dae7826d82b96fccf2c9e3bbf7  dovecot-2.0.1.tar.gz
+e6386f44d027bd3f3f21400e162cf4f6  dovecot-2.0.2.tar.gz
 47daa0cf67f2afb7dff6710f8a008c31  dovecot-config.patch

dovecot/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  zlib bzip2 openssl tcp_wrappers
 
 name=dovecot
-version=2.0.1
+version=2.0.2
 release=1
 source=(http://dovecot.org/releases/2.0/$name-$version.tar.gz \
         dovecot-config.patch dovecot)

flash-player-plugin/.md5sum

@@ -1 +1 @@
-7f122a6bf62403c2916f37df48c18768  install_flash_player_10_linux.tar.gz
+3f250cc33acac7a600fca60ac834455c  flash-plugin-10.1.82.76-release.i386.rpm

flash-player-plugin/Pkgfile

@@ -2,14 +2,16 @@
 # URL: http://www.adobe.com/products/flashplayer/
 # Maintainer: Jose V Beneyto, sepen at crux dot nu
 # Packager: Matt Housh, jaeger at crux dot nu
-# Depends on:
+# Depends on: rpm2targz
 
 name=flash-player-plugin
-version=10.1
+version=10.1.82.76
 release=1
-source=(http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_${version%%.*}_linux.tar.gz)
+source=(http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-$version-release.i386.rpm)
 
 build() {
-  install -D -m 0755 libflashplayer.so \
+  rpm2targz ${source##*/}
+  tar xvzf $(basename ${source##*/} .rpm).tar.gz
+  install -D -m 0755 usr/lib/flash-plugin/libflashplayer.so \
     $PKG/usr/lib/mozilla/plugins/libflashplayer.so
 }

samhain/.md5sum

@@ -1 +1 @@
-0d5eda09948faf2f0947408c84a61d88  samhain_signed-2.7.1.tar.gz
+db070a0a4d1093c5cb9f9c2f303e3bbf  samhain_signed-2.7.2b.tar.gz

samhain/Pkgfile

@@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, juergen dot daubert at t-online dot de
 
 name=samhain
-version=2.7.1
+version=2.7.2b
 release=1
 source=(http://la-samhna.de/archive/${name}_signed-$version.tar.gz)
 

wpa_supplicant/.md5sum

@@ -1 +1 @@
-8985b1030d753e5f74f8acfc34e591bb  wpa_supplicant-0.6.10.tar.gz
+f516f191384a9a546e3f5145c08addda  wpa_supplicant-0.7.3.tar.gz

wpa_supplicant/Pkgfile

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