Merge branch '2.2' into 2.3

firefox-flash-plugin/.md5sum

@@ -1 +1 @@
-3a72f45a173126181022cff9029a1bb3  install_flash_player_7_linux.tar.gz
+76b38231a68995935185aa42dfda9db7  install_flash_player_9_linux.tar.gz

firefox-flash-plugin/Pkgfile

@@ -4,12 +4,13 @@
 # Depends on: firefox
 
 name=firefox-flash-plugin
-version=7.0r68
+version=9.0.31.0
 release=1
-source=(http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_7_linux.tar.gz)
+source=(http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz)
 
 build() {
 	mkdir -p $PKG/usr/lib/firefox/plugins
-	cp install_flash_player_7_linux/{libflashplayer.so,flashplayer.xpt} $PKG/usr/lib/firefox/plugins
+	cp install_flash_player_9_linux/{libflashplayer.so,flashplayer.xpt} \
+		$PKG/usr/lib/firefox/plugins
 	chown -R root:root $PKG
 }

squid/.md5sum

@@ -1,3 +1,3 @@
 9ce54d2a0a7959df4470178e7aac5e27  squid
-7e8eed297ceb4f3067c960d4c4d04e87  squid-2.6.STABLE7.tar.bz2
+95997d6cb38fdb562ecb790c553f9cfc  squid-2.6.STABLE9.tar.bz2
 338811a521477a86aaf2880c96d3173a  squid.conf

squid/Pkgfile

@@ -3,7 +3,7 @@
 # Maintainer:  Jürgen Daubert, juergen dot daubert at t-online dot de
 
 name=squid
-version=2.6.STABLE7
+version=2.6.STABLE9
 release=1
 source=(http://www.squid-cache.org/Versions/v2/2.6/$name-$version.tar.bz2 \
         squid.conf squid)
@@ -27,7 +27,7 @@ build () {
 
     mkdir -p $PKG/var/log/squid
     chmod 0700 $PKG/var/{squid,log/squid}
-    chown -R squid.squid $PKG/var/{squid,log/squid}
+    chown -R squid:squid $PKG/var/{squid,log/squid}
     install -D -m 755 $SRC/squid $PKG/etc/rc.d/squid
     install -m 644  $SRC/squid.conf $PKG/etc/squid
 }

uw-imap/.md5sum

@@ -1 +1 @@
-db28da518698ec006edbfc5c96bbed28  imap-2006d.tar.Z
+a183c975a00198b0f5668ae311254aca  imap-2006e.tar.Z

uw-imap/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  openssl
 
 name=uw-imap
-version=2006d
+version=2006e
 release=1
 source=(ftp://ftp.cac.washington.edu/imap/imap-$version.tar.Z)