Fri Jan 31 03:41:19 UTC 2014

19 files changed, 231 insertions, 217 deletions

diff --git a/community/augeas/PKGBUILD b/community/augeas/PKGBUILD
index 52ef6f776..c73aea724 100644
--- a/community/augeas/PKGBUILD
+++ b/community/augeas/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 100130 2013-11-01 20:20:20Z spupykin $
+# $Id: PKGBUILD 105015 2014-01-30 08:53:11Z spupykin $
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Jon Nordby <jononor@gmail.com>
 
 pkgname=augeas
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="A configuration editing tool that parses config files and transforms them into a tree"
 arch=('i686' 'x86_64')
 url="http://augeas.net"
 license=('LGPL')
 depends=('libxml2' 'gcc-libs')
 source=(http://download.augeas.net/augeas-$pkgver.tar.gz{,.sig})
-md5sums=('520ce983457ff9ffa3816bc41a9f328b'
+md5sums=('dce2f52cbd20f72c7da48e014ad48076'
          'SKIP')
 
 build() {
diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD
index 2169587cd..04b247bda 100644
--- a/community/instead/PKGBUILD
+++ b/community/instead/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 104923 2014-01-28 11:19:00Z spupykin $
+# $Id: PKGBUILD 105061 2014-01-30 20:23:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Peter Kosyh <p.kosyhgmail.com>
 
 pkgname=instead
-pkgver=2.0.1
+pkgver=2.0.2
 pkgrel=1
 pkgdesc="a quest interpreter"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua')
 optdepends=('instead-launcher: install and update INSTEAD games from net')
 source=(http://downloads.sourceforge.net/project/instead/instead/${pkgver}/instead_${pkgver}.tar.gz)
-md5sums=('28adadd80c3726ebd3856aa3fa372ea3')
+md5sums=('040d8378df4695aed771d6699e1cd7d8')
 
 build() {
   cd "${srcdir}/instead-${pkgver}"
diff --git a/community/libvdpau-va-gl/PKGBUILD b/community/libvdpau-va-gl/PKGBUILD
index 160f8685b..6134346c9 100644
--- a/community/libvdpau-va-gl/PKGBUILD
+++ b/community/libvdpau-va-gl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 104362 2014-01-19 13:06:16Z bpiotrowski $
+# $Id: PKGBUILD 105035 2014-01-30 12:39:32Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Behem0th <grantipak@gmail.com>
 
 pkgname=libvdpau-va-gl
-pkgver=0.3.1
+pkgver=0.3.2
 pkgrel=1
 pkgdesc='VDPAU driver with OpenGL/VAAPI backend'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('LGPL3')
 depends=('libvdpau' 'libva' 'libgl' 'ffmpeg' 'glu')
 makedepends=('cmake')
 source=(https://github.com/i-rinat/$pkgname/archive/v$pkgver.tar.gz)
-md5sums=('2ec5c68282aac9720525e16e858cd599')
+md5sums=('3fea8e94a67cd54c2f1d3ce1907c910a')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD
index 4a24f7182..82d2ea2d7 100644
--- a/community/luakit/PKGBUILD
+++ b/community/luakit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104487 2014-01-21 17:50:07Z bpiotrowski $
+# $Id: PKGBUILD 105053 2014-01-30 18:41:11Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com>
@@ -6,15 +6,18 @@
 pkgname=luakit
 pkgver=2012.09.13.r1
 _pkgver=2012.09.13-r1
-pkgrel=6
+pkgrel=7
 pkgdesc='Fast, small, Webkit based browser framework extensible by Lua'
 arch=('i686' 'x86_64')
 url='http://mason-larobina.github.com/luakit/'
 license=('GPL3')
 depends=('webkitgtk2' 'lua51-filesystem' 'libunique' 'desktop-file-utils' 'luajit')
 makedepends=('help2man')
+backup=(etc/xdg/luakit/binds.lua etc/xdg/luakit/globals.lua
+        etc/xdg/luakit/modes.lua etc/xdg/luakit/rc.lua etc/xdg/luakit/theme.lua
+        etc/xdg/luakit/webview.lua etc/xdg/luakit/window.lua)
 options=(!makeflags)
-install='luakit.install'
+install=luakit.install
 source=($pkgname-$pkgver.tar.gz::https://github.com/mason-larobina/luakit/tarball/$_pkgver)
 md5sums=('77b02e6d19ba021409f1778fddd94a42')
 
diff --git a/community/mate-disk-utility/PKGBUILD b/community/mate-disk-utility/PKGBUILD
new file mode 100644
index 000000000..84ab0f8da
--- /dev/null
+++ b/community/mate-disk-utility/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 105033 2014-01-30 12:06:00Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-disk-utility
+pkgver=1.6.2
+pkgrel=1
+pkgdesc="Disk management application for MATE."
+url="https://github.com/NiceandGently/mate-disk-utility"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('avahi' 'dbus' 'gtk2' 'libatasmart' 'libgnome-keyring' 'libnotify'
+         'libunique' 'mate-file-manager' 'udisks')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+options=('!emptydirs')
+source=("https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz")
+md5sums=('ff3b520a06c367124558cdd252f1956d')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./autogen.sh \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --libexecdir=/usr/lib/${pkgname} \
+        --enable-gnome-keyring \
+        --disable-static \
+        --disable-scrollkeeper
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-file-archiver/mate-file-archiver.install b/community/mate-disk-utility/mate-disk-utility.install
index bf6781f93..94794eb8d 100644
--- a/community/mate-file-archiver/mate-file-archiver.install
+++ b/community/mate-disk-utility/mate-disk-utility.install
@@ -1,6 +1,5 @@
 post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas/
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    gtk-update-icon-cache -q -t -f /usr/share/icons/mate
     update-desktop-database -q
 }
 
diff --git a/community/mate-document-viewer/PKGBUILD b/community/mate-document-viewer/PKGBUILD
deleted file mode 100644
index cb761aa84..000000000
--- a/community/mate-document-viewer/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer : Martin Wimpress <code@flexion.org>
-
-pkgname=mate-document-viewer
-pkgver=1.6.2
-pkgrel=1
-pkgdesc="Simply a document viewer"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('dconf' 'dbus' 'desktop-file-utils' 'gtk2' 'libmatekeyring' 'libsm'
-         'libspectre' 'mate-icon-theme' 'poppler-glib' 'zlib')
-makedepends=('djvulibre' 'gobject-introspection' 'libgxps' 'mate-common'
-             'mate-doc-utils' 'mate-file-manager' 'perl-xml-parser' 'texlive-bin')
-optdepends=('djvulibre: DjVu support'
-            'libgxps: XPS support'
-            'mate-file-manager: Document Properties extension'
-            'p7zip: cbz and cb7 compressed comic books'
-            'texlive-bin: DVI support'
-            'unrar: cbr compressed comic books')
-options=('!emptydirs')
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('295a59e7b7babd86f42eebb2a9ac5405dd7b2997')
-install=${pkgname}.install
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib/${pkgname} \
-        --enable-gtk-doc \
-        --enable-djvu \
-        --enable-dvi \
-        --enable-t1lib \
-        --enable-pixbuf \
-        --enable-comics \
-        --enable-introspection \
-        --disable-static \
-        --disable-scrollkeeper
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-    ln -s atril "${pkgdir}/usr/bin/mate-document-viewer"
-}
diff --git a/community/mate-document-viewer/mate-document-viewer.install b/community/mate-document-viewer/mate-document-viewer.install
deleted file mode 100644
index bf6781f93..000000000
--- a/community/mate-document-viewer/mate-document-viewer.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas/
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/community/mate-file-archiver/PKGBUILD b/community/mate-file-archiver/PKGBUILD
deleted file mode 100644
index 8f5f07026..000000000
--- a/community/mate-file-archiver/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer : Martin Wimpress <code@flexion.org>
-
-pkgname=mate-file-archiver
-pkgver=1.6.1
-pkgrel=1
-pkgdesc="Archive manipulator for MATE"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('bzip2' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive'
-         'mate-file-manager' 'tar')
-makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
-optdepends=('arj: for ARJ support'
-            'p7zip: for 7zip support'
-            'unrar: for RAR extract support'
-            'unace: for ACE extract support'
-            'unzip: for ZIP extract support'
-            'zip: for ZIP support')
-options=('!emptydirs')
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz"
-        fr-rpm-bsdtar.patch)
-sha1sums=('53a28d6fb559151c0b8d6f9a658113c77cdb938a'
-          '219b05a979bf6f249aaae27964f02345fd81168d')
-install=${pkgname}.install
-
-prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}"    
-    # This patch 'depends' on libarchive
-    patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
-}
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib/${pkgname} \
-        --disable-static \
-        --disable-scrollkeeper \
-        --disable-packagekit
-    mate-doc-prepare --force
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community/mate-file-archiver/fr-rpm-bsdtar.patch b/community/mate-file-archiver/fr-rpm-bsdtar.patch
deleted file mode 100644
index 93a783176..000000000
--- a/community/mate-file-archiver/fr-rpm-bsdtar.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-This makes Engrampa use bsdtar to extract .RPM packages instead of using cpio.
-It is useful on systems that do not have cpio or RPM/YUM
-This patch was created for Arch Linux, however should work on any system that has bsdtar capable of handling cpio archives.
-
-------------------+
- rpm2cpio.c       |   2 +-
- fr-command-rpm.c |   8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-Index: src/commands/rpm2cpio.c
-================================
---- mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-03-31
-+++ mate-file-archiver-1.6.0/src/commands/rpm2cpio.c	2013-07-26
-@@ -128,7 +128,7 @@
- 		archive_command = "bzip2 -dc";
- 	fclose (stream);
- 
--	command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | cpio %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
-+	command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | bsdtar %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
- 
- 	return system (command);
- }
-Index: src/fr-command-rpm.c
-================================
---- mate-file-archiver-1.6.0/src/fr-command-rpm.c	2013-03-31
-+++ mate-file-archiver-1.6.0/src/fr-command-rpm.c	2013-07-26
-@@ -175,7 +175,7 @@
- 
- 	fr_process_begin_command (comm->process, "sh");
- 	fr_process_add_arg (comm->process, "-c");
--	fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -itv", NULL);
-+	fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -tvf -", NULL);
- 	fr_process_end_command (comm->process);
- 	fr_process_start (comm->process);
- }
-@@ -200,7 +200,7 @@
- 
- 	cmd = g_string_new (PRIVEXECDIR "rpm2cpio ");
- 	g_string_append (cmd, comm->e_filename);
--	g_string_append (cmd, " -idu ");
-+	g_string_append (cmd, " -xf - ");
- 	for (scan = file_list; scan; scan = scan->next) {
- 		char *filename = g_shell_quote (scan->data);
- 		g_string_append (cmd, filename);
-@@ -233,7 +233,7 @@
- 	FrCommandCap capabilities;
- 
- 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
--	if (is_program_available ("cpio", check_command))
-+	if (is_program_available ("bsdtar", check_command))
- 		capabilities |= FR_COMMAND_CAN_READ;
- 
- 	return capabilities;
-@@ -244,7 +244,7 @@
- fr_command_rpm_get_packages (FrCommand  *comm,
- 			     const char *mime_type)
- {
--	return PACKAGES ("cpio,rpm");
-+	return PACKAGES ("bsdtar,rpm");
- }
diff --git a/community/mate-screensaver/PKGBUILD b/community/mate-screensaver/PKGBUILD
index a7600ea20..3ff0d4b0b 100644
--- a/community/mate-screensaver/PKGBUILD
+++ b/community/mate-screensaver/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=mate-screensaver
 pkgver=1.6.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Screensaver for MATE'
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
@@ -10,7 +10,9 @@ license=('GPL')
 depends=('dbus-glib' 'libmatekbd' 'libnotify' 'libxss' 'mate-desktop'
          'mate-menus' 'mate-session-manager')
 makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser' 'xmlto')
-optdepends=('mate-power-manager: Add power management support.')
+optdepends=('mate-power-manager: Add power management support.'
+            'mate-screensaver-hacks: Additional screensavers.'
+            'rss-glx: Really slick screensavers.')
 options=('!emptydirs')
 groups=('mate-extra')
 source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD
index daf8c42ad..6f736631e 100644
--- a/community/mupdf/PKGBUILD
+++ b/community/mupdf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99335 2013-10-27 10:47:47Z bpiotrowski $
+# $Id: PKGBUILD 105051 2014-01-30 18:29:49Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
@@ -7,23 +7,34 @@
 
 pkgname=mupdf
 pkgver=1.3
-pkgrel=7
+pkgrel=8
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
 license=('GPL3')
-depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext' 'openssl')
+depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext'
+         'openssl')
 install=mupdf.install
 options=('staticlibs')
 source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz
-        mupdf-1.3-system-libcurl.patch)
-sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478'
-            '41a3b6df736f971e91c066e73afac286eec8fa37af244a55df52e8b173646f42')
+        mupdf-1.3-system-libcurl.patch
+        mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch)
+md5sums=('fe53c2a56ebd7759f5f965bc4ff66359'
+         '6d11387e9bb9897f6f1ecc3956f8e2d4'
+         'f4d785b28f711e12d4a078ce9b3ed8f5')
 
 prepare() {
   cd $pkgname-$pkgver-source
   rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec}
-  patch -Np1 -i ../mupdf-1.3-system-libcurl.patch
+  patch -p1 -i ../mupdf-1.3-system-libcurl.patch
+  patch -p1 -i ../mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch
+
+  cd platform/debian
+  sed -i -e 's/mupdf.xpm/mupdf/' \
+    -e 's/application\/x-pdf/application\/x-pdf/' \
+    -e 's/mupdf-select-file/mupdf/' \
+    -e 's/^$/NoDisplay=true/' \
+    mupdf.desktop
 }
 
 build() {
@@ -42,11 +53,6 @@ package() {
   rm "$pkgdir"/usr/bin/mupdf-x11
 
   cd platform/debian
-  sed -i -e 's/mupdf.xpm/mupdf/' \
-         -e 's/application\/x-pdf/application\/x-pdf/' \
-         -e 's/mupdf-select-file/mupdf/' \
-         -e 's/^$/NoDisplay=true/' \
-            mupdf.desktop
   install -Dm644 mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
   install -Dm644 mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
 
diff --git a/community/mupdf/mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch b/community/mupdf/mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch
new file mode 100644
index 000000000..bfe86f320
--- /dev/null
+++ b/community/mupdf/mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch
@@ -0,0 +1,135 @@
+From 60dabde18d7fe12b19da8b509bdfee9cc886aafc Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Simon=20B=C3=BCnzli?= <zeniko@gmail.com>
+Date: Thu, 16 Jan 2014 22:04:51 +0100
+Subject: [PATCH] Bug 694957: fix stack buffer overflow in xps_parse_color
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+xps_parse_color happily reads more than FZ_MAX_COLORS values out of a
+ContextColor array which overflows the passed in samples array.
+Limiting the number of allowed samples to FZ_MAX_COLORS and make sure
+to use that constant for all callers fixes the problem.
+
+Thanks to Jean-Jamil Khalifé for reporting and investigating the issue
+and providing a sample exploit file.
+---
+ source/xps/xps-common.c   |   22 ++++++++++++++--------
+ source/xps/xps-glyphs.c   |    2 +-
+ source/xps/xps-gradient.c |    2 +-
+ source/xps/xps-path.c     |    2 +-
+ 4 files changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/source/xps/xps-common.c b/source/xps/xps-common.c
+index b780f42..32a30ba 100644
+--- a/source/xps/xps-common.c
++++ b/source/xps/xps-common.c
+@@ -89,7 +89,7 @@ xps_begin_opacity(xps_document *doc, const fz_matrix *ctm, const fz_rect *area,
+ 		if (scb_color_att)
+ 		{
+ 			fz_colorspace *colorspace;
+-			float samples[32];
++			float samples[FZ_MAX_COLORS];
+ 			xps_parse_color(doc, base_uri, scb_color_att, &colorspace, samples);
+ 			opacity = opacity * samples[0];
+ 		}
+@@ -208,12 +208,13 @@ void
+ xps_parse_color(xps_document *doc, char *base_uri, char *string,
+ 		fz_colorspace **csp, float *samples)
+ {
++	fz_context *ctx = doc->ctx;
+ 	char *p;
+ 	int i, n;
+ 	char buf[1024];
+ 	char *profile;
+ 
+-	*csp = fz_device_rgb(doc->ctx);
++	*csp = fz_device_rgb(ctx);
+ 
+ 	samples[0] = 1;
+ 	samples[1] = 0;
+@@ -259,7 +260,7 @@ xps_parse_color(xps_document *doc, char *base_uri, char *string,
+ 		profile = strchr(buf, ' ');
+ 		if (!profile)
+ 		{
+-			fz_warn(doc->ctx, "cannot find icc profile uri in '%s'", string);
++			fz_warn(ctx, "cannot find icc profile uri in '%s'", string);
+ 			return;
+ 		}
+ 
+@@ -267,12 +268,17 @@ xps_parse_color(xps_document *doc, char *base_uri, char *string,
+ 		p = strchr(profile, ' ');
+ 		if (!p)
+ 		{
+-			fz_warn(doc->ctx, "cannot find component values in '%s'", profile);
++			fz_warn(ctx, "cannot find component values in '%s'", profile);
+ 			return;
+ 		}
+ 
+ 		*p++ = 0;
+ 		n = count_commas(p) + 1;
++		if (n > FZ_MAX_COLORS)
++		{
++			fz_warn(ctx, "ignoring %d color components (max %d allowed)", n - FZ_MAX_COLORS, FZ_MAX_COLORS);
++			n = FZ_MAX_COLORS;
++		}
+ 		i = 0;
+ 		while (i < n)
+ 		{
+@@ -292,10 +298,10 @@ xps_parse_color(xps_document *doc, char *base_uri, char *string,
+ 		/* TODO: load ICC profile */
+ 		switch (n)
+ 		{
+-		case 2: *csp = fz_device_gray(doc->ctx); break;
+-		case 4: *csp = fz_device_rgb(doc->ctx); break;
+-		case 5: *csp = fz_device_cmyk(doc->ctx); break;
+-		default: *csp = fz_device_gray(doc->ctx); break;
++		case 2: *csp = fz_device_gray(ctx); break;
++		case 4: *csp = fz_device_rgb(ctx); break;
++		case 5: *csp = fz_device_cmyk(ctx); break;
++		default: *csp = fz_device_gray(ctx); break;
+ 		}
+ 	}
+ }
+diff --git a/source/xps/xps-glyphs.c b/source/xps/xps-glyphs.c
+index b26e18d..e621257 100644
+--- a/source/xps/xps-glyphs.c
++++ b/source/xps/xps-glyphs.c
+@@ -590,7 +590,7 @@ xps_parse_glyphs(xps_document *doc, const fz_matrix *ctm,
+ 
+ 	if (fill_att)
+ 	{
+-		float samples[32];
++		float samples[FZ_MAX_COLORS];
+ 		fz_colorspace *colorspace;
+ 
+ 		xps_parse_color(doc, base_uri, fill_att, &colorspace, samples);
+diff --git a/source/xps/xps-gradient.c b/source/xps/xps-gradient.c
+index 7d03f89..76188e9 100644
+--- a/source/xps/xps-gradient.c
++++ b/source/xps/xps-gradient.c
+@@ -39,7 +39,7 @@ xps_parse_gradient_stops(xps_document *doc, char *base_uri, fz_xml *node,
+ 	struct stop *stops, int maxcount)
+ {
+ 	fz_colorspace *colorspace;
+-	float sample[8];
++	float sample[FZ_MAX_COLORS];
+ 	float rgb[3];
+ 	int before, after;
+ 	int count;
+diff --git a/source/xps/xps-path.c b/source/xps/xps-path.c
+index b97ee17..ea84a81 100644
+--- a/source/xps/xps-path.c
++++ b/source/xps/xps-path.c
+@@ -826,7 +826,7 @@ xps_parse_path(xps_document *doc, const fz_matrix *ctm, char *base_uri, xps_reso
+ 
+ 	fz_stroke_state *stroke = NULL;
+ 	fz_matrix transform;
+-	float samples[32];
++	float samples[FZ_MAX_COLORS];
+ 	fz_colorspace *colorspace;
+ 	fz_path *path = NULL;
+ 	fz_path *stroke_path = NULL;
+-- 
+1.7.9.5
+
diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD
index a9709614c..f7a501498 100644
--- a/community/myodbc/PKGBUILD
+++ b/community/myodbc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100622 2013-11-06 14:11:22Z spupykin $
+# $Id: PKGBUILD 105021 2014-01-30 10:11:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=myodbc
 pkgver=5.2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="ODBC driver/connector for mariadb"
 arch=(i686 x86_64)
 url="http://dev.mysql.com/downloads/connector/odbc/"
@@ -20,7 +20,7 @@ build() {
   export LDFLAGS="-lpthread -ldl"
   cmake -G "Unix Makefiles" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMYSQLCLIENT_LIB_NAME=libmysqlclient_r.so \
+    -DMYSQLCLIENT_LIB_NAME=libmysqlclient_r.a \
     -DWITH_UNIXODBC=1 .
   make
 }
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index 3954a612a..c82736da4 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 104886 2014-01-28 03:34:17Z td123 $
+# $Id: PKGBUILD 105017 2014-01-30 08:53:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=passenger
-pkgver=4.0.21
-pkgrel=3
+pkgver=4.0.37
+pkgrel=1
 pkgdesc="mod_rails passenger"
 arch=('i686' 'x86_64')
 url="http://www.modrails.com"
@@ -14,7 +14,7 @@ makedepends=('apache')
 install=passenger.install
 options=('!emptydirs' 'staticlibs')
 source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz)
-md5sums=('200ba8636baa06c9a44d30c7bbb50ac3')
+md5sums=('7040af5314fe19a420f38732c6bd4f5b')
 
 prepare() {
   cd $srcdir/passenger-release-$pkgver
diff --git a/community/python2-traits/PKGBUILD b/community/python2-traits/PKGBUILD
index 17e8ac07f..b29d31cf1 100644
--- a/community/python2-traits/PKGBUILD
+++ b/community/python2-traits/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96105 2013-08-20 06:32:41Z lcarlier $
+# $Id: PKGBUILD 105025 2014-01-30 10:34:22Z aginiewicz $
 # Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
 
 pkgname=python2-traits
-pkgver=4.3.0
-pkgrel=2
+pkgver=4.4.0
+pkgrel=1
 pkgdesc="Explicitly typed attributes for Python"
 arch=('i686' 'x86_64')
 url="https://github.com/enthought/traits"
@@ -13,7 +13,7 @@ makedepends=('python2-setuptools')
 options=(!emptydirs)
 
 source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/traits/archive/${pkgver}.tar.gz")
-md5sums=('f78c15c44e0f965cc2ab799806a80388')
+md5sums=('f284e67ae3437e9427e23f7f8a4975d6')
 
 build() {
   cd "$srcdir"/traits-$pkgver
diff --git a/community/qtcurve/PKGBUILD b/community/qtcurve/PKGBUILD
index d85ed86d5..f64a14d42 100644
--- a/community/qtcurve/PKGBUILD
+++ b/community/qtcurve/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98877 2013-10-21 00:42:02Z speps $
+# $Id: PKGBUILD 105059 2014-01-30 19:46:54Z speps $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,16 +6,16 @@
 
 pkgbase=qtcurve
 pkgname=('qtcurve-utils' 'qtcurve-gtk2' 'qtcurve-qt4' 'qtcurve-qt5' 'qtcurve-kde4')
-pkgver=1.8.17
+pkgver=1.8.18
 pkgrel=1
 pkgdesc='A configurable set of widget styles for KDE and Gtk'
 arch=('i686' 'x86_64')
 url='https://github.com/QtCurve/qtcurve'
-license=('GPL')
+license=('LGPL')
 groups=('qtcurve')
 makedepends=('cmake' 'automoc4' 'gtk2' 'qt4' 'qt5-svg' 'qt5-x11extras' 'kdebase-workspace')
 source=("$pkgbase-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
-md5sums=('c4f2e9bc296398b42bfc132b88a3b989')
+md5sums=('422d1876d944bb278855f320eda19368')
 
 build() {
   cd $pkgbase-$pkgver
@@ -37,7 +37,7 @@ build() {
 
 package_qtcurve-utils() {
   depends=('libx11')
-  cd $pkgbase-$pkgver/build/qtcurve-utils
+  cd $pkgbase-$pkgver/build/lib/utils
   make DESTDIR="$pkgdir" install
 }
 
@@ -45,6 +45,8 @@ package_qtcurve-gtk2() {
   depends=('qtcurve-utils' 'gtk2')
   cd $pkgbase-$pkgver/build/gtk2
   make DESTDIR="$pkgdir" install
+  cd ../lib/cairo
+  make DESTDIR="$pkgdir" install
 }
 
 package_qtcurve-qt4() {
diff --git a/community/scummvm/PKGBUILD b/community/scummvm/PKGBUILD
index edf6e859b..d09467180 100644
--- a/community/scummvm/PKGBUILD
+++ b/community/scummvm/PKGBUILD
@@ -4,12 +4,14 @@
 
 pkgname=scummvm
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.scummvm.org/"
-depends=('libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad')
+depends=('libpng' 'libtheora' 'libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad' 'freetype2'
+         'libgl' 'glu')
+makedepends=('mesa')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('473c151ff44e3db7b603ecacd800a0d2')
 
diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD
index 61aa478cd..f5a4bc09b 100644
--- a/community/spacefm/PKGBUILD
+++ b/community/spacefm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104364 2014-01-19 14:07:40Z bpiotrowski $
+# $Id: PKGBUILD 105055 2014-01-30 18:44:14Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
 # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com>
@@ -15,7 +15,6 @@ depends=('gtk3' 'shared-mime-info' 'desktop-file-utils' 'startup-notification'
          'udev' 'bash')
 makedepends=('intltool' 'gettext')
 optdepends=('lsof: device processes'
-            'eject: eject media'
             'wget: plugin download'
             'gksu: perform as root functionality'
             'udevil: mount as non-root user and mount networks'