diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/memcached/PKGBUILD | 17 | ||||
-rw-r--r-- | extra/memcached/memcached.service | 1 | ||||
-rw-r--r-- | extra/mercurial/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/mesa/PKGBUILD | 17 | ||||
-rw-r--r-- | extra/mesa/revert.remove.GLXContextID.typedef.patch | 30 | ||||
-rw-r--r-- | extra/xorg-server/CVE-2013-6424.diff | 49 | ||||
-rw-r--r-- | extra/xorg-server/PKGBUILD | 13 |
7 files changed, 116 insertions, 17 deletions
diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD index 2de510c5d..d743e3091 100644 --- a/extra/memcached/PKGBUILD +++ b/extra/memcached/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185263 2013-05-12 16:29:01Z dan $ +# $Id: PKGBUILD 203228 2014-01-05 23:07:05Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Michael Irwin <6d6469@gmail.com> pkgname=memcached -pkgver=1.4.15 -pkgrel=2 +pkgver=1.4.17 +pkgrel=1 pkgdesc="A distributed memory object caching system" arch=(i686 x86_64) url="http://memcached.org/" @@ -12,10 +12,10 @@ license=('GPL') depends=('libevent') optdepends=('perl: for memcached-tool usage') install=memcached.install -source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz +source=(http://www.memcached.org/files/$pkgname-$pkgver.tar.gz memcached.service) -sha256sums=('169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4' - '453cad82bddb25fac43fd5cedc5702b9b6c6abaf7498e21445facf20f25f53a6') +sha256sums=('d9173ef6d99ba798c982ea4566cb4f0e64eb23859fdbf9926a89999d8cdc0458' + 'e768a48192aefa2e2f443c86b3c085043005ffc313da40f3074c060a18c8359d') build() { cd "$srcdir/$pkgname-$pkgver" @@ -23,6 +23,11 @@ build() { make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make test +} + package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install diff --git a/extra/memcached/memcached.service b/extra/memcached/memcached.service index c6e15fb7c..8b04b1c35 100644 --- a/extra/memcached/memcached.service +++ b/extra/memcached/memcached.service @@ -6,6 +6,7 @@ After=network.target User=memcached # Remove '-l 127.0.0.1' to listen on all addresses ExecStart=/usr/bin/memcached -l 127.0.0.1 +Restart=always [Install] WantedBy=multi-user.target diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 41a5b7b8f..8a4a1aa92 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 200687 2013-12-02 16:02:10Z giovanni $ +# $Id: PKGBUILD 203249 2014-01-06 19:40:56Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.8.1 +pkgver=2.8.2 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('bede5869f9b5d09ab3269bac472495e7' +md5sums=('050d05f9efc95dfef88217b63962a09a' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index d83c26897..12b858267 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,20 +1,29 @@ -# $Id: PKGBUILD 201668 2013-12-17 21:04:31Z lcarlier $ +# $Id: PKGBUILD 203236 2014-01-06 07:56:25Z 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=10.0.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd') url="http://mesa3d.sourceforge.net" license=('custom') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 - LICENSE) + LICENSE + revert.remove.GLXContextID.typedef.patch) md5sums=('0a72ca5b36046a658bf6038326ff32ed' - '5c65a0fe315dd347e09b1f2826a1df5a') + '5c65a0fe315dd347e09b1f2826a1df5a' + '6e49b4dd4ceb7873610f608f74efbaaf') + +prepare() { + cd ${srcdir}/?esa-* + + # Cherry picked from mesa branch 10.0, this fix wxgtk rebuild (FS#38392) + patch -Np1 -i ../revert.remove.GLXContextID.typedef.patch +} build() { cd ${srcdir}/?esa-* diff --git a/extra/mesa/revert.remove.GLXContextID.typedef.patch b/extra/mesa/revert.remove.GLXContextID.typedef.patch new file mode 100644 index 000000000..92232dd2d --- /dev/null +++ b/extra/mesa/revert.remove.GLXContextID.typedef.patch @@ -0,0 +1,30 @@ +From 347f1493320e1bc2194c70d4d66bfe2b5883bf1e Mon Sep 17 00:00:00 2001 +From: Kenneth Graunke <kenneth@whitecape.org> +Date: Mon, 30 Dec 2013 07:19:36 +0000 +Subject: Revert "mesa: Remove GLXContextID typedef from glx.h." + +This reverts commit 136a12ac98868d82c2ae9fcc80d11044a7ec56d1. + +According to belak51 on IRC, this commit broke Allegro, which would no +longer compile. Applications apparently expect the GLXContextID typedef +to exist in glx.h; removing it breaks them. A bit of searching around +the internet revealed other complaints since upgrading to Mesa 10. + +Cc: "10.0" <mesa-stable@lists.freedesktop.org> +(cherry picked from commit f425d56ba41382be04366d011536ee78a03a2f33) +--- +diff --git a/include/GL/glx.h b/include/GL/glx.h +index 62d0ede..234abc0 100644 +--- a/include/GL/glx.h ++++ b/include/GL/glx.h +@@ -168,6 +168,7 @@ typedef XID GLXDrawable; + /* GLX 1.3 and later */ + typedef struct __GLXFBConfigRec *GLXFBConfig; + typedef XID GLXFBConfigID; ++typedef XID GLXContextID; + typedef XID GLXWindow; + typedef XID GLXPbuffer; + +-- +cgit v0.9.0.2-2-gbebe + diff --git a/extra/xorg-server/CVE-2013-6424.diff b/extra/xorg-server/CVE-2013-6424.diff new file mode 100644 index 000000000..8c664b66e --- /dev/null +++ b/extra/xorg-server/CVE-2013-6424.diff @@ -0,0 +1,49 @@ +From patchwork Wed Oct 2 13:47:54 2013 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: exa: only draw valid trapezoids +From: Maarten Lankhorst <maarten.lankhorst@canonical.com> +X-Patchwork-Id: 14769 +Message-Id: <524C240A.9010607@canonical.com> +To: "X.Org Devel List" <xorg-devel@lists.freedesktop.org> +Date: Wed, 02 Oct 2013 15:47:54 +0200 + +Fixes freedesktop.org bug https://bugs.freedesktop.org/show_bug.cgi?id=67484 + +If t->bottom is close to MIN_INT, removing top can wraparound, so do the check properly. +A similar fix should also be applied to pixman. + +Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> + +--- + + +diff --git a/exa/exa_render.c b/exa/exa_render.c +index 172e2b5..807eeba 100644 +--- a/exa/exa_render.c ++++ b/exa/exa_render.c +@@ -1141,7 +1141,8 @@ exaTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst, + + exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST); + for (; ntrap; ntrap--, traps++) +- (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); ++ if (xTrapezoidValid(traps)) ++ (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); + exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST); + + xRel = bounds.x1 + xSrc - xDst; +diff --git a/render/picture.h b/render/picture.h +index c85353a..fcd6401 100644 +--- a/render/picture.h ++++ b/render/picture.h +@@ -211,7 +211,7 @@ typedef pixman_fixed_t xFixed; + /* whether 't' is a well defined not obviously empty trapezoid */ + #define xTrapezoidValid(t) ((t)->left.p1.y != (t)->left.p2.y && \ + (t)->right.p1.y != (t)->right.p2.y && \ +- (int) ((t)->bottom - (t)->top) > 0) ++ ((t)->bottom > (t)->top)) + + /* + * Standard NTSC luminance conversions: + diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 28ade7a63..b9b3f52ad 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 201503 2013-12-13 14:16:21Z andyrtr $ +# $Id: PKGBUILD 203261 2014-01-06 22:20:54Z lcarlier $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> 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.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" @@ -22,7 +22,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 10-quirks.conf - fb-rename-wfbDestroyGlyphCache.patch) + fb-rename-wfbDestroyGlyphCache.patch + CVE-2013-6424.diff) sha256sums=('8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' @@ -32,7 +33,8 @@ sha256sums=('8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' - 'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1') + 'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1' + '89948993afd4d9aec6a0bdbaf62f494e9956bb77a0386307d497f340a818ff61') prepare() { cd "${pkgbase}-${pkgver}" @@ -53,6 +55,9 @@ prepare() { # http://cgit.freedesktop.org/xorg/xserver/commit/fb/wfbrename.h?id=5047810a4c20fab444b8c6eb146c55dcdb0d4219 patch -Np1 -i ../fb-rename-wfbDestroyGlyphCache.patch + + # Fix CVE-2013-6424 (FS#38401) + patch -Np1 -i ../CVE-2013-6424.diff } build() { |