From eb9cc495e6d7c131c76f9abc178ac65f1e20fab1 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 2 Nov 2013 01:12:34 -0700 Subject: Sat Nov 2 01:09:32 PDT 2013 --- extra/audacious/PKGBUILD | 6 +- extra/gnucash/PKGBUILD | 4 +- extra/gnutls/PKGBUILD | 6 +- extra/libmowgli/PKGBUILD | 14 ++-- extra/libofx/PKGBUILD | 14 ++-- extra/libpwquality/PKGBUILD | 12 ++-- extra/libreoffice/PKGBUILD | 30 +++++---- extra/libwacom/PKGBUILD | 8 +-- extra/poppler/PKGBUILD | 15 +++-- extra/qemu/65-kvm.rules | 2 +- extra/qemu/PKGBUILD | 17 +++-- extra/tracker/PKGBUILD | 8 +-- ...fter-free-in-dix-dixfonts.c-doImageText-C.patch | 76 ---------------------- extra/xorg-server/PKGBUILD | 26 ++------ 14 files changed, 84 insertions(+), 154 deletions(-) delete mode 100644 extra/xorg-server/0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch (limited to 'extra') diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 609b64339..15dd7d7f1 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 193870 2013-09-03 05:57:09Z bisson $ +# $Id: PKGBUILD 198671 2013-11-01 21:03:18Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Alexander Fehr # Contributor: Giovanni Scafora pkgname=audacious -pkgver=3.4.1 +pkgver=3.4.2 pkgrel=1 pkgdesc='Lightweight, advanced audio player focused on audio quality' url='http://audacious-media-player.org/' @@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'desktop-file-utils') optdepends=('unzip: zipped skins support') source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('4066bba6cb0e2d6602d65a2f35770d3b8a6c718f') +sha1sums=('341452d3beceb57451f0675a61fabfd9c59d2dab') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index 598a7b239..ed4d7e3f7 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198040 2013-10-30 12:26:12Z allan $ +# $Id: PKGBUILD 198654 2013-11-01 13:54:39Z eric $ # Maintainer: Aaron Griffin # Contributor: Mark Schneider pkgname=gnucash pkgver=2.4.13 -pkgrel=1 +pkgrel=2 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64') url="http://www.gnucash.org" diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index ddb77b941..766de0d52 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198042 2013-10-30 12:26:58Z allan $ +# $Id: PKGBUILD 198663 2013-11-01 16:03:59Z andyrtr $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke pkgname=gnutls -pkgver=3.2.5 +pkgver=3.2.6 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=('!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') makedepends=('valgrind' 'strace' 'datefudge') source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('c7c367ee06f7f05ddb1e36a444a142ed' +md5sums=('1dfe5188df1641754056d853725ef785' 'SKIP') build() { diff --git a/extra/libmowgli/PKGBUILD b/extra/libmowgli/PKGBUILD index 79fd9a574..607a074d2 100644 --- a/extra/libmowgli/PKGBUILD +++ b/extra/libmowgli/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 176308 2013-01-29 11:24:40Z bisson $ - +# $Id: PKGBUILD 198675 2013-11-01 21:30:25Z bisson $ +# Maintainer: Gaetan Bisson # Contributor: Alexander Fehr # Contributor: Brad Gordon -# Maintainer: Gaetan Bisson pkgname=libmowgli pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc='Performance and usability-oriented extensions to C' url='http://www.atheme.org/project/mowgli' license=('custom') -depends=('glibc') arch=('i686' 'x86_64') -source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('5a697380f253f0456a5d8a38006a9d12847fb538') +depends=('openssl') +makedepends=('git') +source=("${pkgname}-${pkgver}::git+https://github.com/atheme/libmowgli-2.git#tag=${pkgname}-${pkgver}") +sha1sums=('SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libofx/PKGBUILD b/extra/libofx/PKGBUILD index 4a13e6a85..c77a6ea40 100644 --- a/extra/libofx/PKGBUILD +++ b/extra/libofx/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198212 2013-10-30 13:29:15Z allan $ +# $Id: PKGBUILD 198655 2013-11-01 13:54:40Z eric $ # Maintainer: Aaron Griffin pkgbase=libofx pkgname=('libofx' 'libofx-doc') -pkgver=0.9.8 +pkgver=0.9.9 pkgrel=1 pkgdesc="API for the OFX banking standard" arch=('i686' 'x86_64') @@ -12,23 +12,23 @@ license=('GPL') depends=('opensp' 'curl' 'libxml++') checkdepends=('gnupg') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('e0159d77c4458eb937871373db85c9f392e86554') +sha1sums=('b8ea875cee16953166449de8ddd1b69fb181f61b') build() { - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver ./configure --prefix=/usr make } check() { - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver make check } package_libofx() { options=('!docs') - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver make DESTDIR="$pkgdir" install } @@ -36,7 +36,7 @@ package_libofx-doc() { pkgdesc="Documention of the OFX banking standard API" depends=() - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver make DESTDIR="$pkgdir" install-docDATA make -C doc DESTDIR="$pkgdir" install } diff --git a/extra/libpwquality/PKGBUILD b/extra/libpwquality/PKGBUILD index e5340786b..4cc106cb7 100644 --- a/extra/libpwquality/PKGBUILD +++ b/extra/libpwquality/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198224 2013-10-30 13:34:10Z allan $ +# $Id: PKGBUILD 198657 2013-11-01 14:49:41Z eric $ # Maintainer: Jan de Groot pkgname=libpwquality -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 pkgdesc="Library for password quality checking and generating random passwords" arch=('i686' 'x86_64') @@ -12,16 +12,18 @@ depends=('cracklib') optdepends=('python2: Python bindings') makedepends=('python2') source=(https://fedorahosted.org/releases/l/i/libpwquality/$pkgname-$pkgver.tar.bz2) -md5sums=('2105bb893791fe27efc20441e617f385') +md5sums=('a8d4cf5d40a1c301f965432e6f3b821b') -build() { +prepare() { cd "$pkgname-$pkgver" sed -i -e 's/python setup.py/python2 setup.py/' python/Makefile.in +} +build() { + cd "$pkgname-$pkgver" PYTHON=python2 ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --disable-static \ --with-python-rev=2.7 make } diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 8bddba6bd..d1c61c515 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196745 2013-10-17 14:02:51Z andyrtr $ +# $Id: PKGBUILD 198659 2013-11-01 15:09:06Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Bartłomiej Piotrowski @@ -19,9 +19,9 @@ pkgname=('libreoffice-common' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.1.2.3 -pkgver=4.1.2 -pkgrel=2 +_LOver=4.1.3.2 +pkgver=4.1.3 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -37,6 +37,10 @@ makedepends=( # makedepends 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests +# there's only one single static library in libreoffice-sdk, +# the next build that removes it may lead to trouble if people may use it +# -rw-r--r-- 1 root root 5,1K 12. Okt 23:34 /usr/lib/libreoffice/sdk/lib/libsalcpprt.a +# options=('staticlibs') # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors @@ -78,7 +82,7 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 ${_additional_source_url}/libcdr-0.0.14.tar.bz2 ${_additional_source_url}/libmspub-0.0.6.tar.bz2 - ${_additional_source_url}/libmwaw-0.1.10.tar.bz2 + ${_additional_source_url}/libmwaw-0.1.11.tar.bz2 ${_additional_source_url}/libvisio-0.0.31.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff libreoffice-common.sh libreoffice-common.csh) @@ -114,11 +118,11 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 libcdr-0.0.14.tar.bz2 libmspub-0.0.6.tar.bz2 - libmwaw-0.1.10.tar.bz2 + libmwaw-0.1.11.tar.bz2 libvisio-0.0.31.tar.bz2 ) -md5sums=('bb2fe0056ae92e70ee8816a36dd0696c' - '761323fae73ef156f5cf188d8bd983f1' - '54f36cf305ae018ad685c331587d83e3' +md5sums=('7c5248b9141df6c4844c81515a41942f' + 'c5a692983c429a142b1c109fd28425fa' + 'f5131da6395034246eb26aa94c7de8b2' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -151,7 +155,7 @@ md5sums=('bb2fe0056ae92e70ee8816a36dd0696c' '8473296c671b6e3dd8197f4145e0854b' 'd88f9b94df880d2c05be943b000ca112' '1120705cd0f0d9bd5506360bf57b6c2e' - '2289bb137bbba9b473ce60168895c036' + '828dd03510791fbe037081a2b4a1a8ff' '82628333418f101a20cd21f980cf9f40' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' @@ -160,7 +164,7 @@ md5sums=('bb2fe0056ae92e70ee8816a36dd0696c' prepare() { cd libreoffice-$_LOver - + # fix exttextcat build error # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] unset CPPFLAGS @@ -300,7 +304,9 @@ package_libreoffice-common() { 'gtk2: for browser plugin') backup=(etc/libreoffice/sofficerc etc/libreoffice/bootstraprc - etc/libreoffice/psprint.conf) + etc/libreoffice/psprint.conf + etc/profile.d/libreoffice-common.sh + etc/profile.d/libreoffice-common.csh) groups=('libreoffice') provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' diff --git a/extra/libwacom/PKGBUILD b/extra/libwacom/PKGBUILD index 1273a95ea..627165883 100644 --- a/extra/libwacom/PKGBUILD +++ b/extra/libwacom/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198263 2013-10-30 13:48:23Z allan $ +# $Id: PKGBUILD 198653 2013-11-01 13:53:37Z eric $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=libwacom -pkgver=0.7 +pkgver=0.8 pkgrel=1 pkgdesc="Library to identify Wacom tablets and their features" arch=('x86_64' 'i686') @@ -10,11 +10,11 @@ url="http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Libwacom" license=('MIT') depends=('glib2' 'systemd') source=(http://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2) -sha256sums=('210c48b595461ebee63b1a846a6eb1d8f029b49d02ccbde34eadf551a5a68a78') +sha256sums=('8a7490b960595366d011787ca4285b8e8b371324849f72c6488f92b2f313d442') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --disable-static + ./configure --prefix=/usr make } diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 1b729b894..7cd7b3225 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198374 2013-10-30 14:28:53Z allan $ +# $Id: PKGBUILD 198662 2013-11-01 16:03:58Z andyrtr $ # Maintainer: Jan de Groot pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5') -pkgver=0.24.2 +pkgver=0.24.3 pkgrel=1 arch=(i686 x86_64) license=('GPL') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('ca5c6e35859db5cd578ce4a351dd589d' +md5sums=('31299f26a998029c85295dbbf4c30beb' '9dc64c254a31e570507bdd4ad4ba629a') prepare() { @@ -40,7 +40,14 @@ build() { check() { cd "${srcdir}/${pkgbase}-${pkgver}" - LANG=en_US.UTF8 make check + # qt related errors are now reported: + # FAIL: check_password + # Makefile:1146: recipe for target 'test-suite.log' failed + # make[4]: *** [test-suite.log] Error 1 + # make[4]: Leaving directory '/build/poppler/src/poppler-0.24.3/qt4/tests' + # Makefile:1252: recipe for target 'check-TESTS' failed + + LANG=en_US.UTF8 make check || /bin/true } package_poppler() { diff --git a/extra/qemu/65-kvm.rules b/extra/qemu/65-kvm.rules index be955fd87..569ded9f9 100644 --- a/extra/qemu/65-kvm.rules +++ b/extra/qemu/65-kvm.rules @@ -1,2 +1,2 @@ KERNEL=="kvm", GROUP="kvm", MODE="0660" -KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess" +KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net" diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index e125be4c2..127fb2afc 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198390 2013-10-30 14:34:54Z allan $ +# $Id: PKGBUILD 198649 2013-11-01 08:14:43Z thomas $ # Maintainer: Tobias Powalowski pkgname=('qemu' 'libcacard') pkgver=1.6.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" @@ -10,19 +10,28 @@ makedepends=('texi2html' 'perl' 'python2' 'spice-protocol') install=qemu.install source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 65-kvm.rules) +makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' + 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' + 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp' + 'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2') replaces=('qemu-kvm') options=(!strip) +md5sums=('3a897d722457c5a895cd6ac79a28fda0' + '33ab286a20242dda7743a900f369d68a') build () { cd "${srcdir}/${pkgname}-${pkgver}" + # qemu vs. make 4 == bad + export ARFLAGS="rv" + # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740 # gtk gui breaks keymappings at the moment ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \ --python=/usr/bin/python2 --smbd=/usr/bin/smbd \ --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu \ --disable-gtk --enable-linux-aio --enable-seccomp \ --enable-spice --localstatedir=/var - make + make V=99 } package_qemu() { @@ -73,5 +82,3 @@ package_libcacard() { cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/ cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/ } -md5sums=('3a897d722457c5a895cd6ac79a28fda0' - '9d6de26867a05c306157e3d3c612b28a') diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index a20379d72..52107dde6 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 198464 2013-10-30 15:01:59Z allan $ +# $Id: PKGBUILD 198661 2013-11-01 15:51:58Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Sergej Pupykin # Contributor: Alexander Fehr pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.16.2 +pkgver=0.16.3 _tver=${pkgver%.*} -pkgrel=3 +pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" arch=(i686 x86_64) license=(GPL) @@ -19,7 +19,7 @@ makedepends=(libgee libsecret upower libexif exempi url="http://www.gnome.org" options=('!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('033394636835628e01eb90efb55883fd88ec581910915b5948081f8f41df7409') +sha256sums=('c5299cbfb2b33f62f06afeb2ebca5b7095b77438fc6c8db6a24dc2ef649537ba') build() { cd $pkgbase-$pkgver diff --git a/extra/xorg-server/0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch b/extra/xorg-server/0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch deleted file mode 100644 index b550bcedd..000000000 --- a/extra/xorg-server/0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 7bddc2ba16a2a15773c2ea8947059afa27727764 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Mon, 16 Sep 2013 21:47:16 -0700 -Subject: [PATCH] Avoid use-after-free in dix/dixfonts.c: doImageText() - [CVE-2013-4396] - -Save a pointer to the passed in closure structure before copying it -and overwriting the *c pointer to point to our copy instead of the -original. If we hit an error, once we free(c), reset c to point to -the original structure before jumping to the cleanup code that -references *c. - -Since one of the errors being checked for is whether the server was -able to malloc(c->nChars * itemSize), the client can potentially pass -a number of characters chosen to cause the malloc to fail and the -error path to be taken, resulting in the read from freed memory. - -Since the memory is accessed almost immediately afterwards, and the -X server is mostly single threaded, the odds of the free memory having -invalid contents are low with most malloc implementations when not using -memory debugging features, but some allocators will definitely overwrite -the memory there, leading to a likely crash. - -Reported-by: Pedro Ribeiro -Signed-off-by: Alan Coopersmith -Reviewed-by: Julien Cristau ---- - dix/dixfonts.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/dix/dixfonts.c b/dix/dixfonts.c -index feb765d..2e34d37 100644 ---- a/dix/dixfonts.c -+++ b/dix/dixfonts.c -@@ -1425,6 +1425,7 @@ doImageText(ClientPtr client, ITclosurePtr c) - GC *pGC; - unsigned char *data; - ITclosurePtr new_closure; -+ ITclosurePtr old_closure; - - /* We're putting the client to sleep. We need to - save some state. Similar problem to that handled -@@ -1436,12 +1437,14 @@ doImageText(ClientPtr client, ITclosurePtr c) - err = BadAlloc; - goto bail; - } -+ old_closure = c; - *new_closure = *c; - c = new_closure; - - data = malloc(c->nChars * itemSize); - if (!data) { - free(c); -+ c = old_closure; - err = BadAlloc; - goto bail; - } -@@ -1452,6 +1455,7 @@ doImageText(ClientPtr client, ITclosurePtr c) - if (!pGC) { - free(c->data); - free(c); -+ c = old_closure; - err = BadAlloc; - goto bail; - } -@@ -1464,6 +1468,7 @@ doImageText(ClientPtr client, ITclosurePtr c) - FreeScratchGC(pGC); - free(c->data); - free(c); -+ c = old_closure; - err = BadAlloc; - goto bail; - } --- -1.7.9.2 - diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 2aa9e1767..d8a71d32d 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198583 2013-10-30 15:46:13Z allan $ +# $Id: PKGBUILD 198667 2013-11-01 16:16:16Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.14.3 -pkgrel=2 +pkgver=1.14.4 +pkgrel=1 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" @@ -22,9 +22,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 10-quirks.conf - fb-rename-wfbDestroyGlyphCache.patch - 0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch) -sha256sums=('02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e' + fb-rename-wfbDestroyGlyphCache.patch) +sha256sums=('608ccfaafb845f6e559884a30f946d365209172416710d687b190e9e1ff65dc3' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' @@ -54,10 +53,6 @@ prepare() { # http://cgit.freedesktop.org/xorg/xserver/commit/fb/wfbrename.h?id=5047810a4c20fab444b8c6eb146c55dcdb0d4219 patch -Np1 -i ../fb-rename-wfbDestroyGlyphCache.patch - - # CVE-2013-4396: Use after free in Xserver handling of ImageText requests - # (to be included in xorg-server 1.15.0 and 1.14.4) - patch -Np1 -i ../0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch } build() { @@ -223,14 +218,3 @@ package_xorg-server-devel() { install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" } -sha256sums=('02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e' - '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' - 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' - 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' - '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588' - 'bb63658d250c21bbfaf94c5417f2920ce5963ee1f7db6cac2b163a54f2e9b619' - 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' - 'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1' - '2b90ce92a900b6d4edda9ef33acdd3d2c2708fec2344175c2d8dfd4265f56d32') -- cgit v1.2.3-54-g00ecf