diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-05-16 11:41:20 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-05-16 11:41:20 +0000 |
| commit | ead36edb93fb1fbf1a7849f220c9bfdfaa746393 (patch) | |
| tree | 8474fdd3e9084d108b9c39661cfd824fde66fab5 | |
| parent | 48428d91b73c1141f947f4e7f9de8a924b49b101 (diff) | |
| download | aports-ead36edb93fb1fbf1a7849f220c9bfdfaa746393.tar.bz2 aports-ead36edb93fb1fbf1a7849f220c9bfdfaa746393.tar.xz | |
main/mesa: security upgrade to 8.0.5 (CVE-2012-5129)
fixes #1890
| -rw-r--r-- | main/mesa/APKBUILD | 8 | ||||
| -rw-r--r-- | main/mesa/imports-uclibc.patch | 4 | ||||
| -rw-r--r-- | main/mesa/mesa-7.10-uclibc-glsl.patch | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD index 9eff64ed7..4cec9803f 100644 --- a/main/mesa/APKBUILD +++ b/main/mesa/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mesa -pkgver=8.0.2 +pkgver=8.0.5 pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="http://www.mesa3d.org" @@ -131,8 +131,8 @@ nouveau() { _mv_dri nouveau_dri nouveau_vieux_dri; } swrast() { _mv_dri swrast_dri; } vmwgfx() { _mv_dri vmwgfx_dri; } -md5sums="a368104e5700707048dc3e8691a9a7a1 MesaLib-8.0.2.tar.bz2 -03e9685b0d714e915c35fd0fb5fde810 mesa-7.10-uclibc-glsl.patch +md5sums="01305591073a76b65267f69f27d635a3 MesaLib-8.0.5.tar.bz2 +13cc91257dac1311013f681705bcf3aa mesa-7.10-uclibc-glsl.patch 90a2ea438ff328443a0436a91a74d518 mesa-7.10-uclibc-gallium.patch -9dc5080bb4d9d436b476bfeb878ca224 imports-uclibc.patch +bc2d3e144f7577be016b44b514d0b923 imports-uclibc.patch a1a766b4c6a96d67cad9bd7ad5c578e8 glx_ro_text_segm.patch" diff --git a/main/mesa/imports-uclibc.patch b/main/mesa/imports-uclibc.patch index d27d5af4d..19e7e32d7 100644 --- a/main/mesa/imports-uclibc.patch +++ b/main/mesa/imports-uclibc.patch @@ -4,8 +4,8 @@ _mesa_strtof( const char *s, char **end ) { #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ -- !defined(ANDROID) -+ !defined(ANDROID) && !defined(__UCLIBC__) +- !defined(ANDROID) && !defined(__HAIKU__) ++ !defined(ANDROID) && !defined(__HAIKU__) && !defined(__UCLIBC__) static locale_t loc = NULL; if (!loc) { loc = newlocale(LC_CTYPE_MASK, "C", NULL); diff --git a/main/mesa/mesa-7.10-uclibc-glsl.patch b/main/mesa/mesa-7.10-uclibc-glsl.patch index df7ee1b3b..53f4bd3f7 100644 --- a/main/mesa/mesa-7.10-uclibc-glsl.patch +++ b/main/mesa/mesa-7.10-uclibc-glsl.patch @@ -1,11 +1,11 @@ ---- Mesa-7.10.orig/src/glsl/strtod.c -+++ Mesa-7.10/src/glsl/strtod.c -@@ -44,7 +44,7 @@ - double +--- ./src/glsl/strtod.c.orig ++++ ./src/glsl/strtod.c +@@ -45,7 +45,7 @@ glsl_strtod(const char *s, char **end) { --#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) -+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(__UCLIBC__) + #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ +- !defined(__HAIKU__) ++ !defined(__HAIKU__) && !defined(__UCLIBC__) static locale_t loc = NULL; if (!loc) { loc = newlocale(LC_CTYPE_MASK, "C", NULL); |