Wed Jul 3 00:48:29 PDT 2013

55 files changed, 1319 insertions, 487 deletions

diff --git a/community/fcitx-anthy/PKGBUILD b/community/fcitx-anthy/PKGBUILD
index 086398231..4bb6d088f 100644
--- a/community/fcitx-anthy/PKGBUILD
+++ b/community/fcitx-anthy/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 81663 2012-12-26 08:40:15Z fyan $
+# $Id: PKGBUILD 93363 2013-07-02 09:47:20Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: lh <jason52lh@gmail.com>
 
 pkgname=fcitx-anthy
-pkgver=0.1.1
-pkgrel=2
+pkgver=0.2.0
+pkgrel=1
 pkgdesc="Fcitx Wrapper for anthy."
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/fcitx"
 license=('GPL')
 depends=('fcitx>=4.2.5' 'anthy')
 makedepends=('cmake' 'intltool')
-source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
+source=("http://download.fcitx-im.org/$pkgname/$pkgname-$pkgver.tar.xz")
 install=fcitx-anthy.install
 
 build(){
@@ -29,4 +29,5 @@ package() {
   cd "$srcdir"/${pkgname}-${pkgver}/build
   make DESTDIR=${pkgdir} install
 }
-md5sums=('651e9a21e5203c14ca0968c63a820157')
+
+md5sums=('c02e4393d6141a4d0fa1693bf38a8f79')
diff --git a/community/fcitx-cloudpinyin/PKGBUILD b/community/fcitx-cloudpinyin/PKGBUILD
index 9ea80531e..4fd88ffc8 100644
--- a/community/fcitx-cloudpinyin/PKGBUILD
+++ b/community/fcitx-cloudpinyin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82972 2013-01-26 07:09:42Z fyan $
+# $Id: PKGBUILD 93364 2013-07-02 09:47:21Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: poplarch <poplarch@gmail.com>
 
 pkgname=fcitx-cloudpinyin
-pkgver=0.3.1
+pkgver=0.3.2
 pkgrel=1
 pkgdesc='Standalone module for fcitx that uses pinyin API on the internet to provide additional input candidates'
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="https://github.com/fcitx/fcitx-cloudpinyin"
 license=('GPL')
 depends=('curl' 'fcitx>=4.2.7')
 makedepends=('cmake')
-source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
+source=("http://download.fcitx-im.org/$pkgname/$pkgname-$pkgver.tar.xz")
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
@@ -27,4 +27,4 @@ package() {
   make DESTDIR="$pkgdir" install
 }
 
-md5sums=('3690930d1412258ad37524448268534e')
+sha512sums=('ddda528f72ffd200ae78b4b2d9791e20576a220d0b15e4c55e9bd1977188c65696ca2a522acbb27177b2b22b33cdc41774d1ce111eb090adaba8fcc97f12cd8e')
diff --git a/community/fcitx-configtool/PKGBUILD b/community/fcitx-configtool/PKGBUILD
index 00ed7aa7c..9094e8105 100644
--- a/community/fcitx-configtool/PKGBUILD
+++ b/community/fcitx-configtool/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 82970 2013-01-26 07:06:27Z fyan $
+# $Id: PKGBUILD 93365 2013-07-02 09:47:22Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=fcitx-configtool
-pkgver=0.4.6
-pkgrel=1
+pkgver=0.4.7
+pkgrel=2
 pkgdesc="GTK based config tool for Fcitx"
 arch=('i686' 'x86_64')
 url="http://fcitx.googlecode.com/"
 license=('GPL2')
 depends=("fcitx>=4.2.7" "gtk3" "iso-codes")
-optdepends=('fcitx-qt: for some configuration windows')
+optdepends=('fcitx-qt4: for some configuration windows')
 makedepends=("cmake")
-source=("http://fcitx.googlecode.com/files/$pkgname-$pkgver.tar.xz")
+source=("http://download.fcitx-im.org/$pkgname/$pkgname-$pkgver.tar.xz")
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -29,4 +29,4 @@ package() {
   make DESTDIR="$pkgdir" install
 }
 
-md5sums=('69eb7271883b0b7894ddab5a38ceeb2f')
+sha512sums=('90ec9f4c30c46ea937f965173a4213b67d1cb360cc43b96af9899cdd5a0e35d34658ee7149ed10b3dc58d3851bc1712915db970fd2d25a976983b1037e380be2')
diff --git a/community/fcitx-hangul/PKGBUILD b/community/fcitx-hangul/PKGBUILD
index c2dfa66f5..02d3bdf5a 100644
--- a/community/fcitx-hangul/PKGBUILD
+++ b/community/fcitx-hangul/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 82968 2013-01-26 07:04:20Z fyan $
+# $Id: PKGBUILD 93366 2013-07-02 09:47:23Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=fcitx-hangul
-pkgver=0.2.1
+pkgver=0.3.0
 pkgrel=1
 pkgdesc="Hangul (Korean) support for fcitx"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL2')
 depends=('fcitx>=4.2.7' 'libhangul')
 makedepends=('cmake' 'intltool')
 install=$pkgname.install
-source=("http://fcitx.googlecode.com/files/$pkgname-$pkgver.tar.xz")
+source=("http://download.fcitx-im.org/$pkgname/$pkgname-$pkgver.tar.xz")
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
@@ -30,4 +30,4 @@ package() {
    make DESTDIR="$pkgdir" install
 }
 
-md5sums=('d3dac52b1a1697a4f8256e383c889216')
+sha512sums=('07085508da98c49bcecf75fbfad6681263a735a1efcc4fb7a6fa05cb215dfe0c338e95e26cc55e488501b5abbc1007464b1bbf488f07aaca2d1a0a18c8173074')
diff --git a/community/fcitx-kkc/PKGBUILD b/community/fcitx-kkc/PKGBUILD
new file mode 100644
index 000000000..ede7a106b
--- /dev/null
+++ b/community/fcitx-kkc/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: csslayer <wengxt AT gmail com>
+
+pkgname=fcitx-kkc
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Fcitx Wrapper for libkkc"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/fcitx"
+license=('GPL')
+depends=('fcitx>=4.2.8' 'libkkc>=0.2.3' 'libkkc-data' 'skk-jisyo' 'fcitx-qt4')
+makedepends=('cmake')
+install=$pkgname.install
+source=(http://download.fcitx-im.org/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+
+build(){
+    cd "$srcdir/${pkgname}-${pkgver}"
+    rm -rf build
+    mkdir build
+    cd build
+    
+    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+    make
+}
+
+package ()
+{
+    cd "$srcdir/${pkgname}-${pkgver}/build"
+    make DESTDIR="${pkgdir}" install
+}
+
+md5sums=('c86a48f9e7a1e9de16b0919e5413fc9d')
diff --git a/community/fcitx-kkc/fcitx-kkc.install b/community/fcitx-kkc/fcitx-kkc.install
new file mode 100644
index 000000000..6b1b64bdd
--- /dev/null
+++ b/community/fcitx-kkc/fcitx-kkc.install
@@ -0,0 +1,11 @@
+post_install() {
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/fcitx-libpinyin/PKGBUILD b/community/fcitx-libpinyin/PKGBUILD
index e69931850..7a5f4fddf 100644
--- a/community/fcitx-libpinyin/PKGBUILD
+++ b/community/fcitx-libpinyin/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 89876 2013-05-04 04:07:04Z fyan $
+# $Id: PKGBUILD 93367 2013-07-02 09:47:24Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: poplarch <poplarch@gmail.com>
 
 pkgname=fcitx-libpinyin
-pkgver=0.2.92
+pkgver=0.3.0
 pkgrel=1
 pkgdesc="Fcitx Wrapper for libpinyin, Library to deal with pinyin"
 arch=('i686' 'x86_64')
 url="https://github.com/fcitx/fcitx-libpinyin"
 license=('GPL')
-depends=('fcitx' 'libpinyin')
+depends=('fcitx' 'libpinyin' 'fcitx-qt4' 'qtwebkit')
 makedepends=('cmake' 'intltool' 'wget')
-source=("https://fcitx.googlecode.com/files/${pkgname}-${pkgver}_dict.tar.xz")
+source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}_dict.tar.xz")
 install=$pkgname.install
 
 build() {
@@ -31,4 +31,5 @@ package() {
   cd "$srcdir/${pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
 }
-sha512sums=('bea86b1041fa311a9bbcd2a6d74ab36d9659ebb6c92122307d3bd4dc44bcb0567d4aeafe62f3b6fe6a85160b369722f391063b47765dc88ec9a9b569cfca640f')
+
+sha512sums=('e80e15a51f0d7de20abc4877d32796bbd93f30a2e4383bd64bccf1075696dddb2d0ea0180fff44ebee0e94988ab60e3d2526dd3f80bb99f4186e1bf4e3437762')
diff --git a/community/fcitx-m17n/PKGBUILD b/community/fcitx-m17n/PKGBUILD
index efa1939e9..b593fe10b 100644
--- a/community/fcitx-m17n/PKGBUILD
+++ b/community/fcitx-m17n/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 82966 2013-01-26 06:55:02Z fyan $
+# $Id: PKGBUILD 93368 2013-07-02 09:47:25Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=fcitx-m17n
-pkgver=0.2.0
+pkgver=0.2.1
 pkgrel=1
 pkgdesc="Fcitx Wrapper for m17n."
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://code.google.com/p/fcitx"
 license=('GPL')
 depends=('fcitx>=4.2.7' 'm17n-lib')
 makedepends=('cmake')
-source=(http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz)
+source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}.tar.xz")
 
 build() {
     cd "$srcdir/${pkgname}-${pkgver}"
@@ -25,4 +25,5 @@ package() {
     cd "$srcdir/${pkgname}-${pkgver}/build"
     make DESTDIR="${pkgdir}" install
 }
-md5sums=('6740e3a983c3e7647be3f082abdfc57c')
+
+sha512sums=('b2becf6f20de32191690a5541956dc0a607443bd593fbfb61d1663dcc1f854df6b146c17ed73afbdff4006c12f001707de87adc706b3e1d45608bbf2bc045bce')
diff --git a/community/fcitx-sayura/PKGBUILD b/community/fcitx-sayura/PKGBUILD
new file mode 100644
index 000000000..318877548
--- /dev/null
+++ b/community/fcitx-sayura/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+
+pkgname=fcitx-sayura
+pkgver=0.1.1
+pkgrel=1
+pkgdesc="Sinhala Transe IME engine for fcitx."
+arch=('i686' 'x86_64')
+url="https://github.com/fcitx/fcitx-sayura"
+license=('GPL')
+depends=('fcitx>=4.2.8')
+makedepends=('cmake' 'intltool')
+install=${pkgname}.install
+source=("http://download.fcitx-im.org/$pkgname/$pkgname-$pkgver.tar.xz")
+
+build() {
+  cd "$srcdir"/${pkgname}-${pkgver}
+
+  rm -rf build
+  mkdir build
+  cd build
+  
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+  make
+}
+
+package() {
+  cd "$srcdir"/${pkgname}-${pkgver}/build
+  make DESTDIR="$pkgdir" install
+}
+
+sha512sums=('1eda91ae985df65982cf6f4e67b676bb8eb7117cd1aad7c2a90e81c13fa2a806bbff5eda7bb7e797cb26cb46bbda51931ecffd50384a89ead24ad90777183dc3')
diff --git a/community/fcitx-sayura/fcitx-sayura.install b/community/fcitx-sayura/fcitx-sayura.install
new file mode 100644
index 000000000..6b1b64bdd
--- /dev/null
+++ b/community/fcitx-sayura/fcitx-sayura.install
@@ -0,0 +1,11 @@
+post_install() {
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/fcitx-sunpinyin/PKGBUILD b/community/fcitx-sunpinyin/PKGBUILD
index 92b46b094..d6b1e690c 100644
--- a/community/fcitx-sunpinyin/PKGBUILD
+++ b/community/fcitx-sunpinyin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 82959 2013-01-26 06:44:09Z fyan $
+# $Id: PKGBUILD 93370 2013-07-02 09:47:26Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=fcitx-sunpinyin
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Fcitx Wrapper for sunpinyin, Statistical Language Model based pinyin IME by Sun"
 arch=('i686' 'x86_64')
@@ -10,8 +10,8 @@ url="http://code.google.com/p/fcitx"
 license=('GPL')
 install=fcitx-sunpinyin.install
 depends=('fcitx>=4.2.7' 'sunpinyin>2.0.3' 'sunpinyin-data' 'gtk-update-icon-cache')
-makedepends=('cmake' 'intltool')
-source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
+makedepends=('cmake')
+source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}.tar.xz")
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
@@ -28,4 +28,4 @@ package() {
   make DESTDIR="${pkgdir}" install
 }
 
-md5sums=('de2723baf8e5d9092706cd2baf2f21bb')
+sha512sums=('7ad9065d86d7bb3ceb6536a0fe3559bf2ba60aebe69e2f07c8dadad1a0a2283a1b85712105c6c2a2bf19b9645c4392204db9c3d1db234618ba7f62ee44eda85c')
diff --git a/community/fcitx-unikey/PKGBUILD b/community/fcitx-unikey/PKGBUILD
index df7604dc0..b88acf52c 100644
--- a/community/fcitx-unikey/PKGBUILD
+++ b/community/fcitx-unikey/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 85345 2013-03-01 10:30:29Z andrea $
+# $Id: PKGBUILD 93372 2013-07-02 09:47:28Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=fcitx-unikey
-pkgver=0.2.0
-pkgrel=2
+pkgver=0.2.1
+pkgrel=1
 pkgdesc="Fcitx Wrapper for unikey"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/fcitx"
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('fcitx>=4.2.7')
 optdepends=('qt4: To run the fcitx unikey macro editor')
 makedepends=('cmake' 'qt4')
-source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
+source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}.tar.xz")
 install=fcitx-unikey.install
 
 build(){
@@ -19,7 +19,7 @@ build(){
     mkdir -p build
     cd build
     
-    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DQT_QMAKE_EXECUTABLE=qmake-qt4 ..
     make
 }
 
@@ -28,4 +28,5 @@ package ()
     cd "$srcdir/${pkgname}-${pkgver}/build"
     make DESTDIR="${pkgdir}" install
 }
-md5sums=('f1ffd6c8439e4d277eace994052d91da')
+
+sha512sums=('8349623c196ec7c4e48e64d07ef551a308f71f2bfc09fcd320bb02854a77370169b94131750dfcf065dd2a9c734c86048f482d0d2f0b210a1834ab77ea3bf1aa')
diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
index 3dca22164..0e1427be1 100644
--- a/community/fcitx/PKGBUILD
+++ b/community/fcitx/PKGBUILD
@@ -1,33 +1,34 @@
-# $Id: PKGBUILD 88848 2013-04-24 06:26:30Z fyan $
+# $Id: PKGBUILD 93362 2013-07-02 09:47:19Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: csslayer <wengxt AT gmail com>
 
 pkgbase=fcitx
 pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
-pkgver=4.2.7
-pkgrel=8
+pkgver=4.2.8
+pkgrel=2
 groups=('fcitx-im')
 arch=('i686' 'x86_64')
-url="http://code.google.com/p/fcitx/"
+url="http://fcitx-im.org"
 license=('GPL')
 makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' \
-             'iso-codes' 'gobject-introspection' 'libxkbfile' 'git')
-source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz
-	https://github.com/fcitx/fcitx/commit/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch
-	https://github.com/fcitx/fcitx/commit/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch
-	https://github.com/fcitx/fcitx/commit/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch
-	https://github.com/fcitx/fcitx/commit/a9e6570046f9c1477dd6ec6e30e91e020e62d698.patch
-)
+             'iso-codes' 'gobject-introspection' 'libxkbfile')
+source=(http://download.fcitx-im.org/$pkgbase/$pkgbase-${pkgver}_dict.tar.xz
+        https://github.com/fcitx/fcitx/commit/b0a5439ac0188211c0955baf6811a0e3406ac812.patch
+        https://github.com/fcitx/fcitx/commit/94635187b18badb1a2dff821de9a30a20d00feb1.patch
+        https://github.com/fcitx/fcitx/commit/46d5a69d595ac825f47a3c22ddeb8ce71b04e887.patch)
 
 build() {
   #source /etc/profile.d/qt4.sh
 
   cd "$srcdir/$pkgbase-$pkgver"
-  patch -Np1 -i "$srcdir/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch"
-  patch -Np1 -i "$srcdir/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch"
-  git apply -v -p1 "$srcdir/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch"
-  patch -Np1 -i "$srcdir/a9e6570046f9c1477dd6ec6e30e91e020e62d698.patch"
+
+  # Fix ELF file patch
+  patch -p1 -i ../b0a5439ac0188211c0955baf6811a0e3406ac812.patch
+
+  # Fix switch key issue
+  patch -p1 -i ../94635187b18badb1a2dff821de9a30a20d00feb1.patch
+  patch -p1 -i ../46d5a69d595ac825f47a3c22ddeb8ce71b04e887.patch
 
   cd "$srcdir"
   mkdir -p build
@@ -88,7 +89,7 @@ package_fcitx() {
   rm -r "${pkgdir}/usr/lib/"{gtk-2.0,gtk-3.0,qt4}
   rm -r "${pkgdir}/usr/lib/fcitx/qt"
   rm -r "${pkgdir}/usr/include/fcitx-qt"
-  rm "${pkgdir}/usr/bin/fcitx-qt-gui-wrapper"
+  rm "${pkgdir}/usr/lib/fcitx/libexec/fcitx-qt-gui-wrapper"
   rm "${pkgdir}/usr/lib/"libfcitx-qt.so*
   rm "${pkgdir}/usr/lib/pkgconfig/fcitx-qt.pc"
 }
@@ -128,8 +129,7 @@ package_fcitx-qt4() {
   make DESTDIR="${pkgdir}" install
 }
 
-md5sums=('6e291717c24615b9dc9bfaa2949af3a7'
-         '246e36c2232f107ed1692a52ebc43c39'
-         '6f420547bc8af9627db2e5290f758433'
-         '51e53377e1b83661f2896e25d1a46242'
-         '5e9f90817722a138b459b2bf6a926f96')
+md5sums=('79676d18536ebb9d0a0fa47e96416016'
+         '0f3f85204ac1559bbf2cff304122234e'
+         '417cd212d9fb7b9881232d57d023e49f'
+         'd91ae8316154eccce3234c55e53a3c3b')
diff --git a/community/ibus-kkc/ChangeLog b/community/ibus-kkc/ChangeLog
new file mode 100644
index 000000000..61358e57e
--- /dev/null
+++ b/community/ibus-kkc/ChangeLog
@@ -0,0 +1,14 @@
+2013-06-07  ponsfoot  <cabezon dot hashimoto at gmail dot com>
+
+	* ibus-kkc 1.5.14-1
+	- upstream update
+
+2013-05-27  ponsfoot  <cabezon dot hashimoto at gmail dot com>
+
+	* ibus-kkc 1.5.13-2
+	- Fix dependency (Add libkkc)
+
+2013-05-27  ponsfoot  <cabezon dot hashimoto at gmail dot com>
+
+	* ibus-kkc 1.5.13-1
+	- Initial release on AUR
diff --git a/community/ibus-kkc/PKGBUILD b/community/ibus-kkc/PKGBUILD
new file mode 100644
index 000000000..d9d9a5a07
--- /dev/null
+++ b/community/ibus-kkc/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
+
+pkgname=ibus-kkc
+pkgver=1.5.14
+pkgrel=2
+pkgdesc="libkkc (Japanese Kana Kanji input method) engine for ibus"
+arch=('i686' 'x86_64')
+url="https://bitbucket.org/libkkc"
+license=('GPL')
+options=(!libtool)
+depends=('ibus' 'libkkc' 'libkkc-data' 'skk-jisyo')
+makedepends=('vala' 'intltool')
+changelog=ChangeLog
+source=(https://bitbucket.org/libkkc/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('9396521d85501757dd42c64f92e52a2e5f514872')
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  # VALAC=/usr/bin/valac-0.18 \
+  ./configure --prefix=/usr --libexecdir=/usr/lib/ibus-kkc --disable-static
+  make
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/kcm-fcitx/PKGBUILD b/community/kcm-fcitx/PKGBUILD
index 2840f768e..6b24e756e 100644
--- a/community/kcm-fcitx/PKGBUILD
+++ b/community/kcm-fcitx/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 85498 2013-03-02 02:59:40Z fyan $
+# $Id: PKGBUILD 93373 2013-07-02 09:47:29Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: poplarch <poplarch@gmail.com>
 
 pkgname=kcm-fcitx
-pkgver=0.4.2
-pkgrel=2
+pkgver=0.4.3
+pkgrel=1
 pkgdesc="KDE Config Module for Fcitx"
 arch=('i686' 'x86_64')
 url="https://github.com/fcitx/kcm-fcitx"
 license=('GPL')
 depends=('fcitx>=4.2.7' 'kdebase-runtime' 'fcitx-qt4')
 makedepends=('cmake' 'automoc4')
-source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
+source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}.tar.xz")
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
@@ -27,4 +27,5 @@ package() {
   cd "$srcdir/${pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('3c45e7109bec4b6fa984f952fb94002d')
+
+sha512sums=('d311699a5d99f75d353899b7fba0a950491ee8b891724b855033449900ec4b3db9408bb1b80e60ceb0dbb0ce91072162062261a497f83a2a683214b71c3f4713')
diff --git a/community/libgit2-glib/PKGBUILD b/community/libgit2-glib/PKGBUILD
index 8e9fadcb6..38f5b31d5 100644
--- a/community/libgit2-glib/PKGBUILD
+++ b/community/libgit2-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 92908 2013-06-18 13:46:11Z heftig $
+# $Id: PKGBUILD 93394 2013-07-02 20:55:40Z eric $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libgit2-glib
-pkgver=0.0.2
+pkgver=0.0.6
 pkgrel=1
 pkgdesc="GLib wrapper for libgit2"
 url="http://live.gnome.org/Libgit2-glib"
@@ -11,7 +11,7 @@ arch=(i686 x86_64)
 depends=(glib2 libgit2 gobject-introspection)
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e1e0c6e0cb6897c09e06edc06ee70befca2a3e1b3eb629c449b8ca0f49db75e5')
+sha256sums=('bda84b5ab6fbe2922a4cf386b4e6d4401863dec7bea1879e86939d005cd521f6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/libkkc-data/ChangeLog b/community/libkkc-data/ChangeLog
new file mode 100644
index 000000000..dc925a33b
--- /dev/null
+++ b/community/libkkc-data/ChangeLog
@@ -0,0 +1,14 @@
+2013-05-28  ponsfoot  <cabezon dot hashimoto at gmail dot com>
+
+	- Clean up makedepends
+
+2013-05-28  ponsfoot  <cabezon dot hashimoto at gmail dot com>
+
+	* libkkc-data 0.2.0-2
+	- Add marisa (marisa-python) into makedepends
+
+2013-05-27  ponsfoot  <cabezon dot hashimoto at gmail dot com>
+
+	* libkkc-data 0.2.0-1
+	- Initial release on AUR
+
diff --git a/community/libkkc-data/PKGBUILD b/community/libkkc-data/PKGBUILD
new file mode 100644
index 000000000..1c84beae9
--- /dev/null
+++ b/community/libkkc-data/PKGBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
+
+pkgname=libkkc-data
+pkgver=0.2.0
+pkgrel=4
+pkgdesc="Language model data package for libkkc"
+arch=('i686' 'x86_64')
+url="https://bitbucket.org/libkkc"
+license=('GPL')
+makedepends=('python2-marisa')
+changelog=ChangeLog
+source=(https://bitbucket.org/libkkc/${pkgname}/downloads/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('6bc5601b3ec4c76066255827563b8debb50dd917')
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  ./configure PYTHON=/usr/bin/python2 --prefix=/usr
+  make -j1
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/libkkc/ChangeLog b/community/libkkc/ChangeLog
new file mode 100644
index 000000000..8067acabf
--- /dev/null
+++ b/community/libkkc/ChangeLog
@@ -0,0 +1,26 @@
+2013-06-07  ponsfoot  <cabezon dot hashimoto at gmail dot com>
+
+	* libkkc 0.2.4-1
+	- upstream update
+
+2013-05-29  ponsfoot  <cabezon dot hashimoto at gmail dot com>
+
+	* libkkc 0.2.3-4
+	- Fix makedepends (s/python2/marisa-python2/)
+	- Add to install docs
+
+2013-05-28  ponsfoot  <cabezon dot hashimoto at gmail dot com>
+
+	* libkkc 0.2.3-3
+	- Fix dependency (libgee-0.6 -> libgee06 [extra])
+
+2013-05-27  ponsfoot  <cabezon dot hashimoto at gmail dot com>
+
+	* libkkc 0.2.3-2
+	- Fix dependency (move some of makedepends into depends)
+
+2013-05-27  ponsfoot  <cabezon dot hashimoto at gmail dot com>
+
+	* libkkc 0.2.3-1
+	- Initial release on AUR
+
diff --git a/community/libkkc/PKGBUILD b/community/libkkc/PKGBUILD
new file mode 100644
index 000000000..32afb6144
--- /dev/null
+++ b/community/libkkc/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
+
+pkgname=libkkc
+pkgver=0.2.4
+pkgrel=2
+pkgdesc="Japanese Kana Kanji conversion library"
+arch=('i686' 'x86_64')
+url="https://bitbucket.org/libkkc"
+license=('GPL')
+options=(!libtool)
+depends=('marisa' 'json-glib' 'libgee06')
+makedepends=('vala' 'gobject-introspection' 'intltool' 'python2-marisa')
+changelog=ChangeLog
+source=(https://bitbucket.org/libkkc/libkkc/downloads/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('28bafb612f8176735f02bd6f49581e072700af4e')
+
+build() {
+  cd "${pkgname}-${pkgver}"
+
+  #VALAC=/usr/bin/valac-0.18 \
+  PYTHON=/usr/bin/python2 \
+  ./configure --prefix=/usr --disable-static --disable-silent-rules
+  make
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
+  install -d "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}"
+  install -m 644 README data/rules/README.rules COPYING \
+    "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/"  
+}
diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD
index a00653f90..d9bab088c 100644
--- a/community/linux-tools/PKGBUILD
+++ b/community/linux-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91654 2013-05-26 09:24:39Z bluewind $
+# $Id: PKGBUILD 93324 2013-07-01 22:56:17Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgbase=linux-tools
@@ -8,8 +8,8 @@ pkgname=('linux-tools-meta'
          'cpupower'
          'x86_energy_perf_policy'
          'usbip')
-pkgver=3.9
-pkgrel=3
+pkgver=3.10
+pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64')
 url='http://www.kernel.org'
@@ -31,19 +31,21 @@ source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz"
         'cpupower.service'
         'usbipd.service')
 # http://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc
-sha256sums=('60bc3e64ee5dc778de2cd7cd7640abf518a4c9d4f31b8ed624e16fad53f54541'
+sha256sums=('df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
             'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
             '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f')
 
-build() {
+prepare() {
   # apply stable patching set
-  if (( NOEXTRACT == 0 )) && [[ -e "$srcdir"/patch-* ]]; then
+  if [[ -e "$srcdir"/patch-* ]]; then
     msg2 'Applying stable patch set'
     patch -N -p1 -i "$srcdir"/patch-*
   fi
+}
 
+build() {
   msg2 'Build libtraceevent'
   pushd linux-$pkgver/tools/lib/traceevent
   make
diff --git a/community/lua-zlib/PKGBUILD b/community/lua-zlib/PKGBUILD
index d5c789cdf..17a34d721 100644
--- a/community/lua-zlib/PKGBUILD
+++ b/community/lua-zlib/PKGBUILD
@@ -1,35 +1,34 @@
-# $Id: PKGBUILD 93160 2013-06-26 13:34:20Z spupykin $
+# $Id: PKGBUILD 93359 2013-07-02 09:43:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
-#pkgname=(lua-zlib lua51-zlib)
-pkgname=(lua51-zlib)
+pkgname=(lua-zlib lua51-zlib)
 pkgbase=lua-zlib
-pkgver=0.2
-pkgrel=8
-_gitver=8d07669
+pkgver=20130702
+pkgrel=1
 url="http://github.com/brimworks/lua-zlib"
 pkgdesc='Simple streaming interface to zlib for Lua.'
 arch=('i686' 'x86_64')
 license=('MIT')
-makedepends=('cmake' 'lua' 'lua51' 'zlib')
+makedepends=('cmake' 'lua' 'lua51' 'zlib' 'git')
 conflicts=('lua-lzlib')
-source=("lua-zlib-$pkgver.zip::https://github.com/brimworks/lua-zlib/zipball/v$pkgver")
-md5sums=('e6c780c0c4b6dcb88cf16949bb751be7')
+#source=("lua-zlib-$pkgver.zip::https://github.com/brimworks/lua-zlib/zipball/v$pkgver")
+source=("git://github.com/brimworks/lua-zlib.git")
+md5sums=('SKIP')
 
 build() {
-  cp -a $srcdir/brimworks-lua-zlib-${_gitver} $srcdir/brimworks-lua51-zlib-${_gitver}
+  cp -a $srcdir/lua-zlib $srcdir/lua51-zlib
 
-  cd $srcdir/brimworks-lua-zlib-${_gitver}
+  cd $srcdir/lua-zlib
   gcc -o zlib.so -O2 -fPIC -shared lua_zlib.c -llua -lz
 
-  cd $srcdir/brimworks-lua51-zlib-${_gitver}
+  cd $srcdir/lua51-zlib
   gcc -o zlib.so -O2 -fPIC -shared -I/usr/include/lua5.1 lua_zlib.c -llua5.1 -lz
 }
 
 package_lua-zlib() {
   depends=('zlib' 'lua')
 
-  cd $srcdir/brimworks-lua-zlib-${_gitver}
+  cd $srcdir/lua-zlib
   install -Dm0755 zlib.so $pkgdir/usr/lib/lua/5.2/zlib.so
   install -Dm644 "README" "$pkgdir/usr/share/licenses/$pkgname/README"
 }
@@ -37,7 +36,7 @@ package_lua-zlib() {
 package_lua51-zlib() {
   depends=('zlib' 'lua51')
 
-  cd $srcdir/brimworks-lua51-zlib-${_gitver}
+  cd $srcdir/lua51-zlib
   install -Dm0755 zlib.so $pkgdir/usr/lib/lua/5.1/zlib.so
   install -D -m644 "README" "$pkgdir/usr/share/licenses/$pkgname/README"
 }
diff --git a/community/opensmtpd/PKGBUILD b/community/opensmtpd/PKGBUILD
index 5e588c010..e56eebe63 100644
--- a/community/opensmtpd/PKGBUILD
+++ b/community/opensmtpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 92253 2013-06-03 11:15:25Z allan $
+# $Id: PKGBUILD 93322 2013-07-01 22:20:09Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=opensmtpd
-pkgver=5.3.2p1
-pkgrel=2
+pkgver=5.3.3p1
+pkgrel=1
 pkgdesc='Free implementation of the server-side SMTP protocol'
 arch=('i686' 'x86_64')
 url='http://www.opensmtpd.org/'
@@ -11,29 +11,40 @@ license=('custom')
 depends=('libevent')
 provides=('smtp-server' 'smtp-forwarder')
 conflicts=('smtp-server' 'smtp-forwarder')
-backup=('etc/smtpd.conf' 'etc/aliases' 'etc/virtual' 'etc/secrets')
+backup=('etc/smtpd/smtpd.conf' 'etc/smtpd/aliases')
 install=opensmtpd.install
 source=("http://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz"
         'smtpd.service'
         'smtpd.socket')
-md5sums=('8fc513dd632461f70e433103d75dbf50'
+md5sums=('795982f9b0b45c7645f897ba2ead0024'
          'a278f272d97a9fe5a8aac784a7c98d67'
          'c2c01e9ca78df3f65efe40a7c0e17ee0')
 
+prepare() {
+  cd $pkgname-$pkgver
+  sed -i 's,etc/aliases,etc/smtpd/aliases,' smtpd/smtpd.conf
+  # regen configure. don't use bootstrap script (doesn't support automake 1.14)
+  libtoolize --copy --force
+  aclocal -I m4
+  autoconf
+  autoheader
+  automake --foreign --add-missing --copy
+}
+
 build() {
   cd $pkgname-$pkgver
-  ./bootstrap
   ./configure \
     --prefix=/usr \
-    --sysconfdir=/etc \
+    --sysconfdir=/etc/smtpd \
     --sbindir=/usr/bin \
     --libexecdir=/usr/bin \
     --with-maildir=/var/spool/mail \
     --with-privsep-path=/var/empty \
     --with-sock-dir=/run \
-    --with-privsep-user=mail \
-    --with-filter-user=mail \
-    --with-queue-user=mail \
+    --with-privsep-user=smtpd \
+    --with-lookup-user=smtpd \
+    --with-queue-user=smtpq \
+    --with-filter-user=smtpf \
     --with-pam
   make
 }
@@ -41,23 +52,21 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir/" install
+  # license
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  cd "$pkgdir"
   # working directory
+  cd "$pkgdir"
   install -dm711 var/spool/smtpd
-  # license
   install -Dm644 "$srcdir/smtpd.service" usr/lib/systemd/system/smtpd.service
   install -Dm644 "$srcdir/smtpd.socket" usr/lib/systemd/system/smtpd.socket
   # remove duplicate hardlink into a subfolder
-  rm -r usr/bin/opensmtpd
-  # empty aliases file
-  install -Dm644 /dev/null "$pkgdir/etc/aliases"
-  install -Dm644 /dev/null "$pkgdir/etc/virtual"
-  install -Dm640 /dev/null "$pkgdir/etc/secrets"
+  rm -vr usr/bin/opensmtpd
+  # empty aliases file (used by default config)
+  install -Dm644 /dev/null "$pkgdir/etc/smtpd/aliases"
   # fake sendmail binary (used to be smtp-forwarder)
-  # use hardlink as upstream does...
-  ln "$pkgdir/usr/bin/smtpctl" "$pkgdir/usr/bin/sendmail"
+  # use hardlink as upstream does
+  cd "$pkgdir/usr/bin"
+  ln smtpctl "$pkgdir/usr/bin/sendmail"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/opensmtpd/opensmtpd.install b/community/opensmtpd/opensmtpd.install
index 0e3d8c0e1..48366c15c 100644
--- a/community/opensmtpd/opensmtpd.install
+++ b/community/opensmtpd/opensmtpd.install
@@ -1,14 +1,29 @@
 # arg 1:  the new package version
-# arg 2:  the old package version
+post_install() {
+  # create users
+  getent passwd smtpd >/dev/null || useradd -d / -u 91 -g 1 smtpd
+  getent passwd smtpq >/dev/null || useradd -d /var/spool/smtpd -u 92 -g 1 smtpq
+  getent passwd smtpf >/dev/null || useradd -d / -u 93 -g 1 smtpf
+  # initialise aliase db
+  #[[ -e /etc/smtpd/aliases.db ]] || makemap -t aliases /etc/smtpd/aliases
+  true
+}
 
 # arg 1:  the new package version
-post_install() {
-  makemap -t aliases /etc/aliases
+# arg 2:  the old package version
+post_upgrade() {
+  post_install "$1"
+  if (( $(vercmp $2 5.3.3p1-1) < 0 )); then
+    echo 'Configuration files have been moved to /etc/smtpd.'
+    echo 'New users have been added.'
+    echo 'Check your configuration!'
+  fi
 }
 
 # arg 1:  the old package version
 post_remove() {
- rm -f /etc/aliases.db
+  for _u in smtpd smtpq smtpf; do userdel -f "$_u"; done
+  true
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index f0a68eb21..40771d802 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 91502 2013-05-23 10:15:09Z spupykin $
+# $Id: PKGBUILD 93361 2013-07-02 09:44:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Coolen <mark.coolen@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=squid
-pkgver=3.3.5
-pkgrel=2
+pkgver=3.3.6
+pkgrel=1
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686')
 url='http://www.squid-cache.org'
 depends=('openssl' 'pam' 'cron' 'perl' 'libltdl')
-makedepends=('libcap')
+makedepends=('libcap' 'krb5')
 license=('GPL')
 options=('emptydirs')
 backup=('etc/squid/squid.conf'
@@ -21,12 +21,12 @@ source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2"
         'squid.pam'
         'squid.cron'
         'squid.service')
-md5sums=('c7991aa8528034af0e21a69edf26e41b'
+md5sums=('8dff6c8e9f46722fc62131364f0eeac6'
          '270977cdd9b47ef44c0c427ab9034777'
          'a71425c4951f2e5b640d19e6a5048531'
          'ceeb57c69ebb165676219222f109a24e')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # gcc 4.6 doesn't support -fhuge-objects.
@@ -39,6 +39,20 @@ build() {
 
   sed -i '1,1i#include <errno.h>' helpers/external_acl/file_userip/ext_file_userip_acl.cc
 
+  for i in \
+    helpers/basic_auth/DB \
+    helpers/log_daemon/DB \
+    helpers/negotiate_auth/kerberos \
+    helpers/external_acl/SQL_session; \
+  do
+      echo -e "#!/bin/sh\nexit 0" >$i/config.test
+      chmod 0755 $i/config.test
+  done
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   ./configure \
     --prefix=/usr \
     --sbindir=/usr/bin \
diff --git a/community/wxgtk2.9/PKGBUILD b/community/wxgtk2.9/PKGBUILD
index 5012f7ba4..83fa6b2a9 100644
--- a/community/wxgtk2.9/PKGBUILD
+++ b/community/wxgtk2.9/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 90109 2013-05-06 19:40:09Z foutrelis $
+# $Id: PKGBUILD 93329 2013-07-02 01:23:14Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=wxgtk2.9
 pkgver=2.9.4
-pkgrel=3
+pkgrel=4
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
 url="http://wxwidgets.org"
 license=('custom:wxWindows')
 depends=('gtk2' 'gstreamer0.10-base')
-makedepends=('gstreamer0.10-base-plugins' 'gconf')
+makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2')
+optdepends=('webkitgtk2: for webview support')
 source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2 wxGTK-2.9.4-collision.patch)
 sha1sums=('5a34ddf19d37c741f74652ee847df9568a8b81e1'
           'a76ccca4c2fad246c9aafbcc5a9697ebf35f33a3')
@@ -22,7 +23,7 @@ prepare() {
 build() {
   cd wxWidgets-${pkgver}
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
-    --enable-graphics_ctx --enable-mediactrl --with-regex=builtin \
+    --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \
     --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
     --disable-precomp-headers
   make
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
-
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index e01981433..6ea777a16 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185397 2013-05-13 19:05:20Z heftig $
+# $Id: PKGBUILD 189275 2013-07-02 07:37:30Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 _pkgname=file-roller
 pkgname=file-roller-libre
-pkgver=3.8.2
+pkgver=3.8.3
 pkgrel=1
 pkgdesc="Create and modify archives, with unar recommendation included and nonfree unace recommendation removed"
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,7 +23,7 @@ options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('b251b146d7966d770c98546e2152dbc17785ef3b8cf460f692829d0ac1cbe79e')
+sha256sums=('55caac832ed0bab89085fdf7a3c3fa1afaf8ae6fb05aeb2a872e42cb6c52894e')
 
 build() {
   cd $_pkgname-$pkgver
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 85ba7dba7..54ac4b74f 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91131 2013-05-19 23:48:35Z seblu $
+# $Id: PKGBUILD 93323 2013-07-01 22:56:01Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -9,11 +9,11 @@ pkgname=('linux-libre-tools-meta'
          'cpupower-libre'
          'x86_energy_perf_policy-libre'
          'usbip-libre')
-_basekernel=3.9
+_basekernel=3.10
 #_sublevel=6
 _pkgver=$_basekernel.$_sublevel
 pkgver=$_basekernel
-pkgrel=3
+pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -34,13 +34,13 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/
         'cpupower.systemd'
         'cpupower.service'
         'usbipd.service')
-sha256sums=('62f113b4bd9ee832e8906da970c5bf4585c057af4eab14ec6ad57e9b2fd084ef'
+sha256sums=('abee814b92422cfa3df90b62ad9ba888697fcc03a713adc2c7f68e0d0c23c329'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
             'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
             '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f')
 
-build() {
+prepare() {
   # apply stable patching set
   if (( NOEXTRACT == 0 )) && [[ -e "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu ]]; then
     msg2 'Applying stable patch set'
@@ -48,7 +48,9 @@ build() {
     patch -Np1 -i "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu
     cd ..
   fi
+}
 
+build() {
   msg2 'Build libtraceevent-libre'
   pushd linux-$pkgver/tools/lib/traceevent
   make
diff --git a/libre/xtensa-unknown-elf-binutils/PKGBUILD b/libre/xtensa-unknown-elf-binutils/PKGBUILD
index 8527a057d..2e29d1ff4 100644
--- a/libre/xtensa-unknown-elf-binutils/PKGBUILD
+++ b/libre/xtensa-unknown-elf-binutils/PKGBUILD
@@ -5,11 +5,11 @@
 
 _pkgname=binutils
 _target="xtensa-unknown-elf"
-_sysroot="/usr/${_target}"
+_sysroot="/usr/$CHOST/${_target}"
 
 pkgname=${_target}-binutils
 pkgver=2.23.2
-pkgrel=2.1
+pkgrel=2.3
 pkgdesc="A set of programs to assemble and manipulate binary and object files for the Xtensa architecture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/binutils/"
@@ -48,9 +48,8 @@ build() {
     --with-bugurl=https://labs.parabola.nu/ \
     --enable-ld=default --enable-gold \
     --enable-plugins --enable-threads \
-    --with-pic --disable-shared \
+    --with-pic --enable-shared \
     --disable-werror --disable-multilib \
-    --with-sysroot=${_sysroot} \
     --target=${_target}
 
   # check the host environment and makes sure all the necessary tools are available
diff --git a/libre/xtensa-unknown-elf-gcc/PKGBUILD b/libre/xtensa-unknown-elf-gcc/PKGBUILD
index 5472ba164..6081151b7 100644
--- a/libre/xtensa-unknown-elf-gcc/PKGBUILD
+++ b/libre/xtensa-unknown-elf-gcc/PKGBUILD
@@ -5,9 +5,9 @@
 
 _pkgname=gcc
 _target="xtensa-unknown-elf"
-_sysroot="/usr/${_target}"
+_sysroot="/usr/$CHOST/${_target}"
 
-pkgname="${_target}-gcc
+pkgname=${_target}-gcc
 pkgver=4.8.1
 pkgrel=1
 #_snapshot=4.8-20130502
@@ -15,7 +15,7 @@ pkgdesc="The GNU Compiler Collection for Xtensa processors"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
-makedepends=("${_target}-binutils>=2.23" 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
+makedepends=("binutils>=2.23" 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
 checkdepends=('dejagnu' 'inetutils')
 options=('!libtool' '!emptydirs')
 source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2)
@@ -54,26 +54,31 @@ build() {
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
-  ${srcdir}/${_basedir}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --with-bugurl=https://labs.parabola.nu/ \
+  LD_LIBRARY_PATH=/usr/lib ${srcdir}/${_basedir}/configure --prefix=/usr \
+      --disable-shared --disable-threads --disable-multilib \
       --enable-languages=c \
-      --disable-shared --enable-threads=posix \
-      --with-system-zlib --enable-__cxa_atexit \
-      --disable-libunwind-exceptions --enable-clocale=gnu \
-      --disable-libstdcxx-pch \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --enable-cloog-backend=isl --disable-cloog-version-check \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --with-linker-hash-style=gnu --disable-install-libiberty \
-      --disable-multilib --disable-libssp --disable-werror \
-      --enable-checking=release \
-      --target=${_target} \
-      --with-sysroot=${_sysroot} \
-      --with-arch=xtensa \
-      --with-newlib
+      --disable-nls \
+      --target=$_target
+#      --build=x86_64-unknown-linux-gnu \
+#      --without-headers \
+#      --disable-multilib --disable-libssp --disable-werror \
+#      --libdir=/usr/lib --libexecdir=/usr/lib \
+#      --mandir=/usr/share/man --infodir=/usr/share/info \
+#      --with-bugurl=https://labs.parabola.nu/ \
+#      --disable-shared --enable-threads=posix \
+#      --with-system-zlib --enable-__cxa_atexit \
+#      --disable-libunwind-exceptions --enable-clocale=gnu \
+#      --disable-libstdcxx-pch \
+#      --enable-gnu-unique-object --enable-linker-build-id \
+#      --enable-cloog-backend=isl --disable-cloog-version-check \
+#      --enable-lto --enable-gold --enable-ld=default \
+#      --enable-plugin --with-plugin-ld=ld.gold \
+#      --with-linker-hash-style=gnu --disable-install-libiberty \
+#      --with-as=/usr/bin/${_target}-as --with-ld=/usr/bin/${_target}-ld \
+#      --disable-multilib --disable-libssp --disable-werror \
+#      --enable-checking=release \
+#      --target=${_target} \
+#      --with-newlib
   make
   
   # make documentation
@@ -96,7 +101,7 @@ check() {
 package()
 {
   pkgdesc="The GNU Compiler Collection"
-  depends=("gcc-libs=$pkgver-$pkgrel" "${_target}-binutils>=2.23" 'libmpc' 'cloog')
+  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog')
   groups=("${_target}-devel")
   install=${_target}-gcc.install
 
diff --git a/libre/xtensa-unknown-elf-glibc/PKGBUILD b/libre/xtensa-unknown-elf-glibc/PKGBUILD
new file mode 100644
index 000000000..0a459b10b
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/PKGBUILD
@@ -0,0 +1,155 @@
+# $Id: PKGBUILD 186623 2013-05-30 07:47:03Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+# NOTE: valgrind requires rebuilt with each major glibc version
+
+_pkgname=glibc
+_target="xtensa-unknown-elf"
+_sysroot="usr/$CHOST/${_target}"
+
+pkgname=${_target}-glibc
+pkgver=2.17
+pkgrel=6
+pkgdesc="GNU C Library for Xtensa processors"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/libc"
+license=('GPL' 'LGPL')
+groups=('base')
+depends=("${_target}-linux-api-headers>=3.7" 'tzdata' 'filesystem>=2013.01')
+makedepends=('gcc>=4.7')
+backup=(etc/gai.conf
+        etc/locale.gen
+        etc/nscd.conf)
+options=('!strip')
+install=${_target}-glibc.install
+source=(http://ftp.gnu.org/gnu/libc/${_pkgname}-${pkgver}.tar.xz{,.sig}
+        glibc-2.17-sync-with-linux37.patch
+        glibc-2.17-getaddrinfo-stack-overflow.patch
+        glibc-2.17-regexp-matcher-overrun.patch
+        nscd.service
+        nscd.tmpfiles
+        locale.gen.txt
+        locale-gen)
+md5sums=('87bf675c8ee523ebda4803e8e1cec638'
+         'SKIP'
+         'fb99380d94598cc76d793deebf630022'
+         '56d5f2c09503a348281a20ae404b7de3'
+         '200acc05961b084ee00dde919e64f82d'
+         'c1e07c0bec0fe89791bfd9d13fc85edf'
+         'bccbe5619e75cf1d97312ec3681c605c'
+         '07ac979b6ab5eeb778d55f041529d623'
+         '476e9113489f93b348b21e144b6a8fcf')
+
+
+build() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+
+  # combination of upstream commits 318cd0b, b540704 and fc1abbe
+  patch -p1 -i ${srcdir}/glibc-2.17-sync-with-linux37.patch
+
+  # CVE-2013-1914 - upstream commit 1cef1b19
+  patch -p1 -i ${srcdir}/glibc-2.17-getaddrinfo-stack-overflow.patch
+
+  # CVE-2013-0242 - upstream commit a445af0b
+  patch -p1 -i ${srcdir}/glibc-2.17-regexp-matcher-overrun.patch
+
+  cd ${srcdir}
+  mkdir glibc-build
+  cd glibc-build
+
+  if [[ ${CARCH} = "i686" ]]; then
+    # Hack to fix NPTL issues with Xen, only required on 32bit platforms
+    # TODO: make separate glibc-xen package for i686
+    export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
+  fi
+
+  echo "slibdir=/usr/lib" >> configparms
+  echo "sbindir=/usr/bin" >> configparms
+  echo "rootsbindir=/usr/bin" >> configparms
+
+  # remove hardening options for building libraries
+  CFLAGS=${CFLAGS/-fstack-protector/}
+  CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
+
+  ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/usr \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --build=$CHOST --host=$_target \
+      --with-headers=/${_sysroot}/include \
+      --with-bugurl=https://labs.parabola.nu/ \
+      --enable-add-ons=nptl,libidn \
+      --enable-obsolete-rpc \
+      --enable-kernel=2.6.32 \
+      --enable-bind-now --disable-profile \
+      --enable-stackguard-randomization \
+      --enable-multi-arch
+
+  # build libraries with hardening disabled
+  echo "build-programs=no" >> configparms
+  make
+  
+  # re-enable hardening for programs
+  sed -i "/build-programs=/s#no#yes#" configparms
+  echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
+  echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
+  make
+
+  # remove harding in preparation to run test-suite
+  sed -i '4,6d' configparms
+}
+
+check() {
+  # bug to file - the linker commands need to be reordered
+  LDFLAGS=${LDFLAGS/--as-needed,/}
+
+  cd ${srcdir}/glibc-build
+  make check
+}
+
+package() {
+  cd ${srcdir}/glibc-build
+
+  install -dm755 ${pkgdir}/etc
+  touch ${pkgdir}/etc/ld.so.conf
+
+  make install_root=${pkgdir} install
+
+  rm -f ${pkgdir}/etc/ld.so.{cache,conf}
+
+  install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d}
+
+  install -m644 ${srcdir}/${_pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
+  install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system
+  install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
+
+  install -m644 ${srcdir}/${_pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf
+
+  install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin
+
+  # create /etc/locale.gen
+  install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
+  sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
+    ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
+
+  # Do not strip the following files for improved debugging support
+  # ("improved" as in not breaking gdb and valgrind...):
+  #   ld-${pkgver}.so
+  #   libc-${pkgver}.so
+  #   libpthread-${pkgver}.so
+  #   libthread_db-1.0.so
+
+  cd $pkgdir
+  strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \
+                        usr/bin/{ldconfig,locale,localedef,nscd,makedb} \
+                        usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \
+                        usr/lib/getconf/*
+  [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
+
+  strip $STRIP_STATIC usr/lib/*.a
+
+  strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
+                      usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
+                      usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
+                      usr/lib/{libmemusage,libpcprofile,libSegFault}.so \
+                      usr/lib/{pt_chown,{audit,gconv}/*.so}
+}
diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch
new file mode 100644
index 000000000..aa916ac2c
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch
@@ -0,0 +1,47 @@
+diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
+index d95c2d1..2309281 100644
+--- a/sysdeps/posix/getaddrinfo.c
++++ b/sysdeps/posix/getaddrinfo.c
+@@ -2489,11 +2489,27 @@ getaddrinfo (const char *name, const char *service,
+       __typeof (once) old_once = once;
+       __libc_once (once, gaiconf_init);
+       /* Sort results according to RFC 3484.  */
+-      struct sort_result results[nresults];
+-      size_t order[nresults];
++      struct sort_result *results;
++      size_t *order;
+       struct addrinfo *q;
+       struct addrinfo *last = NULL;
+       char *canonname = NULL;
++      bool malloc_results;
++
++      malloc_results
++	= !__libc_use_alloca (nresults * (sizeof (*results) + sizeof (size_t)));
++      if (malloc_results)
++	{
++	  results = malloc (nresults * (sizeof (*results) + sizeof (size_t)));
++	  if (results == NULL)
++	    {
++	      __free_in6ai (in6ai);
++	      return EAI_MEMORY;
++	    }
++	}
++      else
++	results = alloca (nresults * (sizeof (*results) + sizeof (size_t)));
++      order = (size_t *) (results + nresults);
+ 
+       /* Now we definitely need the interface information.  */
+       if (! check_pf_called)
+@@ -2664,6 +2680,9 @@ getaddrinfo (const char *name, const char *service,
+ 
+       /* Fill in the canonical name into the new first entry.  */
+       p->ai_canonname = canonname;
++
++      if (malloc_results)
++	free (results);
+     }
+ 
+   __free_in6ai (in6ai);
+-- 
+1.7.1
+
diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch
new file mode 100644
index 000000000..b108f9d42
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch
@@ -0,0 +1,137 @@
+diff --git a/posix/Makefile b/posix/Makefile
+index 88d409f..2cacd21 100644
+--- a/posix/Makefile
++++ b/posix/Makefile
+@@ -86,7 +86,7 @@ tests		:= tstgetopt testfnm runtests runptests	     \
+ 		   tst-rfc3484-3 \
+ 		   tst-getaddrinfo3 tst-fnmatch2 tst-cpucount tst-cpuset \
+ 		   bug-getopt1 bug-getopt2 bug-getopt3 bug-getopt4 \
+-		   bug-getopt5 tst-getopt_long1
++		   bug-getopt5 tst-getopt_long1 bug-regex34
+ xtests		:= bug-ga2
+ ifeq (yes,$(build-shared))
+ test-srcs	:= globtest
+@@ -199,5 +199,6 @@ bug-regex26-ENV = LOCPATH=$(common-objpfx)localedata
+ bug-regex30-ENV = LOCPATH=$(common-objpfx)localedata
+ bug-regex32-ENV = LOCPATH=$(common-objpfx)localedata
+ bug-regex33-ENV = LOCPATH=$(common-objpfx)localedata
++bug-regex34-ENV = LOCPATH=$(common-objpfx)localedata
+ tst-rxspencer-ARGS = --utf8 rxspencer/tests
+ tst-rxspencer-ENV = LOCPATH=$(common-objpfx)localedata
+diff --git a/posix/bug-regex34.c b/posix/bug-regex34.c
+new file mode 100644
+index 0000000..bb3b613
+--- /dev/null
++++ b/posix/bug-regex34.c
+@@ -0,0 +1,46 @@
++/* Test re_search with multi-byte characters in UTF-8.
++   Copyright (C) 2013 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#define _GNU_SOURCE 1
++#include <stdio.h>
++#include <string.h>
++#include <locale.h>
++#include <regex.h>
++
++static int
++do_test (void)
++{
++  struct re_pattern_buffer r;
++  /* ကျွန်ုပ်x */
++  const char *s = "\xe1\x80\x80\xe1\x80\xbb\xe1\x80\xbd\xe1\x80\x94\xe1\x80\xba\xe1\x80\xaf\xe1\x80\x95\xe1\x80\xbax";
++
++  if (setlocale (LC_ALL, "en_US.UTF-8") == NULL)
++    {
++      puts ("setlocale failed");
++      return 1;
++    }
++  memset (&r, 0, sizeof (r));
++
++  re_compile_pattern ("[^x]x", 5, &r);
++  /* This was triggering a buffer overflow.  */
++  re_search (&r, s, strlen (s), 0, strlen (s), 0);
++  return 0;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff --git a/posix/regexec.c b/posix/regexec.c
+index 7f2de85..5ca2bf6 100644
+--- a/posix/regexec.c
++++ b/posix/regexec.c
+@@ -197,7 +197,7 @@ static int group_nodes_into_DFAstates (const re_dfa_t *dfa,
+ static int check_node_accept (const re_match_context_t *mctx,
+ 			      const re_token_t *node, int idx)
+      internal_function;
+-static reg_errcode_t extend_buffers (re_match_context_t *mctx)
++static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len)
+      internal_function;
+ 
+ /* Entry point for POSIX code.  */
+@@ -1160,7 +1160,7 @@ check_matching (re_match_context_t *mctx, int fl_longest_match,
+ 	  || (BE (next_char_idx >= mctx->input.valid_len, 0)
+ 	      && mctx->input.valid_len < mctx->input.len))
+ 	{
+-	  err = extend_buffers (mctx);
++	  err = extend_buffers (mctx, next_char_idx + 1);
+ 	  if (BE (err != REG_NOERROR, 0))
+ 	    {
+ 	      assert (err == REG_ESPACE);
+@@ -1738,7 +1738,7 @@ clean_state_log_if_needed (re_match_context_t *mctx, int next_state_log_idx)
+ 	  && mctx->input.valid_len < mctx->input.len))
+     {
+       reg_errcode_t err;
+-      err = extend_buffers (mctx);
++      err = extend_buffers (mctx, next_state_log_idx + 1);
+       if (BE (err != REG_NOERROR, 0))
+ 	return err;
+     }
+@@ -2792,7 +2792,7 @@ get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx)
+ 		  if (bkref_str_off >= mctx->input.len)
+ 		    break;
+ 
+-		  err = extend_buffers (mctx);
++		  err = extend_buffers (mctx, bkref_str_off + 1);
+ 		  if (BE (err != REG_NOERROR, 0))
+ 		    return err;
+ 
+@@ -4102,7 +4102,7 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node,
+ 
+ static reg_errcode_t
+ internal_function __attribute_warn_unused_result__
+-extend_buffers (re_match_context_t *mctx)
++extend_buffers (re_match_context_t *mctx, int min_len)
+ {
+   reg_errcode_t ret;
+   re_string_t *pstr = &mctx->input;
+@@ -4111,8 +4111,10 @@ extend_buffers (re_match_context_t *mctx)
+   if (BE (INT_MAX / 2 / sizeof (re_dfastate_t *) <= pstr->bufs_len, 0))
+     return REG_ESPACE;
+ 
+-  /* Double the lengthes of the buffers.  */
+-  ret = re_string_realloc_buffers (pstr, MIN (pstr->len, pstr->bufs_len * 2));
++  /* Double the lengthes of the buffers, but allocate at least MIN_LEN.  */
++  ret = re_string_realloc_buffers (pstr,
++				   MAX (min_len,
++					MIN (pstr->len, pstr->bufs_len * 2)));
+   if (BE (ret != REG_NOERROR, 0))
+     return ret;
+ 
+-- 
+1.7.1
+
diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch
new file mode 100644
index 000000000..24b25c997
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch
@@ -0,0 +1,130 @@
+diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h
+index 06e8414..b62a696 100644
+--- a/sysdeps/gnu/netinet/tcp.h
++++ b/sysdeps/gnu/netinet/tcp.h
+@@ -37,20 +37,29 @@
+ /*
+  * User-settable options (used with setsockopt).
+  */
+-#define	TCP_NODELAY	 1	/* Don't delay send to coalesce packets  */
+-#define	TCP_MAXSEG	 2	/* Set maximum segment size  */
+-#define TCP_CORK	 3	/* Control sending of partial frames  */
+-#define TCP_KEEPIDLE	 4	/* Start keeplives after this period */
+-#define TCP_KEEPINTVL	 5	/* Interval between keepalives */
+-#define TCP_KEEPCNT	 6	/* Number of keepalives before death */
+-#define TCP_SYNCNT	 7	/* Number of SYN retransmits */
+-#define TCP_LINGER2	 8	/* Life time of orphaned FIN-WAIT-2 state */
+-#define TCP_DEFER_ACCEPT 9	/* Wake up listener only when data arrive */
+-#define TCP_WINDOW_CLAMP 10	/* Bound advertised window */
+-#define TCP_INFO	 11	/* Information about this connection. */
+-#define	TCP_QUICKACK	 12	/* Bock/reenable quick ACKs.  */
+-#define TCP_CONGESTION	 13	/* Congestion control algorithm.  */
+-#define TCP_MD5SIG	 14	/* TCP MD5 Signature (RFC2385) */
++#define	TCP_NODELAY		 1  /* Don't delay send to coalesce packets  */
++#define	TCP_MAXSEG		 2  /* Set maximum segment size  */
++#define TCP_CORK		 3  /* Control sending of partial frames  */
++#define TCP_KEEPIDLE		 4  /* Start keeplives after this period */
++#define TCP_KEEPINTVL		 5  /* Interval between keepalives */
++#define TCP_KEEPCNT		 6  /* Number of keepalives before death */
++#define TCP_SYNCNT		 7  /* Number of SYN retransmits */
++#define TCP_LINGER2		 8  /* Life time of orphaned FIN-WAIT-2 state */
++#define TCP_DEFER_ACCEPT	 9  /* Wake up listener only when data arrive */
++#define TCP_WINDOW_CLAMP	 10 /* Bound advertised window */
++#define TCP_INFO		 11 /* Information about this connection. */
++#define	TCP_QUICKACK		 12 /* Bock/reenable quick ACKs.  */
++#define TCP_CONGESTION		 13 /* Congestion control algorithm.  */
++#define TCP_MD5SIG		 14 /* TCP MD5 Signature (RFC2385) */
++#define TCP_COOKIE_TRANSACTIONS	 15 /* TCP Cookie Transactions */
++#define TCP_THIN_LINEAR_TIMEOUTS 16 /* Use linear timeouts for thin streams*/
++#define TCP_THIN_DUPACK		 17 /* Fast retrans. after 1 dupack */
++#define TCP_USER_TIMEOUT	 18 /* How long for loss retry before timeout */
++#define TCP_REPAIR		 19 /* TCP sock is under repair right now */
++#define TCP_REPAIR_QUEUE	 20 /* Set TCP queue to repair */
++#define TCP_QUEUE_SEQ		 21 /* Set sequence number of repaired queue. */
++#define TCP_REPAIR_OPTIONS	 22 /* Repair TCP connection options */
++#define TCP_FASTOPEN		 23 /* Enable FastOpen on listeners */
+ 
+ #ifdef __USE_MISC
+ # include <sys/types.h>
+@@ -173,7 +182,9 @@ enum
+ # define TCPI_OPT_TIMESTAMPS	1
+ # define TCPI_OPT_SACK		2
+ # define TCPI_OPT_WSCALE	4
+-# define TCPI_OPT_ECN		8
++# define TCPI_OPT_ECN		8  /* ECN was negociated at TCP session init */
++# define TCPI_OPT_ECN_SEEN	16 /* we received at least one packet with ECT */
++# define TCPI_OPT_SYN_DATA	32 /* SYN-ACK acked data in SYN sent or rcvd */
+ 
+ /* Values for tcpi_state.  */
+ enum tcp_ca_state
+@@ -241,6 +252,49 @@ struct tcp_md5sig
+   u_int8_t	tcpm_key[TCP_MD5SIG_MAXKEYLEN];	/* Key (binary).  */
+ };
+ 
++/* For socket repair options.  */
++struct tcp_repair_opt
++{
++  u_int32_t	opt_code;
++  u_int32_t	opt_val;
++};
++
++/* Queue to repair, for TCP_REPAIR_QUEUE.  */
++enum
++{
++  TCP_NO_QUEUE,
++  TCP_RECV_QUEUE,
++  TCP_SEND_QUEUE,
++  TCP_QUEUES_NR,
++};
++
++/* For cookie transactions socket options.  */
++#define TCP_COOKIE_MIN		8		/*  64-bits */
++#define TCP_COOKIE_MAX		16		/* 128-bits */
++#define TCP_COOKIE_PAIR_SIZE	(2*TCP_COOKIE_MAX)
++
++/* Flags for both getsockopt and setsockopt */
++#define TCP_COOKIE_IN_ALWAYS	(1 << 0)	/* Discard SYN without cookie */
++#define TCP_COOKIE_OUT_NEVER	(1 << 1)	/* Prohibit outgoing cookies,
++						 * supercedes everything. */
++
++/* Flags for getsockopt */
++#define TCP_S_DATA_IN		(1 << 2)	/* Was data received? */
++#define TCP_S_DATA_OUT		(1 << 3)	/* Was data sent? */
++
++#define TCP_MSS_DEFAULT		 536U	/* IPv4 (RFC1122, RFC2581) */
++#define TCP_MSS_DESIRED		1220U	/* IPv6 (tunneled), EDNS0 (RFC3226) */
++
++struct tcp_cookie_transactions
++{
++  u_int16_t	tcpct_flags;
++  u_int8_t	__tcpct_pad1;
++  u_int8_t	tcpct_cookie_desired;
++  u_int16_t	tcpct_s_data_desired;
++  u_int16_t	tcpct_used;
++  u_int8_t	tcpct_value[TCP_MSS_DEFAULT];
++};
++
+ #endif /* Misc.  */
+ 
+ #endif /* netinet/tcp.h */
+diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
+index df8f167..eadd7d9 100644
+--- a/sysdeps/unix/sysv/linux/bits/socket.h
++++ b/sysdeps/unix/sysv/linux/bits/socket.h
+@@ -1,6 +1,5 @@
+ /* System-specific socket constants and types.  Linux version.
+-   Copyright (C) 1991, 1992, 1994-2001, 2004, 2006-2010, 2011, 2012
+-   Free Software Foundation, Inc.
++   Copyright (C) 1991-2013 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -208,6 +207,8 @@ enum
+ #define	MSG_MORE	MSG_MORE
+     MSG_WAITFORONE	= 0x10000, /* Wait for at least one packet to return.*/
+ #define MSG_WAITFORONE	MSG_WAITFORONE
++    MSG_FASTOPEN	= 0x20000000, /* Send data in TCP SYN.  */
++#define MSG_FASTOPEN	MSG_FASTOPEN
+ 
+     MSG_CMSG_CLOEXEC	= 0x40000000	/* Set close_on_exit for file
+ 					   descriptor received through
diff --git a/libre/xtensa-unknown-elf-glibc/locale-gen b/libre/xtensa-unknown-elf-glibc/locale-gen
new file mode 100644
index 000000000..5aff344c4
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/locale-gen
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+set -e
+
+LOCALEGEN=/etc/locale.gen
+LOCALES=/usr/share/i18n/locales
+if [ -n "$POSIXLY_CORRECT" ]; then
+  unset POSIXLY_CORRECT
+fi
+
+
+[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0;
+
+# Remove all old locale dir and locale-archive before generating new
+# locale data.
+rm -rf /usr/lib/locale/* || true
+
+umask 022
+
+is_entry_ok() {
+  if [ -n "$locale" -a -n "$charset" ] ; then
+    true
+  else
+    echo "error: Bad entry '$locale $charset'"
+    false
+  fi
+}
+
+echo "Generating locales..."
+while read locale charset; do \
+	case $locale in \#*) continue;; "") continue;; esac; \
+	is_entry_ok || continue
+	echo -n "  `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \
+	echo -n ".$charset"; \
+	echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
+	echo -n '...'; \
+        if [ -f $LOCALES/$locale ]; then input=$locale; else \
+        input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \
+	localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \
+	echo ' done'; \
+done < $LOCALEGEN
+echo "Generation complete."
diff --git a/libre/xtensa-unknown-elf-glibc/locale.gen.txt b/libre/xtensa-unknown-elf-glibc/locale.gen.txt
new file mode 100644
index 000000000..ccdd81734
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/locale.gen.txt
@@ -0,0 +1,23 @@
+# Configuration file for locale-gen
+#
+# lists of locales that are to be generated by the locale-gen command.
+#
+# Each line is of the form:
+#
+#     <locale> <charset>
+#
+#  where <locale> is one of the locales given in /usr/share/i18n/locales
+#  and <charset> is one of the character sets listed in /usr/share/i18n/charmaps
+#
+#  Examples:
+#  en_US ISO-8859-1
+#  en_US.UTF-8 UTF-8
+#  de_DE ISO-8859-1
+#  de_DE@euro ISO-8859-15
+#
+#  The locale-gen command will generate all the locales,
+#  placing them in /usr/lib/locale.
+#
+#  A list of supported locales is included in this file.
+#  Uncomment the ones you need.
+#
diff --git a/libre/xtensa-unknown-elf-glibc/nscd.service b/libre/xtensa-unknown-elf-glibc/nscd.service
new file mode 100644
index 000000000..bc80a0730
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/nscd.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Name Service Cache Daemon
+After=syslog.target
+ 
+[Service]
+Type=forking
+ExecStart=/usr/sbin/nscd
+ExecStop=/usr/sbin/nscd --shutdown
+ExecReload=/usr/sbin/nscd -i passwd
+ExecReload=/usr/sbin/nscd -i group
+ExecReload=/usr/sbin/nscd -i hosts
+ExecReload=/usr/sbin/nscd -i services
+Restart=always
+PIDFile=/run/nscd/nscd.pid
+ 
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles b/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles
new file mode 100644
index 000000000..8a24a785e
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles
@@ -0,0 +1 @@
+d /run/nscd 0755 root root
diff --git a/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install b/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install
new file mode 100644
index 000000000..f8147a6cf
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install
@@ -0,0 +1,19 @@
+infodir=usr/share/info
+filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
+
+post_upgrade() {
+  ldconfig -r .
+  locale-gen
+  
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+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/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD b/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
index e27c1ba35..23dada50b 100644
--- a/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
+++ b/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
@@ -5,15 +5,15 @@
 # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
 export ARCH=xtensa
 _target=xtensa-unknown-elf
-_sysroot="/usr/${_target}"
+_sysroot="usr/$CHOST/${_target}"
 
 pkgname=${_target}-linux-libre-api-headers
 _basekernel=3.8
 _sublevel=4
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-pkgdesc="Kernel headers sanitized for use in userspace"
-arch=('i686' 'x86_64')
+pkgdesc="Kernel headers sanitized for use in userspace for Xtensa processors"
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
 license=('GPL2')
 provides=("${_target}-linux-api-headers=${pkgver}")
@@ -37,11 +37,11 @@ build() {
 
 package() {
   cd ${srcdir}/linux-${_basekernel}
-  make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir}${_sysroot}/usr headers_install
+  make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir}/${_sysroot} headers_install
 
   # use headers from libdrm
-  rm -r ${pkgdir}${_sysroot}/usr/include/drm
-  
+  rm -r ${pkgdir}/${_sysroot}/include/drm
+
   # clean-up unnecessary files generated during install
   find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete
 }