Wed Jul 3 00:48:29 PDT 2013

14 files changed, 309 insertions, 324 deletions

diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 0f5d88352..3cfaf9caf 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,20 +1,28 @@
-# $Id: PKGBUILD 188470 2013-06-14 19:24:13Z heftig $
+# $Id: PKGBUILD 189282 2013-07-02 08:23:35Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp')
 pkgver=1.16.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('avahi' 'bluez-libs' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray')
 url="http://www.gnome.org"
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('02a4483d0dd2e307f58f8e1d34dd29dbe06d3a345b73ac8d6f87bb91189c8e49')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
+        imobiledevice-1.1.5.patch)
+sha256sums=('02a4483d0dd2e307f58f8e1d34dd29dbe06d3a345b73ac8d6f87bb91189c8e49'
+            '3faf3027ef40c5cea3f01cb9d37e4cf848ed2ecfe6cde3b7bf86087da4a2d2e1')
+
+prepare() {
+  cd $pkgbase-$pkgver
+  patch -Np1 -i ../imobiledevice-1.1.5.patch
+}
 
 build() {
   cd "$pkgbase-$pkgver"
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gvfs \
diff --git a/extra/gvfs/imobiledevice-1.1.5.patch b/extra/gvfs/imobiledevice-1.1.5.patch
new file mode 100644
index 000000000..00e9358dc
--- /dev/null
+++ b/extra/gvfs/imobiledevice-1.1.5.patch
@@ -0,0 +1,221 @@
+From d71c6108901460842de25012d5ece727a0c70d27 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Tue, 11 Jun 2013 11:33:23 +0000
+Subject: afc: Update to libimobiledevice new api
+
+https://bugzilla.redhat.com/show_bug.cgi?id=951731
+https://bugzilla.gnome.org/show_bug.cgi?id=702577
+---
+diff --git a/configure.ac b/configure.ac
+index 12dbdcd..2846d82 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -372,14 +372,11 @@ AFC_LIBS=
+ AFC_CFLAGS=
+ 
+ if test "x$enable_afc" != "xno" ; then
+-  PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.0 libplist >= 0.15, msg_afc=yes)
++  PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.5 libplist >= 0.15, msg_afc=yes)
+ 
+   if test "x$msg_afc" = "xyes"; then
+     PKG_CHECK_MODULES(AFC, libimobiledevice-1.0 libplist)
+     AC_DEFINE(HAVE_AFC, 1, [Define to 1 if AFC is going to be built])
+-    PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.2,
+-                     [AC_DEFINE(HAVE_LIBIMOBILEDEVICE_1_1_2, 1,
+-                                [Define to 1 if libimobiledevice-1.1.2 found])])
+   fi
+ fi
+ 
+diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
+index ab4a9ce..6b0b64f 100644
+--- a/daemon/gvfsbackendafc.c
++++ b/daemon/gvfsbackendafc.c
+@@ -349,12 +349,7 @@ _idevice_event_cb (const idevice_event_t *event, void *user_data)
+   if (event->event != IDEVICE_DEVICE_REMOVE)
+     return;
+ 
+-#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
+   event_udid = event->udid;
+-#else
+-  event_udid = event->uuid;
+-#endif
+-
+   if (g_str_equal (event_udid, afc_backend->uuid) == FALSE)
+     return;
+ 
+@@ -401,7 +396,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
+   const char *str;
+   char *tmp;
+   char *display_name = NULL;
+-  guint16 port;
++  lockdownd_service_descriptor_t lockdown_service = NULL;
+   int virtual_port;
+   GMountSpec *real_spec;
+   GVfsBackendAfc *self;
+@@ -414,6 +409,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
+   char **dcim_afcinfo;
+   plist_t value;
+   lockdownd_error_t lerr;
++  afc_error_t aerr;
+   const gchar *choices[] = {_("Try again"), _("Cancel"), NULL}; /* keep in sync with the enum above */
+   gboolean aborted = FALSE;
+   gchar *message = NULL;
+@@ -649,41 +645,38 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
+ 
+   switch (self->mode) {
+     case ACCESS_MODE_AFC:
+-      lerr = lockdownd_start_service (lockdown_cli, self->service, &port);
++      lerr = lockdownd_start_service (lockdown_cli, self->service, &lockdown_service);
+       if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job))))
+         {
+           goto out_destroy_lockdown;
+         }
+-      if (G_UNLIKELY(g_vfs_backend_afc_check (afc_client_new (self->dev,
+-                                                              port, &self->afc_cli),
+-                                              G_VFS_JOB(job))))
++      aerr = afc_client_new (self->dev, lockdown_service, &self->afc_cli);
++      if (G_UNLIKELY(g_vfs_backend_afc_check (aerr, G_VFS_JOB(job))))
+         {
+           goto out_destroy_lockdown;
+         }
+       break;
+     case ACCESS_MODE_HOUSE_ARREST:
+-      lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.installation_proxy", &port);
++      lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.installation_proxy", &lockdown_service);
+       if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job))))
+         {
+           g_warning ("couldn't start inst proxy");
+           goto out_destroy_lockdown;
+         }
+-      if (G_UNLIKELY(g_vfs_backend_inst_check (instproxy_client_new (self->dev,
+-                                                                     port, &self->inst),
+-                                               G_VFS_JOB(job))))
++      aerr = instproxy_client_new (self->dev, lockdown_service, &self->inst);
++      if (G_UNLIKELY(g_vfs_backend_inst_check (aerr, G_VFS_JOB(job))))
+         {
+           g_warning ("couldn't create inst proxy instance");
+           goto out_destroy_lockdown;
+         }
+-      lerr = lockdownd_start_service (lockdown_cli, "com.apple.springboardservices", &port);
++      lerr = lockdownd_start_service (lockdown_cli, "com.apple.springboardservices", &lockdown_service);
+       if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job))))
+         {
+           g_warning ("couldn't start SBServices proxy");
+           goto out_destroy_lockdown;
+         }
+-      if (G_UNLIKELY(g_vfs_backend_sbs_check (sbservices_client_new (self->dev,
+-                                                                     port, &self->sbs),
+-                                              G_VFS_JOB(job))))
++      aerr = sbservices_client_new (self->dev, lockdown_service, &self->sbs);
++      if (G_UNLIKELY(g_vfs_backend_sbs_check (aerr, G_VFS_JOB(job))))
+         {
+           g_warning ("couldn't create SBServices proxy instance");
+           goto out_destroy_lockdown;
+@@ -705,6 +698,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
+ 
+   /* lockdown connection is not needed anymore */
+   lockdownd_client_free (lockdown_cli);
++  lockdownd_service_descriptor_free (lockdown_service);
+ 
+   /* Add camera item if necessary */
+   if (self->mode == ACCESS_MODE_AFC)
+@@ -723,6 +717,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
+ 
+ out_destroy_lockdown:
+   lockdownd_client_free (lockdown_cli);
++  lockdownd_service_descriptor_free (lockdown_service);
+ 
+ out_destroy_dev:
+   idevice_free (self->dev);
+@@ -794,10 +789,11 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self,
+ {
+   AppInfo *info;
+   lockdownd_client_t lockdown_cli;
+-  guint16 port;
++  lockdownd_service_descriptor_t lockdown_service = NULL;
+   house_arrest_client_t house_arrest;
+   afc_client_t afc;
+   plist_t dict, error;
++  lockdownd_error_t lerr;
+ 
+   info = g_hash_table_lookup (self->apps, id);
+ 
+@@ -812,7 +808,8 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self,
+       g_warning ("Failed to get a lockdown to start house arrest for app %s", info->id);
+       return;
+     }
+-  if (lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &port) != LOCKDOWN_E_SUCCESS)
++  lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &lockdown_service);
++  if (lerr != LOCKDOWN_E_SUCCESS)
+     {
+       lockdownd_client_free (lockdown_cli);
+       g_warning ("Failed to start house arrest for app %s", info->id);
+@@ -820,14 +817,17 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self,
+     }
+ 
+   house_arrest = NULL;
+-  house_arrest_client_new (self->dev, port, &house_arrest);
++  house_arrest_client_new (self->dev, lockdown_service, &house_arrest);
+   if (house_arrest == NULL)
+     {
+       g_warning ("Failed to start house arrest for app %s", info->id);
+       lockdownd_client_free (lockdown_cli);
++      lockdownd_service_descriptor_free (lockdown_service);
+       return;
+     }
+ 
++  lockdownd_service_descriptor_free (lockdown_service);
++
+   dict = NULL;
+   if (house_arrest_send_command (house_arrest, "VendContainer", info->id) != HOUSE_ARREST_E_SUCCESS ||
+       house_arrest_get_result (house_arrest, &dict) != HOUSE_ARREST_E_SUCCESS)
+diff --git a/monitor/afc/afcvolume.c b/monitor/afc/afcvolume.c
+index 9829077..b7284b0 100644
+--- a/monitor/afc/afcvolume.c
++++ b/monitor/afc/afcvolume.c
+@@ -80,6 +80,8 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
+   guint retries;
+   plist_t value;
+   char *model, *display_name;
++  lockdownd_service_descriptor_t lockdown_service = NULL;
++  lockdownd_error_t lerr;
+ 
+   retries = 0;
+   do {
+@@ -94,14 +96,14 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
+ 
+   if (self->service != NULL)
+     {
+-      guint16 port;
+-
+       if (lockdownd_client_new_with_handshake (dev, &lockdown_cli, "gvfs-afc-volume-monitor") != LOCKDOWN_E_SUCCESS)
+         {
+           idevice_free (dev);
+           return 0;
+         }
+-      if (lockdownd_start_service(lockdown_cli, "com.apple.mobile.house_arrest", &port) != LOCKDOWN_E_SUCCESS)
++      lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &lockdown_service);
++      lockdownd_service_descriptor_free (lockdown_service);
++      if (lerr != LOCKDOWN_E_SUCCESS)
+         {
+           idevice_free (dev);
+           return 0;
+diff --git a/monitor/afc/afcvolumemonitor.c b/monitor/afc/afcvolumemonitor.c
+index 3545bdf..995ef4d 100644
+--- a/monitor/afc/afcvolumemonitor.c
++++ b/monitor/afc/afcvolumemonitor.c
+@@ -89,12 +89,7 @@ g_vfs_afc_monitor_idevice_event (const idevice_event_t *event, void *user_data)
+ 
+   self = G_VFS_AFC_VOLUME_MONITOR(user_data);
+ 
+-#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
+   event_udid = event->udid;
+-#else
+-  event_udid = event->uuid;
+-#endif
+-
+   if (event->event == IDEVICE_DEVICE_ADD)
+     g_vfs_afc_monitor_create_volume (self, event_udid);
+   else
+--
+cgit v0.9.2
diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD
index 1fbc25589..40409218e 100644
--- a/extra/leveldb/PKGBUILD
+++ b/extra/leveldb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 188250 2013-06-13 13:52:03Z dreisner $
+# $Id: PKGBUILD 189268 2013-07-02 02:41:15Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: feydaykyn <feydaykyn@yahoo.fr>
 
 pkgname=leveldb
-pkgver=1.10.0
+pkgver=1.12.0
 pkgrel=1
 pkgdesc="A fast and lightweight key/value database library"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="https://code.google.com/p/leveldb/"
 license=('BSD')
 depends=('gperftools' 'snappy')
 source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha1sums=('d5b234658138d07f6edc2de24e01d9b0585c03cb')
+sha1sums=('e7b84f239949920bfc2d7d1074ec6a6fa8869e23')
 
 build() {
   make -C "$pkgname-$pkgver"
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index d13a514fd..0cb1e9d68 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185754 2013-05-18 10:51:46Z andyrtr $
+# $Id: PKGBUILD 189301 2013-07-02 19:57:06Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.45
+pkgver=2.4.46
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
         no-pthread-stubs.patch
         COPYING)
-sha256sums=('3ef0a70c16080fb90c50e807b660b7353d82509c03647f6ecc00bbfa1caee208'
+sha256sums=('33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1'
             'c2d2e8575dac9d08f1271b2cfa68ac3b42e69f99efe6e3a7e20064f22f7e28ab'
             '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
 
diff --git a/extra/libtheora/PKGBUILD b/extra/libtheora/PKGBUILD
index 89cdaecb7..1f6322c42 100644
--- a/extra/libtheora/PKGBUILD
+++ b/extra/libtheora/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 137894 2011-09-12 09:56:42Z pierre $
+# $Id: PKGBUILD 189280 2013-07-02 08:08:13Z jgc $
 # Maintainer: Tom Killian <tom@archlinux.org>
 # Committer: dorphell <dorphell@archlinux.org>
 
 pkgname=libtheora
 pkgver=1.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An open video codec developed by the Xiph.org"
 arch=('i686' 'x86_64')
 url="http://www.xiph.org"
@@ -12,18 +12,26 @@ license=('BSD')
 depends=('libogg')
 makedepends=('libvorbis')
 options=('!libtool')
-source=("http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2")
-md5sums=('292ab65cedd5021d6b7ddd117e07cd8e')
-sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262')
+source=(http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2
+        libtheora-1.1.1-libpng16.patch)
+md5sums=('292ab65cedd5021d6b7ddd117e07cd8e'
+         '08edd81c7a1be2c4edfd2cd3c112a8c6')
+sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262'
+          'c3f03dbaa5c6459846ce79ea904db1b66971878d')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np0 -i ../libtheora-1.1.1-libpng16.patch
+}
 
 build() {
-  cd "${srcdir}/libtheora-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-shared --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/libtheora-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libtheora/libtheora-1.1.1-libpng16.patch b/extra/libtheora/libtheora-1.1.1-libpng16.patch
new file mode 100644
index 000000000..93da700c4
--- /dev/null
+++ b/extra/libtheora/libtheora-1.1.1-libpng16.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/465450
+http://trac.xiph.org/ticket/1947
+
+--- examples/png2theora.c
++++ examples/png2theora.c
+@@ -462,9 +462,9 @@
+   png_set_strip_alpha(png_ptr);
+ 
+   row_data = (png_bytep)png_malloc(png_ptr,
+-    3*height*width*png_sizeof(*row_data));
++    3*height*width*sizeof(*row_data));
+   row_pointers = (png_bytep *)png_malloc(png_ptr,
+-    height*png_sizeof(*row_pointers));
++    height*sizeof(*row_pointers));
+   for(y = 0; y < height; y++) {
+     row_pointers[y] = row_data + y*(3*width);
+   }
diff --git a/extra/libvdpau/PKGBUILD b/extra/libvdpau/PKGBUILD
index 05c4ffb54..7924af4d0 100644
--- a/extra/libvdpau/PKGBUILD
+++ b/extra/libvdpau/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 176895 2013-02-02 07:01:31Z andyrtr $
+# $Id: PKGBUILD 189278 2013-07-02 07:41:51Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libvdpau
 pkgver=0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Nvidia VDPAU library"
 arch=(i686 x86_64)
 url='http://cgit.freedesktop.org/~aplattner/libvdpau'
-depends=('gcc-libs')
+depends=('gcc-libs' 'libxext')
 conflicts=('nvidia-utils<190.42-2')
 options=('!libtool')
 license=('custom')
 source=(http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz)
-makedepends=('libx11')
+makedepends=('dri2proto')
 sha256sums=('9b55beec9d8b01bbf89229b7d075ceee870f4e1830523c11f29a46c07fe72d75')
 
 build() {
diff --git a/extra/mesa/CVE-2013-1993.patch b/extra/mesa/CVE-2013-1993.patch
deleted file mode 100644
index 00f723d35..000000000
--- a/extra/mesa/CVE-2013-1993.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 80ac3b279e776b3d9f45a209e52c5bd34ba7e7df Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Fri, 26 Apr 2013 23:31:58 +0000
-Subject: integer overflow in XF86DRIOpenConnection() [CVE-2013-1993 1/2]
-
-busIdStringLength is a CARD32 and needs to be bounds checked before adding
-one to it to come up with the total size to allocate, to avoid integer
-overflow leading to underallocation and writing data from the network past
-the end of the allocated buffer.
-
-NOTE: This is a candidate for stable release branches.
-
-Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Brian Paul <brianp@vmware.com>
-(cherry picked from commit 2e5a268f18be30df15aed0b44b01a18a37fb5df4)
----
-diff --git a/src/glx/XF86dri.c b/src/glx/XF86dri.c
-index b1cdc9b..8f53bd7 100644
---- a/src/glx/XF86dri.c
-+++ b/src/glx/XF86dri.c
-@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- #include <X11/extensions/Xext.h>
- #include <X11/extensions/extutil.h>
- #include "xf86dristr.h"
-+#include <limits.h>
- 
- static XExtensionInfo _xf86dri_info_data;
- static XExtensionInfo *xf86dri_info = &_xf86dri_info_data;
-@@ -201,7 +202,11 @@ XF86DRIOpenConnection(Display * dpy, int screen, drm_handle_t * hSAREA,
-    }
- 
-    if (rep.length) {
--      if (!(*busIdString = calloc(rep.busIdStringLength + 1, 1))) {
-+      if (rep.busIdStringLength < INT_MAX)
-+         *busIdString = calloc(rep.busIdStringLength + 1, 1);
-+      else
-+         *busIdString = NULL;
-+      if (*busIdString == NULL) {
-          _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3));
-          UnlockDisplay(dpy);
-          SyncHandle();
---
-cgit v0.9.0.2-2-gbebe
-From 6de60ddf9ccac6f185d8f4e88ddfc63a94bd670f Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Fri, 26 Apr 2013 23:33:03 +0000
-Subject: integer overflow in XF86DRIGetClientDriverName() [CVE-2013-1993 2/2]
-
-clientDriverNameLength is a CARD32 and needs to be bounds checked before
-adding one to it to come up with the total size to allocate, to avoid
-integer overflow leading to underallocation and writing data from the
-network past the end of the allocated buffer.
-
-NOTE: This is a candidate for stable release branches.
-
-Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Brian Paul <brianp@vmware.com>
-(cherry picked from commit 306f630e676eb901789dd09a0f30d7e7fa941ebe)
----
-diff --git a/src/glx/XF86dri.c b/src/glx/XF86dri.c
-index 8f53bd7..56e3557 100644
---- a/src/glx/XF86dri.c
-+++ b/src/glx/XF86dri.c
-@@ -305,9 +305,11 @@ XF86DRIGetClientDriverName(Display * dpy, int screen,
-    *ddxDriverPatchVersion = rep.ddxDriverPatchVersion;
- 
-    if (rep.length) {
--      if (!
--          (*clientDriverName =
--           calloc(rep.clientDriverNameLength + 1, 1))) {
-+      if (rep.clientDriverNameLength < INT_MAX)
-+         *clientDriverName = calloc(rep.clientDriverNameLength + 1, 1);
-+      else
-+         *clientDriverName = NULL;
-+      if (*clientDriverName == NULL) {
-          _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3));
-          UnlockDisplay(dpy);
-          SyncHandle();
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 6990f754e..aca17ca8c 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 188839 2013-06-22 10:51:37Z lcarlier $
+# $Id: PKGBUILD 189266 2013-07-01 22:29:39Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
-pkgver=9.1.3
-pkgrel=2
+pkgver=9.1.4
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
              'libvdpau' 'wayland' 'llvm-amdgpu-snapshot' 'systemd')
@@ -13,18 +13,9 @@ url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-        LICENSE
-	CVE-2013-1993.patch)
-md5sums=('952ccd03547ed72333b64e1746cf8ada'
-         '5c65a0fe315dd347e09b1f2826a1df5a'
-         'dc8dad7c9bc6a92bd9c33b27b9da825e')
-
-prepare() {
-    cd ${srcdir}/?esa-*
-
-    # fix CVE-2013-1993 merged upstream
-    patch -Np1 -i ${srcdir}/CVE-2013-1993.patch
-}
+        LICENSE)
+md5sums=('a2c4e25d0e27918bc67f61bae04d0cb8'
+         '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
     cd ${srcdir}/?esa-*
diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD
index 2ed9bc142..03c78f6df 100644
--- a/extra/qt4/PKGBUILD
+++ b/extra/qt4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185057 2013-05-10 18:09:28Z andrea $
+# $Id: PKGBUILD 189290 2013-07-02 11:12:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qt4
-pkgver=4.8.4
-pkgrel=18
+pkgver=4.8.5
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -14,7 +14,8 @@ depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus'
         'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
              'mesa-libgl')
-optdepends=('postgresql-libs: PostgreSQL driver'
+optdepends=('qtchooser: set the default Qt toolkit'
+            'postgresql-libs: PostgreSQL driver'
             'libmariadbclient: MariaDB driver'
             'unixodbc: ODBC driver'
             'libfbclient: Firebird/iBase driver'
@@ -27,11 +28,11 @@ options=('!libtool')
 replaces=('qt<=4.8.4')
 conflicts=('qt')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
-source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz"
+source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz"
         'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
         'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
         'improve-cups-support.patch')
-md5sums=('89c5ecba180cae74c66260ac732dc5cb'
+md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
          'a16638f4781e56e7887ff8212a322ecc'
          '8a28b3f52dbeb685d4b69440b520a3e1'
          '9727c406c240990870c905696a8c5bd1'
@@ -39,19 +40,27 @@ md5sums=('89c5ecba180cae74c66260ac732dc5cb'
          'b859c5673e5098c39f72b2252947049e'
          'c439c7731c25387352d8453ca7574971')
 
-build() {
+prepare() {
   cd ${_pkgfqn}
 
   # (FS#28381) (KDEBUG#180051)
   patch -p1 -i "${srcdir}"/improve-cups-support.patch
 
-  export QT4DIR="${srcdir}"/${_pkgfqn}
-  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
   sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
   sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
   sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
 
+  cp mkspecs/common/linux{,32}.conf
+  sed -i "/^QMAKE_LIBDIR\s/s|=|= /usr/lib32|g" mkspecs/common/linux32.conf
+  sed -i "s|common/linux.conf|common/linux32.conf|" mkspecs/linux-g++-32/qmake.conf
+}
+
+build() {
+  export QT4DIR="${srcdir}"/${_pkgfqn}
+  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+  
+  cd ${_pkgfqn}
+
   ./configure -confirm-license -opensource \
     -prefix /usr \
     -bindir /usr/lib/qt4/bin \
@@ -104,7 +113,7 @@ package() {
     install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer.png \
       "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt4.png
     install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
-      "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qdusviewer-qt4.png
+      "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt4.png
 
     install -d "${pkgdir}"/usr/share/applications
     install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig,qdbusviewer}-qt4.desktop \
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index 894ad7771..ce5dea5d9 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186867 2013-05-31 11:57:47Z schiv $
+# $Id: PKGBUILD 189298 2013-07-02 15:47:31Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: see .contrib
 
 pkgname=snd
-pkgver=13.7
+pkgver=13.8
 pkgrel=1
 pkgdesc="An advanced sound editor"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('wavpack' 'flac' 'speex' 'mpg123'
             'timidity++' 'vorbis-tools')
 install=$pkgname.install
 source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz")
-md5sums=('220b0155bace73d4442374a837c2f5fd')
+md5sums=('d70148dc06073b49a854ada504e8a2d4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index 0176e4071..013ddac45 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188960 2013-06-27 09:01:12Z lcarlier $
+# $Id: PKGBUILD 189300 2013-07-02 19:56:50Z lcarlier $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.21.10
-pkgrel=3
+pkgver=2.21.11
+pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -18,21 +18,12 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS
            'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        firefox_image_fix.diff
-        pd_crash_X_fix.diff)
-sha256sums=('7a4bcad83e8153ab1eec46dfee2412b7b20d087f438af4bf97f460f67c5ca9b6'
-            '33465c66b0a4bca2dfd242c86cb8cb882fbf841e1c2da632a5aa76f9d04b84d1'
-            'cfc83edf018408d9d5b7f5bb329ea364a203eb12bdf537270b89ad85203fbc44')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('523aa13f2ba65f0be871de338956a5acccb0d3a3d9c195ed3cd47abc2c025e22')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # fix image issues in FF+TB, https://bugs.freedesktop.org/show_bug.cgi?id=66059
-  patch -Np1 -i ${srcdir}/firefox_image_fix.diff
-  # fix X crash with pd, https://bugs.freedesktop.org/show_bug.cgi?id=66104
-  patch -Np1 -i ${srcdir}/pd_crash_X_fix.diff
-
   ./configure --prefix=/usr \
     --enable-dri
 
diff --git a/extra/xf86-video-intel/firefox_image_fix.diff b/extra/xf86-video-intel/firefox_image_fix.diff
deleted file mode 100644
index 653295dab..000000000
--- a/extra/xf86-video-intel/firefox_image_fix.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From 77ddadf0ec6b867a0638660bf06c82ad31577795 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sun, 23 Jun 2013 21:01:12 +0000
-Subject: sna: Clear 'clear' hint upon uploading into tiled
-
-Fixes regression from
-commit 53c113c3cc2f8527debc185f0819139ca8637637 [2.21.10]
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date:   Fri Jun 21 19:27:24 2013 +0100
-
-    sna: Allow PutImage to write inplace using manual tiling
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66059
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
-index 0994c33..43d6a67 100644
---- a/src/sna/sna_accel.c
-+++ b/src/sna/sna_accel.c
-@@ -4000,6 +4000,8 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
- 	} while (--n);
- 	__kgem_bo_unmap__cpu(&sna->kgem, priv->gpu_bo, dst);
- 
-+	priv->clear = false;
-+	priv->cpu = false;
- 	return true;
- }
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-intel/pd_crash_X_fix.diff b/extra/xf86-video-intel/pd_crash_X_fix.diff
deleted file mode 100644
index 6b10ec74e..000000000
--- a/extra/xf86-video-intel/pd_crash_X_fix.diff
+++ /dev/null
@@ -1,148 +0,0 @@
-From c88d911d4209a8ede5ec705ad925383c69182977 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Mon, 24 Jun 2013 14:30:00 +0100
-Subject: [PATCH] sna: Initialise gc->ops->PolyPoint for miWideDash
-
-The miWideDash may also call PolyPoint rather than emit spans, so make
-sure that we correctly prepare sna_poly_point before calling mi*.
-
-Reported-by: Tobias Brodel <toby.jamesjoy@gmail.com>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66104
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
- src/sna/sna_accel.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 54 insertions(+), 6 deletions(-)
-
-diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
-index 43d6a67..a3e4ed4 100644
---- a/src/sna/sna_accel.c
-+++ b/src/sna/sna_accel.c
-@@ -5750,6 +5750,39 @@ sna_poly_point__fill_clip_boxes(DrawablePtr drawable, GCPtr gc,
- }
- 
- static void
-+sna_poly_point__dash(DrawablePtr drawable, GCPtr gc,
-+		     int mode, int n, DDXPointPtr pt)
-+{
-+	struct sna_fill_spans *data = sna_gc(gc)->priv;
-+	struct sna_fill_op *op = data->op;
-+
-+	if (op->base.u.blt.pixel == gc->fgPixel)
-+		sna_poly_point__fill(drawable, gc, mode, n, pt);
-+}
-+
-+static void
-+sna_poly_point__dash_clip_extents(DrawablePtr drawable, GCPtr gc,
-+				  int mode, int n, DDXPointPtr pt)
-+{
-+	struct sna_fill_spans *data = sna_gc(gc)->priv;
-+	struct sna_fill_op *op = data->op;
-+
-+	if (op->base.u.blt.pixel == gc->fgPixel)
-+		sna_poly_point__fill_clip_extents(drawable, gc, mode, n, pt);
-+}
-+
-+static void
-+sna_poly_point__dash_clip_boxes(DrawablePtr drawable, GCPtr gc,
-+				  int mode, int n, DDXPointPtr pt)
-+{
-+	struct sna_fill_spans *data = sna_gc(gc)->priv;
-+	struct sna_fill_op *op = data->op;
-+
-+	if (op->base.u.blt.pixel == gc->fgPixel)
-+		sna_poly_point__fill_clip_boxes(drawable, gc, mode, n, pt);
-+}
-+
-+static void
- sna_fill_spans__fill(DrawablePtr drawable,
- 		     GCPtr gc, int n,
- 		     DDXPointPtr pt, int *width, int sorted)
-@@ -8175,16 +8208,20 @@ spans_fallback:
- 						sna_gc_ops__tmp.FillSpans = sna_fill_spans__fill_offset;
- 					else
- 						sna_gc_ops__tmp.FillSpans = sna_fill_spans__fill;
-+					sna_gc_ops__tmp.PolyPoint = sna_poly_point__fill;
- 				} else {
- 					region_maybe_clip(&data.region,
- 							  gc->pCompositeClip);
- 					if (RegionNil(&data.region))
- 						return;
- 
--					if (region_is_singular(&data.region))
-+					if (region_is_singular(&data.region)) {
- 						sna_gc_ops__tmp.FillSpans = sna_fill_spans__fill_clip_extents;
--					else
-+						sna_gc_ops__tmp.PolyPoint = sna_poly_point__fill_clip_extents;
-+					} else {
- 						sna_gc_ops__tmp.FillSpans = sna_fill_spans__fill_clip_boxes;
-+						sna_gc_ops__tmp.PolyPoint = sna_poly_point__fill_clip_boxes;
-+					}
- 				}
- 				assert(gc->miTranslate);
- 
-@@ -8200,16 +8237,20 @@ spans_fallback:
- 						sna_gc_ops__tmp.FillSpans = sna_fill_spans__dash_offset;
- 					else
- 						sna_gc_ops__tmp.FillSpans = sna_fill_spans__dash;
-+					sna_gc_ops__tmp.PolyPoint = sna_poly_point__dash;
- 				} else {
- 					region_maybe_clip(&data.region,
- 							  gc->pCompositeClip);
- 					if (RegionNil(&data.region))
- 						return;
- 
--					if (region_is_singular(&data.region))
-+					if (region_is_singular(&data.region)) {
- 						sna_gc_ops__tmp.FillSpans = sna_fill_spans__dash_clip_extents;
--					else
-+						sna_gc_ops__tmp.PolyPoint = sna_poly_point__dash_clip_extents;
-+					} else {
- 						sna_gc_ops__tmp.FillSpans = sna_fill_spans__dash_clip_boxes;
-+						sna_gc_ops__tmp.PolyPoint = sna_poly_point__dash_clip_boxes;
-+					}
- 				}
- 				assert(gc->miTranslate);
- 
-@@ -8239,6 +8280,7 @@ spans_fallback:
- 			 */
- 			sna_gc_ops__tmp.FillSpans = sna_fill_spans__gpu;
- 			sna_gc_ops__tmp.PolyFillRect = sna_poly_fill_rect__gpu;
-+			sna_gc_ops__tmp.PolyPoint = sna_poly_point__gpu;
- 			gc->ops = &sna_gc_ops__tmp;
- 
- 			switch (gc->lineStyle) {
-@@ -9083,16 +9125,20 @@ spans_fallback:
- 					sna_gc_ops__tmp.FillSpans = sna_fill_spans__fill_offset;
- 				else
- 					sna_gc_ops__tmp.FillSpans = sna_fill_spans__fill;
-+				sna_gc_ops__tmp.PolyPoint = sna_poly_point__fill;
- 			} else {
- 				region_maybe_clip(&data.region,
- 						  gc->pCompositeClip);
- 				if (RegionNil(&data.region))
- 					return;
- 
--				if (region_is_singular(&data.region))
-+				if (region_is_singular(&data.region)) {
- 					sna_gc_ops__tmp.FillSpans = sna_fill_spans__fill_clip_extents;
--				else
-+					sna_gc_ops__tmp.PolyPoint = sna_poly_point__fill_clip_extents;
-+				} else {
- 					sna_gc_ops__tmp.FillSpans = sna_fill_spans__fill_clip_boxes;
-+					sna_gc_ops__tmp.PolyPoint = sna_poly_point__fill_clip_boxes;
-+				}
- 			}
- 			assert(gc->miTranslate);
- 			gc->ops = &sna_gc_ops__tmp;
-@@ -9103,6 +9149,8 @@ spans_fallback:
- 			fill.done(data.sna, &fill);
- 		} else {
- 			sna_gc_ops__tmp.FillSpans = sna_fill_spans__gpu;
-+			sna_gc_ops__tmp.PolyFillRect = sna_poly_fill_rect__gpu;
-+			sna_gc_ops__tmp.PolyPoint = sna_poly_point__gpu;
- 			gc->ops = &sna_gc_ops__tmp;
- 
- 			for (i = 0; i < n; i++)
--- 
-1.8.3.1
-