Tue Aug 16 23:14:31 UTC 2011

25 files changed, 322 insertions, 96 deletions

diff --git a/community/csfml/PKGBUILD b/community/csfml/PKGBUILD
index 34c22d46a..597c18073 100644
--- a/community/csfml/PKGBUILD
+++ b/community/csfml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 49432 2011-06-16 04:45:37Z svenstaro $
+# $Id: PKGBUILD 54271 2011-08-16 02:58:49Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=csfml
@@ -6,7 +6,7 @@ pkgname=csfml
 _git=true
 
 if [[ "${_git}" = "true" ]]; then
-    pkgver=1.99.git20110616
+    pkgver=1.99.git20110816
 fi
 
 pkgrel=1
@@ -17,8 +17,8 @@ license=('zlib')
 depends=('sfml')
 makedepends=('git' 'cmake' 'doxygen')
 
-_gitroot='https://github.com/LaurentGomila/SFML.git'
-_gitname='SFML'
+_gitroot='https://github.com/LaurentGomila/CSFML.git'
+_gitname='CSFML'
 
 build() {
   cd "$srcdir"
@@ -39,7 +39,6 @@ build() {
   cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build"
   cd "$srcdir/$_gitname-build"
 
-  cd bindings/c/
   mkdir build && cd build
   cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
         -DBUILD_DOC=true
@@ -48,7 +47,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_gitname-build/bindings/c/build/"
+  cd "$srcdir/$_gitname-build/build/"
 
   make DESTDIR="$pkgdir/" install
 
diff --git a/community/nethack/PKGBUILD b/community/nethack/PKGBUILD
index fafecfd18..a3da43710 100644
--- a/community/nethack/PKGBUILD
+++ b/community/nethack/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 36702 2011-01-06 09:48:20Z schuay $
+# $Id: PKGBUILD 54249 2011-08-15 09:38:46Z schuay $
 # Maintainer : schuay <jakob.gruber@gmail.com>
 # Contributor : kevin <kevin@archlinux.org>
 # Contributor : Christian Schmidt <mucknert@gmx.net>
 # Contributor : Markus Meissner <markus@meissna.de>
+# Contributor : Nick Erdmann <erdmann@date.upb.de>
 
 pkgname=nethack
 pkgver=3.4.3
-pkgrel=5
+pkgrel=6
 pkgdesc='A single player dungeon exploration game'
 arch=('i686' 'x86_64')
 url="http://www.nethack.org/index.html"
 license=('custom')
 depends=('ncurses' 'gzip')
+install=nethack.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-${pkgver//.}-src.tgz")
 md5sums=('21479c95990eefe7650df582426457f9')
 
@@ -19,7 +21,7 @@ build(){
   cd $srcdir/$pkgname-$pkgver/
   sh sys/unix/setup.sh
 
-  sed -e '/define HACKDIR/ s|/usr/games/lib/nethackdir|/usr/share/nethack/|' \
+  sed -e '/define HACKDIR/ s|/usr/games/lib/nethackdir|/var/games/nethack/|' \
       -e '/^#define COMPRESS\s/ s|/usr/bin/compress|/bin/gzip|' \
       -e '/^#define COMPRESS_EXTENSION/ s|".Z"|".gz"|' \
       -e 's|^/\* \(#define DLB\) \*/|\1|' -i include/config.h
@@ -33,13 +35,13 @@ build(){
   # we are setting up for setgid games, so modify all necessary permissions
   # to allow full access for groups
 
-  sed -e '/^GAMEDIR\s*=/ s|/games/.*$|/share/$(GAME)|' \
+  sed -e '/^GAMEDIR\s*=/ s|/games/.*$|/var/games/$(GAME)|' \
       -e '/^GAMEUID\s*=/ s|games|root|' \
       -e '/^GAMEGRP\s*=/ s|bin|games|' \
       -e '/^GAMEPERM\s*=/ s|04755|02755|' \
       -e '/^FILEPERM\s*=/ s|0644|0664|' \
       -e '/^DIRPERM\s*=/ s|0755|0775|' \
-      -e '/^SHELLDIR\s*=/ s|/games|/bin|' -i Makefile
+      -e '/^SHELLDIR\s*=/ s|/games|/usr/bin|' -i Makefile
 
   sed -e "/^MANDIR\s*=/s|/usr/man/man6|$pkgdir/usr/share/man/man6|" -i doc/Makefile
 
@@ -50,13 +52,14 @@ package() {
   cd $srcdir/$pkgname-$pkgver/
 
   install -dm755 $pkgdir/usr/share/{man/man6,doc/nethack}
-  make PREFIX=$pkgdir/usr install manpages
-  sed -e "s|HACKDIR=$pkgdir/usr/|HACKDIR=/usr/|" \
+  install -dm775 $pkgdir/var/games/
+  make PREFIX=$pkgdir install manpages
+  sed -e "s|HACKDIR=$pkgdir/|HACKDIR=/|" \
       -e 's|HACK=$HACKDIR|HACK=/usr/lib/nethack|' \
       -i $pkgdir/usr/bin/nethack
 
   install -dm755 $pkgdir/usr/lib/nethack
-  mv $pkgdir/usr/share/nethack/{nethack,recover} $pkgdir/usr/lib/nethack/
+  mv $pkgdir/var/games/nethack/{nethack,recover} $pkgdir/usr/lib/nethack/
 
   install -Dm644 doc/Guidebook.txt $pkgdir/usr/share/doc/nethack/Guidebook.txt
       
diff --git a/community/nethack/nethack.install b/community/nethack/nethack.install
new file mode 100644
index 000000000..66ec2aeb5
--- /dev/null
+++ b/community/nethack/nethack.install
@@ -0,0 +1,12 @@
+pre_upgrade() {
+  if(test `vercmp '3.4.3-5' "$2"` -ge 0); then
+    mv /usr/share/nethack /tmp/nethack-backup
+  fi
+}
+
+post_upgrade() {
+  if(test `vercmp '3.4.3-5' "$2"` -ge 0); then
+    rm -rf /var/games/nethack
+    mv /tmp/nethack-backup /var/games/nethack
+  fi
+}
diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD
index 6049cbb8f..695144eee 100644
--- a/community/ntop/PKGBUILD
+++ b/community/ntop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id$
+# $Id: PKGBUILD 54260 2011-08-15 15:17:24Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=ntop
-pkgver=4.0.3
+pkgver=4.1.0
 pkgrel=1
 pkgdesc='A network traffic probe that shows the network usage.'
 arch=('i686' 'x86_64')
@@ -12,10 +12,10 @@ license=('GPL')
 depends=('libevent' 'libpcap' 'gd' 'glib' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua')
 options=('!libtool' '!makeflags')
 install='ntop.install'
-source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tgz"
+source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tar.gz"
         'ntop'
         'ntop.conf.d')
-md5sums=('f064393a2090e5bda102cd49c2707789'
+md5sums=('116df99cf548431393991ea15443c52f'
          '7b0d7bb57432e768ff387e9f7236f87c'
          '6a9371de1dcf31d8ef13a4cf349c02b3')
 
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index 612d07486..299b12a65 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 37601 2011-01-15 09:55:00Z giovanni $
+# $Id: PKGBUILD 54266 2011-08-16 00:37:12Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
 
 pkgname=sigil
 _pkgname=Sigil
-pkgver=0.3.4
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="A WYSIWYG ebook editor"
 arch=('i686' 'x86_64') 
@@ -15,7 +15,7 @@ makedepends=('cmake')
 install=sigil.install
 source=(http://${pkgname}.googlecode.com/files/${_pkgname}-${pkgver}-Code.zip
         ${pkgname}.desktop)
-md5sums=('6f83a8ee12d6f5918fe50b8314e63760'
+md5sums=('b36b8178446647f7dd320a6b335a40ba'
          'fef6aa492af487ccccd6b133635cee5a')
 
 build() {
@@ -36,13 +36,13 @@ build() {
 package() {
   cd ${_pkgname}-${pkgver}-Code/build
 
-  make install DESTDIR="${pkgdir}" || return 1
+  make install DESTDIR="${pkgdir}"
 
-  install -d -m 0755 "${pkgdir}"/usr/share/applications || return 1
-  install -m 0644 "${srcdir}"/${pkgname}.desktop "${pkgdir}"/usr/share/applications || return 1
+  install -d -m 0755 "${pkgdir}"/usr/share/applications
+  install -m 0644 "${srcdir}"/${pkgname}.desktop "${pkgdir}"/usr/share/applications
 
   for _pic in 16 32 48 128 256; do
     install -D -m 0644 ../src/Sigil/Resource_Files/icon/app_icon_${_pic}.png \
-      "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/${pkgname}.png || return 1
+      "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/${pkgname}.png
   done
 }
diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD
index 158d8b732..8a893538b 100644
--- a/community/stone-soup/PKGBUILD
+++ b/community/stone-soup/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=stone-soup
 pkgver=0.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting"
 arch=('i686' 'x86_64')
 url='http://crawl.develz.org/'
@@ -14,13 +14,14 @@ install=('stone-soup.install')
 source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.bz2"
         "${pkgname}.desktop")
 md5sums=('3f73fb051215df3633a554d81e67a452'
-         '98be780cddb2a0915bbab15ad93644f1')
+         'afdacb4c39342e75674efb88eeb3da21')
 
 build() {
 
     cd "${srcdir}/stone_soup-${pkgver}/source"
 
-    # adjust makefile to use /usr/bin, owner root:root, disable setgid on executable
+    # adjust makefile to use /usr/bin, owner root:root,
+    # disable setgid on executable
 
     sed -i 's|bin_prefix    := bin|bin_prefix    := usr/bin|' makefile
     sed -i 's/INSTALL_UGRP := games:games/INSTALL_UGRP := root:root/' makefile
@@ -29,7 +30,7 @@ build() {
     # first build and install tiles version
 
     make DESTDIR="${pkgdir}" \
-         SAVEDIR="~/.stone-soup/" \
+         SAVEDIR="~/.crawl/" \
          DATADIR="/usr/share/${pkgname}/data" \
          USE_UNICODE=y \
          TILES=y \
@@ -42,19 +43,22 @@ build() {
     # then build and install console version
 
     make DESTDIR="${pkgdir}" \
-         SAVEDIR="~/.stone-soup/" \
+         SAVEDIR="~/.crawl/" \
          DATADIR="/usr/share/${pkgname}/data" \
          USE_UNICODE=y \
          install
 
     # install crawl license
 
-    install -D -m644 ../licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
+    install -D -m644 ../licence.txt \
+        "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
 
     # install icon and .desktop file
 
-    install -D -m644 dat/tiles/stone_soup_icon-32x32.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-    install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    install -D -m644 dat/tiles/stone_soup_icon-32x32.png \
+        "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -D -m644 "${srcdir}/${pkgname}.desktop" \
+        "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
 }
 
diff --git a/community/stone-soup/stone-soup.desktop b/community/stone-soup/stone-soup.desktop
index f87d084c8..f76343515 100644
--- a/community/stone-soup/stone-soup.desktop
+++ b/community/stone-soup/stone-soup.desktop
@@ -1,11 +1,8 @@
-#!/usr/bin/env xdg-open
 [Desktop Entry]
-Version=1.0
 Type=Application
-Name=Stone Soup
-GenericName=Crawl Stone Soup
+Name=Dungeon Crawl Stone Soup 
 Comment=An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting
 Icon=stone-soup.png
 Exec=/usr/bin/crawl-tiles
-Categories=Game;ArcadeGame
+Categories=Game;AdventureGame
 
diff --git a/community/stone-soup/stone-soup.install b/community/stone-soup/stone-soup.install
index 08cb7e01d..2320123e2 100644
--- a/community/stone-soup/stone-soup.install
+++ b/community/stone-soup/stone-soup.install
@@ -1,12 +1,11 @@
 post_upgrade() {
 
-    [[ $(vercmp $2 0.7.1) -ge 0 ]] && return
+    # return if old pkgver >= 0.9.0-2
+    [[ $(vercmp $2 0.9.0-2) -ge 0 ]] && return
 
     echo "---------------------------------------------------------------------
-    stone-soup saves have moved to ~/.stone-soup.
-    if you want to keep your old saves, move /var/games/stone-soup to
-    ~/.stone-soup with your user as owner.
-
-    stone-soup now also includes the tiles version (crawl-tiles)
+    stone-soup saves have moved to ~/.crawl.
+    If you want to keep your old saves, move ~/.stone-soup to
+    ~/.crawl.
 ---------------------------------------------------------------------"
 }
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index bfb657eb9..388b3ed53 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53837 2011-08-08 20:19:32Z ibiru $
+# $Id: PKGBUILD 54264 2011-08-15 19:54:32Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
-pkgver=4.1.0
-pkgrel=5
+pkgver=4.1.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -15,8 +15,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}
         UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf
         virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
         10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh
-        change_default_driver_dir.patch
-        fix-kernel-panic.patch)
+        change_default_driver_dir.patch)
 _kernver=3.0-ARCH
 
 build() {
@@ -26,7 +25,6 @@ build() {
     patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
-    patch -Np2 -i "$srcdir/fix-kernel-panic.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -195,8 +193,8 @@ package_virtualbox-archlinux-modules(){
 
     sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-archlinux-modules.install"
 }
-md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31'
-         '24056c13ddbe2c9b5d135e8c96a53a11'
+md5sums=('945d2c94c15a4f47280be4b01b67e244'
+         'cc75a674add48f8b25af2b5e69530a6f'
          '44efb3c4be214daa453a317d527f1f30'
          '32a232b43852b9a08cb11a7bcd64b347'
          '5f85710e0b8606de967716ded7b2d351'
@@ -204,5 +202,4 @@ md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31'
          '4cf75d9c091199a47a7a1bc2f4e347d9'
          '78ffa67ff131680f1d2b6f06d4325c5b'
          '790a1456345fe74b6b714d71f90a1c6d'
-         '97e193f050574dd272a38e5ee5ebe62b'
-         '863107a852607b758b356cd53850679d')
+         '97e193f050574dd272a38e5ee5ebe62b')
diff --git a/core/dash/PKGBUILD b/core/dash/PKGBUILD
index 8105f73a3..3aeb4b3fe 100644
--- a/core/dash/PKGBUILD
+++ b/core/dash/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 132155 2011-07-21 15:03:34Z dan $
+# $Id: PKGBUILD 135572 2011-08-15 22:58:37Z tomegun $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=dash
 pkgver=0.5.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A POSIX compliant shell that aims to be as small as possible"
 arch=('i686' 'x86_64')
 url="http://gondor.apana.org.au/~herbert/dash/"
 license=('BSD')
-groups=('base')
 depends=('glibc')
+install=dash.install
 source=("http://gondor.apana.org.au/~herbert/dash/files/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('a3ebc16f2e2c7ae8adf64e5e62ae3dcb631717c6')
 
diff --git a/core/dash/dash.install b/core/dash/dash.install
new file mode 100644
index 000000000..6b04cba30
--- /dev/null
+++ b/core/dash/dash.install
@@ -0,0 +1,11 @@
+post_install() {
+	grep -q '/bin/dash' etc/shells || echo '/bin/dash' >> etc/shells
+}
+
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+	sed -i '/^\/bin\/dash/d' etc/shells
+}
diff --git a/core/libedit/PKGBUILD b/core/libedit/PKGBUILD
index 1d7c56fb8..280b04ec4 100644
--- a/core/libedit/PKGBUILD
+++ b/core/libedit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132376 2011-07-23 23:23:53Z bisson $
+# $Id: PKGBUILD 135574 2011-08-15 23:39:35Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Roman Cheplyaka <roma@ro-che.info>
 
 pkgname=libedit
-pkgver=20110709_3.0
+pkgver=20110802_3.0
 pkgrel=1
 pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('BSD')
 depends=('ncurses')
 options=('!libtool')
 source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz")
-sha1sums=('63a62e0c52a0a2b3c933f400039e24724498cfb4')
+sha1sums=('b06e3cf248a4235617c71454e15ca3a54a61d467')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver/_/-}"
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index a2f1e5010..b52bc6361 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,31 +1,30 @@
-# $Id: PKGBUILD 131232 2011-07-12 03:27:34Z eric $
+# $Id: PKGBUILD 135564 2011-08-15 21:08:52Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.86
-_pkgverlvm=${pkgver}
+pkgver=2.02.87
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
 groups=('base')
-source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz
+source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz
         lvm2_install
         lvm2_hook
         11-dm-initramfs.rules)
-md5sums=('3b42dec4d15ad106302a35149082a20e'
+md5sums=('4c36c7f216edfe65a6193d2adc389ecd'
          'dcb82506d732cc7b10159a89b579dba8'
          '8d613b84a175cd85f752a75198e40e15'
          '69e40679cd8b3658bfc619e48baae125')
-sha1sums=('f435b389cc11c8f415244fe382f3839d1676770c'
+sha1sums=('4b217d405133bdc6120568253574a49fae2caa4f'
           '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
           'a0e0513c2efb183006e57e595d93ce18be297928'
           'f6a554eea9557c3c236df2943bb6e7e723945c41')
 
 build() {
-  cd "${srcdir}/LVM2.${_pkgverlvm}"
+  cd "${srcdir}/LVM2.${pkgver}"
   sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh
   unset LDFLAGS
   ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
@@ -40,7 +39,7 @@ package_device-mapper() {
   url="http://sourceware.org/dm/"
   depends=('glibc' 'udev')
 
-  cd "${srcdir}/LVM2.${_pkgverlvm}"
+  cd "${srcdir}/LVM2.${pkgver}"
   make DESTDIR="${pkgdir}" install_device-mapper
   # extra udev rule for device-mapper in initramfs
   install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules"
@@ -53,12 +52,10 @@ package_lvm2() {
   backup=('etc/lvm/lvm.conf')
   options=('!makeflags')
 
-  cd "${srcdir}/LVM2.${_pkgverlvm}"
+  cd "${srcdir}/LVM2.${pkgver}"
   make DESTDIR="${pkgdir}" install_lvm2
   # install applib
-  cd liblvm
-  make DESTDIR="${pkgdir}" install
-  cd ..
+  make -C liblvm DESTDIR="${pkgdir}" install
   # /etc directories
   install -d "${pkgdir}"/etc/lvm/{archive,backup}
   # mkinitcpio hook
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD
index 181602cc3..7aa7466b0 100644
--- a/extra/blender/PKGBUILD
+++ b/extra/blender/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 130835 2011-07-08 08:34:11Z eric $
+# $Id: PKGBUILD 135566 2011-08-15 21:13:25Z eric $
 # Contributor: John Sowiak <john@archlinux.org>
 # Maintainer: tobias <tobias@archlinux.org>
 
 # Apparently, the blender guys refuse to release source tarballs for
 # intermediate releases that deal mainly with binaries but incorporate tiny
 # minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only we make a messy PKGBUILD that can checkout svn
+# look for release numbers only, we make a messy PKGBUILD that can checkout svn
 # release if necessary.
 
-_svn=true
-#_svn=false
+#_svn=true
+_svn=false
 
 pkgname=blender
-pkgver=2.58a
+pkgver=2.59
 pkgrel=1
 epoch=2
 pkgdesc="A fully integrated 3D graphics creation suite"
@@ -25,8 +25,8 @@ depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
 makedepends=('cmake') # 'subversion'
 install=blender.install
 if [ $_svn = false ]; then
-  source=(http://download.blender.org/source/$pkgname-$pkgver.tgz)
-  md5sums=('04a0d43ff27aa0abf14ca559f6a6bf67')
+  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
+  md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe')
 else
   source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
   md5sums=('7579d1139d0d6025df8afcfca64a65c4')
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index fbbc8dff7..10472ff5b 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 134967 2011-08-09 17:31:55Z andyrtr $
+# $Id: PKGBUILD 135549 2011-08-15 05:01:28Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -6,7 +6,7 @@
 
 pkgname=dovecot
 pkgver=2.0.13
-pkgrel=2
+pkgrel=3
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
 url="http://dovecot.org/"
diff --git a/extra/dovecot/dovecot.install b/extra/dovecot/dovecot.install
index ddec178a4..873b82e2f 100644
--- a/extra/dovecot/dovecot.install
+++ b/extra/dovecot/dovecot.install
@@ -28,9 +28,6 @@ post_install() {
   else
     useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull -r dovenull &> /dev/null
   fi 
-  
-  # harden some permissions
-  chgrp dovenull /var/run/dovecot/login
 }
 
 # arg 1:  the new package version
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index f09d64d55..0d61e4595 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 130244 2011-07-04 19:18:20Z bisson $
+# $Id: PKGBUILD 135558 2011-08-15 17:17:19Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=feh
-pkgver=1.14.2
+pkgver=1.15
 pkgrel=1
 pkgdesc='Fast, lightweight image viewer which uses imlib2'
 arch=('i686' 'x86_64')
@@ -15,14 +15,14 @@ depends=('giblib' 'curl' 'libxinerama')
 optdepends=('perl: feh-cam, webcam wrapper for feh')
 makedepends=('libxt')
 source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('55af60f35fb21825e5450b6713f5d781f7a34cde')
+sha1sums=('fb926ba90d494f890f271243ae599063b76c9957')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make PREFIX=/usr
 }
 
-package(){
+package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make PREFIX=/usr DESTDIR="${pkgdir}" install
 	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 9593435ea..6e6e70550 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 132361 2011-07-23 15:00:18Z giovanni $
+# $Id: PKGBUILD 135575 2011-08-16 00:19:32Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2011.07.21
+pkgver=2011.08.13
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('9377b34ad465950d423bac5f6f1e5307')
+md5sums=('0ef56c4bf6be8cc4e31656c7293e50de')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 67a5a1755..255c0c3ce 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132840 2011-07-26 13:33:34Z juergen $
+# $Id: PKGBUILD 135557 2011-08-15 13:18:59Z dreisner $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
 pkgver=5.24.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/oxygen-gtk/PKGBUILD b/extra/oxygen-gtk/PKGBUILD
index fa0903bdc..c0a63047a 100644
--- a/extra/oxygen-gtk/PKGBUILD
+++ b/extra/oxygen-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 133245 2011-07-27 22:51:02Z andrea $
+# $Id: PKGBUILD 135550 2011-08-15 12:45:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=oxygen-gtk
-pkgver=1.1.1
+pkgver=1.1.2
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('gtk2')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('8e7454f2a1a97f7580995276d78aa35d')
+md5sums=('f4d7f6203d8bcf41ff3403333f399628')
 
 build() {
   cd "${srcdir}"
diff --git a/testing/diffutils/PKGBUILD b/testing/diffutils/PKGBUILD
new file mode 100644
index 000000000..871dcd363
--- /dev/null
+++ b/testing/diffutils/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 135546 2011-08-15 04:47:49Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=diffutils
+pkgver=3.1
+pkgrel=1
+pkgdesc="Utility programs used for creating patch files"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/diffutils"
+license=('GPL3')
+groups=('base')
+depends=('glibc' 'sh')
+install=diffutils.install
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+md5sums=('fbb1d804849fa32ff5853f028a3be46f')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/diffutils/diffutils.install b/testing/diffutils/diffutils.install
new file mode 100644
index 000000000..ae6655fba
--- /dev/null
+++ b/testing/diffutils/diffutils.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(diffutils.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD
new file mode 100644
index 000000000..4a6a3e29f
--- /dev/null
+++ b/testing/util-linux/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 135567 2011-08-15 22:49:41Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=util-linux
+pkgver=2.19.1
+pkgrel=3
+pkgdesc="Miscellaneous system utilities for Linux"
+url="http://userweb.kernel.org/~kzak/util-linux-ng/"
+arch=('i686' 'x86_64')
+groups=('base')
+depends=('bash' 'ncurses>=5.7' 'zlib' 'filesystem')
+replaces=('linux32' 'util-linux-ng')
+conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2')
+provides=('linux32' "util-linux-ng=${pkgver}")
+license=('GPL2')
+options=('!libtool')
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.19/${pkgname}-${pkgver}.tar.bz2
+       mount-segfault-2.19.1.patch
+       two-component-linux.patch)
+optdepends=('perl: for chkdupexe support')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # add support for linux 3.0, which is needed mkswap
+  patch -Np1 -i ../two-component-linux.patch
+  # fix https://bugs.archlinux.org/task/24261
+  patch -Np1 -i ../mount-segfault-2.19.1.patch
+  # hardware clock
+  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c
+  ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-partx
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -dm755 "${pkgdir}/var/lib/hwclock"
+  make DESTDIR="${pkgdir}" install
+}
+md5sums=('3eab06f05163dfa65479c44e5231932c'
+         '3247b52f0e4b8044f23f2f7218e2fdea'
+         '6eb23edb484adf7192e107d1c6d94bd3')
diff --git a/testing/util-linux/mount-segfault-2.19.1.patch b/testing/util-linux/mount-segfault-2.19.1.patch
new file mode 100644
index 000000000..7bcb3bc05
--- /dev/null
+++ b/testing/util-linux/mount-segfault-2.19.1.patch
@@ -0,0 +1,84 @@
+From f53edda83ebcfd7015c3f35196d6cbd7bc2d8369 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Wed, 11 May 2011 16:57:27 +0200
+Subject: [PATCH] mount: -a segfaults when 4th field is omitted (mount
+ options)
+
+ # echo 'tmpd /tmp/x tmpfs' >> /etc/fstab
+ # mkdir /tmp/x
+ # mount -a
+ segfault
+
+Reported-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ mount/mount.c        |    8 +++++---
+ mount/mount_mntent.c |    5 +++--
+ mount/sundries.c     |    2 ++
+ 3 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/mount/mount.c b/mount/mount.c
+index ba71149..29963c2 100644
+--- a/mount/mount.c
++++ b/mount/mount.c
+@@ -1163,7 +1163,9 @@ is_mounted_same_loopfile(const char *node0, const char *loopfile, unsigned long
+ 			res = loopfile_used_with((char *) mnt->m.mnt_fsname,
+ 					loopfile, offset);
+ 
+-		else if ((p = strstr(mnt->m.mnt_opts, "loop="))) {
++		else if (mnt->m.mnt_opts &&
++			 (p = strstr(mnt->m.mnt_opts, "loop=")))
++		{
+ 			char *dev = xstrdup(p+5);
+ 			if ((p = strchr(dev, ',')))
+ 				*p = '\0';
+@@ -2052,8 +2054,8 @@ is_fstab_entry_mounted(struct mntentchn *mc, int verbose)
+ 		goto yes;
+ 
+ 	/* extra care for loop devices */
+-	if ((strstr(mc->m.mnt_opts, "loop=") ||
+-	     (stat(mc->m.mnt_fsname, &st) == 0 && S_ISREG(st.st_mode)))) {
++	if ((mc->m.mnt_opts && strstr(mc->m.mnt_opts, "loop=")) ||
++	    (stat(mc->m.mnt_fsname, &st) == 0 && S_ISREG(st.st_mode))) {
+ 
+ 		char *p = get_option_value(mc->m.mnt_opts, "offset=");
+ 		uintmax_t offset = 0;
+diff --git a/mount/mount_mntent.c b/mount/mount_mntent.c
+index d90def3..f42c0ad 100644
+--- a/mount/mount_mntent.c
++++ b/mount/mount_mntent.c
+@@ -70,7 +70,7 @@ my_addmntent (mntFILE *mfp, struct my_mntent *mnt) {
+ 	m1 = mangle(mnt->mnt_fsname);
+ 	m2 = mangle(mnt->mnt_dir);
+ 	m3 = mangle(mnt->mnt_type);
+-	m4 = mangle(mnt->mnt_opts);
++	m4 = mnt->mnt_opts ? mangle(mnt->mnt_opts) : "rw";
+ 
+ 	res = fprintf (mfp->mntent_fp, "%s %s %s %s %d %d\n",
+ 		       m1, m2, m3, m4, mnt->mnt_freq, mnt->mnt_passno);
+@@ -78,7 +78,8 @@ my_addmntent (mntFILE *mfp, struct my_mntent *mnt) {
+ 	free(m1);
+ 	free(m2);
+ 	free(m3);
+-	free(m4);
++	if (mnt->mnt_opts)
++		free(m4);
+ 	return (res < 0) ? 1 : 0;
+ }
+ 
+diff --git a/mount/sundries.c b/mount/sundries.c
+index ae4501a..2dec37f 100644
+--- a/mount/sundries.c
++++ b/mount/sundries.c
+@@ -217,6 +217,8 @@ matching_opts (const char *options, const char *test_opts) {
+ 
+      if (test_opts == NULL)
+ 	  return 1;
++     if (options == NULL)
++	  options = "";
+ 
+      len = strlen(test_opts);
+      q = alloca(len+1);
+-- 
+1.7.5.1
+
diff --git a/testing/util-linux/two-component-linux.patch b/testing/util-linux/two-component-linux.patch
new file mode 100644
index 000000000..1b65ca295
--- /dev/null
+++ b/testing/util-linux/two-component-linux.patch
@@ -0,0 +1,32 @@
+From fa7e0d6d442de9f5940f99fd93f4522602439131 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 6 Jun 2011 12:35:26 +0200
+Subject: [PATCH] lib: [linux_version.c] accommodate two-component linux
+ version (e.g. 3.0)
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ lib/linux_version.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/linux_version.c b/lib/linux_version.c
+index f9fbd8d..ada566a 100644
+--- a/lib/linux_version.c
++++ b/lib/linux_version.c
+@@ -16,10 +16,10 @@ get_linux_version (void)
+ 		return kver;
+ 	if (uname (&uts))
+ 		kver = 0;
+-	else if (sscanf (uts.release, "%d.%d.%d", &major, &minor, &teeny) != 3)
+-		kver = 0;
+-	else
++	else if (sscanf (uts.release, "%d.%d.%d", &major, &minor, &teeny) == 3)
+ 		kver = KERNEL_VERSION (major, minor, teeny);
++	else if (sscanf (uts.release, "%d.%d", &major, &minor) == 2)
++		kver = KERNEL_VERSION (major, minor, 0);
+ 
+ 	return kver;
+ }
+-- 
+1.7.6
+