7 files changed, 69 insertions, 31 deletions
diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD
index 3f2d9ecfa..453c91973 100644
--- a/extra/freetype2/PKGBUILD
+++ b/extra/freetype2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 207503 2014-03-11 15:49:00Z andyrtr $
+# $Id: PKGBUILD 208094 2014-03-17 20:55:35Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=freetype2
 pkgver=2.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="TrueType font rendering library"
 arch=(i686 x86_64)
 license=('GPL')
@@ -14,18 +14,24 @@ depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
 source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2{,.sig}
         freetype-2.2.1-enable-valid.patch
         freetype-2.5.1-enable-spr.patch
-        freetype-2.5.1-enable-sph.patch)
+        freetype-2.5.1-enable-sph.patch
+        fix_segfault_with_harfbuzz.diff)
 sha1sums=('d3c26cc17ec7fe6c36f4efc02ef92ab6aa3f4b46'
           'SKIP'
           'f279d922a873d62a8af50bfc873051839d194dca'
           '13ee8d558593db991ad29fa090b461f914536104'
-          'c31fa3d342ead56f3acfa1f267b474a7686d0014')
+          'c31fa3d342ead56f3acfa1f267b474a7686d0014'
+          'c99013b4c19494cd26031878368191cd2b4459b0')
 
 prepare() {
   cd "${srcdir}/freetype-${pkgver}"
   patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
   patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-spr.patch"
-
+  
+  # fix segfaults # https://bugs.archlinux.org/task/39365
+  # http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=23367ff97f33ef6a2b7e1fced1157c87a46d9596
+  patch -Np1 -i "${srcdir}/fix_segfault_with_harfbuzz.diff"
+  
   # Disabled for now due to resistance
   # Kept here for easier rebuilds via ABS
   # https://bugs.archlinux.org/task/35274
diff --git a/extra/freetype2/fix_segfault_with_harfbuzz.diff b/extra/freetype2/fix_segfault_with_harfbuzz.diff
new file mode 100644
index 000000000..a1832eb16
--- /dev/null
+++ b/extra/freetype2/fix_segfault_with_harfbuzz.diff
@@ -0,0 +1,32 @@
+From 23367ff97f33ef6a2b7e1fced1157c87a46d9596 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl@gnu.org>
+Date: Mon, 17 Mar 2014 06:33:14 +0000
+Subject: Fix Savannah bug #41869.
+
+This works around a problem with HarfBuzz (<= 0.9.26), which doesn't
+validate glyph indices returned by
+`hb_ot_layout_lookup_collect_glyphs'.
+
+* src/autofit/hbshim.c (af_get_coverage): Guard `idx'.
+
+* docs/CHANGES: Updated.
+---
+diff --git a/src/autofit/hbshim.c b/src/autofit/hbshim.c
+index 11fb743..2eda8d7 100644
+--- a/src/autofit/hbshim.c
++++ b/src/autofit/hbshim.c
+@@ -347,6 +347,11 @@
+       count++;
+ #endif
+ 
++      /* HarfBuzz 0.9.26 and older doesn't validate glyph indices */
++      /* returned by `hb_ot_layout_lookup_collect_glyphs'...      */
++      if ( idx >= (hb_codepoint_t)globals->glyph_count )
++        continue;
++
+       if ( gstyles[idx] == AF_STYLE_UNASSIGNED )
+         gstyles[idx] = (FT_Byte)style_class->style;
+ #ifdef FT_DEBUG_LEVEL_TRACE
+--
+cgit v0.9.0.2
+
diff --git a/extra/libfs/PKGBUILD b/extra/libfs/PKGBUILD
index 104082d0b..8b2e387d1 100644
--- a/extra/libfs/PKGBUILD
+++ b/extra/libfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197087 2013-10-21 18:34:58Z andyrtr $
+# $Id: PKGBUILD 208087 2014-03-17 17:35:29Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libfs
-pkgver=1.0.5
-pkgrel=2
+pkgver=1.0.6
+pkgrel=1
 pkgdesc="X11 Font Services Library"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -12,7 +12,7 @@ url="http://xorg.freedesktop.org/"
 depends=('glibc' 'xproto' 'fontsproto')
 makedepends=('xorg-util-macros' 'xtrans')
 source=("${url}/releases/individual/lib/libFS-${pkgver}.tar.bz2")
-sha256sums=('22eb3005dd8053aef7ff82758da5dd59ca9738410bcf847e675780e3a1f96107')
+sha256sums=('9007fcfbd37bfa6ede4000ec4b5c2dc6dc0f52789358361b43f68e9ae4d6aed7')
 
 build() {
   cd "${srcdir}/libFS-${pkgver}"
diff --git a/extra/prison/PKGBUILD b/extra/prison/PKGBUILD
index 942c46b30..579d0be69 100644
--- a/extra/prison/PKGBUILD
+++ b/extra/prison/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 206549 2014-03-01 08:22:41Z andrea $
+# $Id: PKGBUILD 208045 2014-03-17 08:06:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=prison
-pkgver=1.0
-pkgrel=2
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="A barcode API to produce QRCode barcodes and DataMatrix barcodes"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kdesupport/prison'
 license=('GPL')
 depends=('qt4' 'libdmtx' 'qrencode')
 makedepends=('cmake')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.gz")
-md5sums=('8baac61506e37a31482a0df4a5d02cd2')
+source=("http://download.kde.org/stable/${pkgname}/1.1/src/${pkgname}-${pkgver}.tar.xz")
+md5sums=('d809eaf66b0954dc28e8d63afca838ed')
 
 prepare() {
   mkdir build
diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD
index e0b658181..3d2779651 100644
--- a/extra/python-lxml/PKGBUILD
+++ b/extra/python-lxml/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 206583 2014-03-02 05:03:16Z angvp $
+# $Id: PKGBUILD 208047 2014-03-17 08:12:53Z fyan $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 pkgbase=python-lxml
 pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs')
-pkgver=3.3.1
+pkgver=3.3.3
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('BSD' 'custom')
 url="http://lxml.de/"
 makedepends=('python2' 'python' 'libxslt' 'python-cssselect' 'python2-cssselect')
 source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
-md5sums=('09401c787d9b2660b0d76c4c6baec0f3'
+md5sums=('f2675837b4358a5ecab5fd9a783fd0e5'
          'SKIP')
 
-# Temporary commented due a conflict with devtools and lxml
-#check() {
-#  cd lxml-$pkgver
-#  make PYTHON=python2 test
-#  make PYTHON=python test
-#}
+check() {
+  cd lxml-$pkgver
+  # Workaround encoding issue
+  LANG=en_US.UTF-8 make PYTHON=python2 test
+  LANG=en_US.UTF-8 make PYTHON=python test
+}
 
 package_python2-lxml() {
   pkgdesc="Python2 binding for the libxml2 and libxslt libraries"
diff --git a/extra/python-markupsafe/PKGBUILD b/extra/python-markupsafe/PKGBUILD
index fd1757779..1b302e731 100644
--- a/extra/python-markupsafe/PKGBUILD
+++ b/extra/python-markupsafe/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 193420 2013-08-20 06:10:07Z angvp $
+# $Id: PKGBUILD 208037 2014-03-17 07:42:18Z fyan $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alex Anthony <alex.anthony28991@gmail.com>
 
 pkgname=('python-markupsafe' 'python2-markupsafe')
-pkgver=0.18
-pkgrel=2
+pkgver=0.19
+pkgrel=1
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
 arch=('i686' 'x86_64')
 url="http://pypi.python.org/pypi/MarkupSafe"
 license=('custom')
 makedepends=('python-setuptools' 'python2-setuptools')
 source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
-md5sums=('f8d252fd05371e51dec2fe9a36890687')
+md5sums=('ccb3f746c807c5500850987006854a6d')
 
 build() {
   cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver}
diff --git a/extra/serf/PKGBUILD b/extra/serf/PKGBUILD
index fff40fb74..f26e233ad 100644
--- a/extra/serf/PKGBUILD
+++ b/extra/serf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200589 2013-11-29 15:17:26Z angvp $
+# $Id: PKGBUILD 208083 2014-03-17 16:24:17Z anatolik $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=serf
-pkgver=1.3.2
+pkgver=1.3.4
 pkgrel=1
 pkgdesc="High-performance asynchronous HTTP client library"
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ license=('Apache')
 depends=('apr-util')
 makedepends=('scons')
 options=('!staticlibs')
-source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('43ce30fccf39ab0186a7590e2733e3ec')
+source=(http://serf.googlecode.com/svn/src_releases/${pkgname}-${pkgver}.zip)
+md5sums=('f2d469ac03db98781c9d414fed5368ae')
 
 build() {
   cd ${pkgname}-${pkgver}