diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2015-02-17 12:33:37 -0500 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2015-02-17 12:33:37 -0500 |
| commit | c37d373b7371c28f8b471ac7be0c3b9f92a769ac (patch) | |
| tree | 52bcc96a3a42f9a3023912184c9da4d87adfeb94 | |
| parent | 622d5f13ac24a9ab2e63543d85d295e94937cc67 (diff) | |
libpng: Update to 1.6.16
Fixes CVE-2014-9495
| -rw-r--r-- | recipes/libpng/0001-neon-fix-function-export-names-for-iOS-armv7.patch | 16 | ||||
| -rw-r--r-- | recipes/libpng/libpng.recipe | 4 |
2 files changed, 11 insertions, 9 deletions
diff --git a/recipes/libpng/0001-neon-fix-function-export-names-for-iOS-armv7.patch b/recipes/libpng/0001-neon-fix-function-export-names-for-iOS-armv7.patch index 0fd4b9b2..b3c78b00 100644 --- a/recipes/libpng/0001-neon-fix-function-export-names-for-iOS-armv7.patch +++ b/recipes/libpng/0001-neon-fix-function-export-names-for-iOS-armv7.patch @@ -8,12 +8,12 @@ Subject: [PATCH] neon: fix function export names for iOS armv7 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/arm/filter_neon.S b/arm/filter_neon.S -index 40d9777..a252488 100644 +index 3b061d6..ac08afa 100644 --- a/arm/filter_neon.S +++ b/arm/filter_neon.S -@@ -21,6 +21,12 @@ - .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */ - #endif +@@ -22,6 +22,12 @@ + + #ifdef PNG_READ_SUPPORTED +#if defined(__APPLE__) +#define FUNC_PREFIX _ @@ -24,7 +24,7 @@ index 40d9777..a252488 100644 /* Assembler NEON support - only works for 32-bit ARM (i.e. it does not work for * ARM64). The code in arm/filter_neon_intrinsics.c supports ARM64, however it * only works if -mfpu=neon is specified on the GCC command line. See pngpriv.h -@@ -42,17 +48,17 @@ +@@ -42,7 +48,7 @@ .macro func name, export=0 .macro endfunc @@ -33,7 +33,9 @@ index 40d9777..a252488 100644 .endfunc .purgem endfunc .endm - .text +@@ -55,11 +61,11 @@ ELF .size \name, . - \name + .align 2 + .if \export - .global \name + .global FUNC_PREFIX\name @@ -48,5 +50,5 @@ index 40d9777..a252488 100644 func png_read_filter_row_sub4_neon, export=1 -- -1.9.0 +2.1.0 diff --git a/recipes/libpng/libpng.recipe b/recipes/libpng/libpng.recipe index 27a4cfaa..11fc2b51 100644 --- a/recipes/libpng/libpng.recipe +++ b/recipes/libpng/libpng.recipe @@ -3,9 +3,9 @@ class Recipe(recipe.Recipe): name = 'libpng' - version = '1.6.10' + version = '1.6.16' stype = SourceType.TARBALL - url = 'http://download.sourceforge.net/libpng/libpng-1.6.10.tar.xz' + url = 'http://download.sourceforge.net/libpng/libpng-1.6.16.tar.xz' licenses = [License.LibPNG] deps = ['zlib'] patches = ['0001-neon-fix-function-export-names-for-iOS-armv7.patch'] |