Tue Jun 25 01:24:57 PDT 2013

6 files changed, 70 insertions, 81 deletions

diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD
index 2188d0230..9b2d22f58 100644
--- a/extra/libxi/PKGBUILD
+++ b/extra/libxi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188841 2013-06-22 12:22:10Z lcarlier $
+# $Id: PKGBUILD 188904 2013-06-24 21:48:21Z lcarlier $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxi
 pkgver=1.7.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X11 Input extension library"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org"
@@ -15,7 +15,7 @@ license=('custom')
 source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2
         git-fixes.diff)
 sha256sums=('e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5'
-            '23e10f8a8a078dd109acbd5a66fe62a45233d3a2368649d5114107a790594c07')
+            'faa2f76f68e65f537062829ad45977561079ac8747bd8e24a82055e70a5bf0cc')
 
 prepare() {
   cd "${srcdir}/libXi-${pkgver}"
diff --git a/extra/libxi/git-fixes.diff b/extra/libxi/git-fixes.diff
index 4c542d980..b1b4f40d9 100644
--- a/extra/libxi/git-fixes.diff
+++ b/extra/libxi/git-fixes.diff
@@ -1,7 +1,7 @@
 From bb82c72a1d69eaf60b7586570faf797df967f661 Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date: Mon, 29 Apr 2013 18:39:34 -0700
-Subject: [PATCH 01/15] Expand comment on the memory vs. reply ordering in
+Subject: [PATCH 01/16] Expand comment on the memory vs. reply ordering in
  XIGetSelectedEvents()
 
 Unpacking from the wire involves un-interleaving the structs & masks,
@@ -42,7 +42,7 @@ index fa7eb54..f871222 100644
 From 5d43d4914dcabb6de69859567061e99300e56ef4 Mon Sep 17 00:00:00 2001
 From: Peter Hutterer <peter.hutterer@who-t.net>
 Date: Fri, 17 May 2013 09:07:44 +1000
-Subject: [PATCH 02/15] Copy the sequence number into the target event too
+Subject: [PATCH 02/16] Copy the sequence number into the target event too
  (#64687)
 
 X.Org Bug 64687 <http://bugs.freedesktop.org/show_bug.cgi?id=64687>
@@ -136,7 +136,7 @@ index 507573b..8e19b97 100644
 From 59b8e1388a687f871831ac5a9e0ac11de75e2516 Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date: Wed, 1 May 2013 23:58:39 -0700
-Subject: [PATCH 03/15] Use _XEatDataWords to avoid overflow of rep.length bit
+Subject: [PATCH 03/16] Use _XEatDataWords to avoid overflow of rep.length bit
  shifting
 
 rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds
@@ -420,7 +420,7 @@ index 24d4e4e..69c285b 100644
 From f3e08e4fbe40016484ba795feecf1a742170ffc1 Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date: Sat, 9 Mar 2013 22:26:52 -0800
-Subject: [PATCH 04/15] Stack buffer overflow in XGetDeviceButtonMapping()
+Subject: [PATCH 04/16] Stack buffer overflow in XGetDeviceButtonMapping()
  [CVE-2013-1998 1/3]
 
 We copy the entire reply sent by the server into the fixed size
@@ -487,7 +487,7 @@ index 211c9ca..002daba 100644
 From 91434737f592e8f5cc1762383882a582b55fc03a Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date: Sat, 9 Mar 2013 23:37:23 -0800
-Subject: [PATCH 05/15] memory corruption in _XIPassiveGrabDevice()
+Subject: [PATCH 05/16] memory corruption in _XIPassiveGrabDevice()
  [CVE-2013-1998 2/3]
 
 If the server returned more modifiers than the caller asked for,
@@ -520,7 +520,7 @@ index ac17c01..53b4084 100644
 From 5398ac0797f7516f2c9b8f2869a6c6d071437352 Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date: Fri, 26 Apr 2013 22:48:36 -0700
-Subject: [PATCH 06/15] unvalidated lengths in XQueryDeviceState()
+Subject: [PATCH 06/16] unvalidated lengths in XQueryDeviceState()
  [CVE-2013-1998 3/3]
 
 If the lengths given for each class state in the reply add up to more
@@ -589,7 +589,7 @@ index 69c285b..3836777 100644
 From b0b13c12a8079a5a0e7f43b2b8983699057b2cec Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date: Sat, 9 Mar 2013 22:55:23 -0800
-Subject: [PATCH 07/15] integer overflow in XGetDeviceControl() [CVE-2013-1984
+Subject: [PATCH 07/16] integer overflow in XGetDeviceControl() [CVE-2013-1984
  1/8]
 
 If the number of valuators reported by the server is large enough that
@@ -708,7 +708,7 @@ index f73a4e8..51ed0ae 100644
 From 322ee3576789380222d4403366e4fd12fb24cb6a Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date: Sat, 9 Mar 2013 22:55:23 -0800
-Subject: [PATCH 08/15] integer overflow in XGetFeedbackControl()
+Subject: [PATCH 08/16] integer overflow in XGetFeedbackControl()
  [CVE-2013-1984 2/8]
 
 If the number of feedbacks reported by the server is large enough that
@@ -808,7 +808,7 @@ index 28fab4d..bb50bf3 100644
 From 6dd6dc51a2935c72774be81e5cc2ba2c30e9feff Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date: Sat, 9 Mar 2013 22:55:23 -0800
-Subject: [PATCH 09/15] integer overflow in XGetDeviceDontPropagateList()
+Subject: [PATCH 09/16] integer overflow in XGetDeviceDontPropagateList()
  [CVE-2013-1984 3/8]
 
 If the number of event classes reported by the server is large enough
@@ -859,7 +859,7 @@ index 34bc581..b49328c 100644
 From bb922ed4253b35590f0369f32a917ff89ade0830 Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date: Sat, 9 Mar 2013 22:55:23 -0800
-Subject: [PATCH 10/15] integer overflow in XGetDeviceMotionEvents()
+Subject: [PATCH 10/16] integer overflow in XGetDeviceMotionEvents()
  [CVE-2013-1984 4/8]
 
 If the number of events or axes reported by the server is large enough
@@ -928,7 +928,7 @@ index 5feac85..a4c75b6 100644
 From 242f92b490a695fbab244af5bad11b71f897c732 Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date: Sat, 9 Mar 2013 22:55:23 -0800
-Subject: [PATCH 11/15] integer overflow in XIGetProperty() [CVE-2013-1984 5/8]
+Subject: [PATCH 11/16] integer overflow in XIGetProperty() [CVE-2013-1984 5/8]
 
 If the number of items reported by the server is large enough that
 it overflows when multiplied by the size of the appropriate item type,
@@ -985,7 +985,7 @@ index 5e58fb6..32436d1 100644
 From 528419b9ef437e7eeafb41bf45e8ff7d818bd845 Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date: Sat, 9 Mar 2013 22:55:23 -0800
-Subject: [PATCH 12/15] integer overflow in XIGetSelectedEvents()
+Subject: [PATCH 12/16] integer overflow in XIGetSelectedEvents()
  [CVE-2013-1984 6/8]
 
 If the number of events or masks reported by the server is large enough
@@ -1076,7 +1076,7 @@ index f871222..0471bef 100644
 From 17071c1c608247800b2ca03a35b1fcc9c4cabe6c Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date: Sun, 10 Mar 2013 13:30:55 -0700
-Subject: [PATCH 13/15] Avoid integer overflow in XGetDeviceProperties()
+Subject: [PATCH 13/16] Avoid integer overflow in XGetDeviceProperties()
  [CVE-2013-1984 7/8]
 
 If the number of items as reported by the Xserver is too large, it
@@ -1210,7 +1210,7 @@ index f9e8f0c..3691122 100644
 From ef82512288d8ca36ac0beeb289f158195b0a8cae Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date: Sun, 10 Mar 2013 00:22:14 -0800
-Subject: [PATCH 14/15] Avoid integer overflow in XListInputDevices()
+Subject: [PATCH 14/16] Avoid integer overflow in XListInputDevices()
  [CVE-2013-1984 8/8]
 
 If the length of the reply as reported by the Xserver is too long, it
@@ -1265,7 +1265,7 @@ index 1fa4747..1c14b96 100644
 From 81b4df8ac6aa1520c41c3526961014a6f115cc46 Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date: Sun, 10 Mar 2013 00:16:22 -0800
-Subject: [PATCH 15/15] sign extension issue in XListInputDevices()
+Subject: [PATCH 15/16] sign extension issue in XListInputDevices()
  [CVE-2013-1995]
 
 nptr is (signed) char, which can be negative, and will sign extend
@@ -1350,3 +1350,37 @@ index 1c14b96..b85ff3c 100644
 -- 
 1.8.3.1
 
+
+From 661c45ca17c434dbd342a46fd3fb813852ae0ca9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 21 May 2013 12:23:05 +1000
+Subject: [PATCH 16/16] Don't overwrite the cookies serial number
+
+serial != sequenceNumber, see _XSetLastRequestRead()
+
+cookie->serial is already set at this point, setting it again directly from
+the sequenceNumber of the event causes a bunch of weird issues such as
+scrollbars and text drag-n-drop breaking.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=965347
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/XExtInt.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/XExtInt.c b/src/XExtInt.c
+index 8e19b97..d3c6b7c 100644
+--- a/src/XExtInt.c
++++ b/src/XExtInt.c
+@@ -915,7 +915,6 @@ static void xge_copy_to_cookie(xGenericEvent* ev,
+     cookie->type = ev->type;
+     cookie->evtype = ev->evtype;
+     cookie->extension = ev->extension;
+-    cookie->serial = ev->sequenceNumber;
+ }
+ 
+ static Bool
+-- 
+1.8.3.1
+
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index 6bfa13777..311b0a0bb 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 187156 2013-06-04 16:15:46Z bisson $
+# $Id: PKGBUILD 188891 2013-06-23 23:24:25Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=postfix
-pkgver=2.10.0
-pkgrel=7
+pkgver=2.10.1
+pkgrel=1
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
 license=('custom')
@@ -16,7 +16,7 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig}
         'aliases.patch'
         'service')
-sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df' 'SKIP'
+sha1sums=('3e236cf95a7439750e92d9ef5cd510c00e603eb2' 'SKIP'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
           '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6')
 
diff --git a/extra/qtchooser/PKGBUILD b/extra/qtchooser/PKGBUILD
index a105ed0d0..97e5cd836 100644
--- a/extra/qtchooser/PKGBUILD
+++ b/extra/qtchooser/PKGBUILD
@@ -1,36 +1,29 @@
-# $Id: PKGBUILD 185512 2013-05-14 12:30:57Z andrea $
+# $Id: PKGBUILD 188894 2013-06-24 14:42:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtchooser
-pkgver=26
-pkgrel=4
+pkgver=31
+pkgrel=1
 pkgdesc='Wrap the other Qt tools by searching for different instances of Qt on the system'
 arch=('i686' 'x86_64')
 url='http://qt.gitorious.org/qt/qtchooser'
 license=('GPL')
+backup=('etc/xdg/qtchooser/default.conf')
 depends=('gcc-libs')
-source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g97962d2.tar.gz"
-        {3,4,5}.conf
-        'give-home-configs-precedence.patch')
-md5sums=('a188a5cb63113130e0d05fe4d5bf4e95'
+source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g980c64c.tar.gz"
+        {3,4,5}.conf)
+md5sums=('36497558a0266dcbe4cccb6477bfc158'
          '7c5da2b7911d1c4fabc63d6ef00f0020'
          'aa4d49b269e1b806f5eea170801f0aa6'
-         'cf83f09a9a5a44d898b93f624d74dd11'
-         '13478e4685804c9f79e824b4220bbc2c')
-
-prepare() {
-  cd ${pkgname}-${pkgver}-g97962d2
-
-  patch -p1 -i "${srcdir}"/give-home-configs-precedence.patch
-}
+         'cf83f09a9a5a44d898b93f624d74dd11')
 
 build() {
-  cd ${pkgname}-${pkgver}-g97962d2
+  cd ${pkgname}-${pkgver}-g980c64c
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}-g97962d2
+  cd ${pkgname}-${pkgver}-g980c64c
   make INSTALL_ROOT="${pkgdir}" install
 
   install -d "${pkgdir}"/etc/xdg/qtchooser
diff --git a/extra/qtchooser/give-home-configs-precedence.patch b/extra/qtchooser/give-home-configs-precedence.patch
deleted file mode 100644
index d9575e937..000000000
--- a/extra/qtchooser/give-home-configs-precedence.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 50373acdaf8ecd56d9fc0b31ee2f8f06f448c1a3 Mon Sep 17 00:00:00 2001
-From: Andrea Scarpino <andrea@archlinux.org>
-Date: Mon, 15 Apr 2013 23:19:39 +0200
-Subject: [PATCH] Give home configurations precedence over system ones
-
-Change-Id: Ib0c4cf47c0ff5f716949cc5653ba27dad3558489
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- src/qtchooser/main.cpp |    7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/qtchooser/main.cpp b/src/qtchooser/main.cpp
-index da54b16..514503d 100644
---- a/src/qtchooser/main.cpp
-+++ b/src/qtchooser/main.cpp
-@@ -272,12 +272,13 @@ vector<string> ToolWrapper::searchPaths() const
- {
-     vector<string> paths;
- 
--    // search the XDG config location directories
--    paths = stringSplit(qgetenv("XDG_CONFIG_DIRS", "/etc/xdg").c_str());
--
-     string localDir = qgetenv("XDG_CONFIG_HOME", userHome() + PATH_SEP ".config");
-     paths.push_back(localDir);
- 
-+    // search the XDG config location directories
-+    vector<string> xdgPaths = stringSplit(qgetenv("XDG_CONFIG_DIRS", "/etc/xdg").c_str());
-+    paths.insert(paths.end(), xdgPaths.begin(), xdgPaths.end());
-+
-     for (vector<string>::iterator it = paths.begin(); it != paths.end(); ++it)
-         *it += "/qtchooser/";
- 
--- 
-1.7.1
-
diff --git a/extra/taglib-sharp/PKGBUILD b/extra/taglib-sharp/PKGBUILD
index af21bb1e5..6e68a0a67 100644
--- a/extra/taglib-sharp/PKGBUILD
+++ b/extra/taglib-sharp/PKGBUILD
@@ -1,22 +1,19 @@
-# $Id: PKGBUILD 176984 2013-02-03 10:28:24Z allan $
+# $Id: PKGBUILD 188889 2013-06-23 22:30:41Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Carlos Ruiz <cailovirtual@gmail.com>
 
 pkgname=taglib-sharp
-pkgver=2.0.4.0
-pkgrel=2
+pkgver=2.1.0.0
+pkgrel=1
 pkgdesc="Library for reading and writing metadata in media files for Mono"
 arch=('i686' 'x86_64')
 url="https://github.com/mono/taglib-sharp"
 license=('LGPL2')
 depends=('mono')
 source=(http://download.banshee-project.org/taglib-sharp/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('b886a65083aafdfefa0675675bcbeb9a')
+md5sums=('815f5bdb3cd1b3a4d6bbb34de448ad9d')
 
 build() {
-  export MONO_SHARED_DIR="${srcdir}/.wabi"
-  mkdir -p "${MONO_SHARED_DIR}"
-
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-docs
   make