diff options
| author | Ivo De Decker <ivodd@debian.org> | 2014-12-06 18:58:19 +0000 |
|---|---|---|
| committer | Ivo De Decker <ivodd@debian.org> | 2014-12-06 18:58:19 +0000 |
| commit | dd986e8b547c0dde924c4b566ad0894ad4f1beb9 (patch) | |
| tree | a87ee49df2a732f2be8d1b3c9e46a341e6fb8698 /debian/patches/no_jit_ppc64el.patch | |
pcre3 (2:8.35-3.3) unstable; urgency=medium
* Non-maintainer upload.
* Upstream patch for heap buffer overflow, CVE-2014-8964, taken from
1:8.36-1 (Closes: #770478)
Thanks to Salvatore Bonaccorso for the reminder.
# imported from the archive
Diffstat (limited to 'debian/patches/no_jit_ppc64el.patch')
| -rw-r--r-- | debian/patches/no_jit_ppc64el.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/debian/patches/no_jit_ppc64el.patch b/debian/patches/no_jit_ppc64el.patch new file mode 100644 index 0000000..cf600a3 --- /dev/null +++ b/debian/patches/no_jit_ppc64el.patch @@ -0,0 +1,18 @@ +Description: Disable JIT on ppc64el, needs explicit porting to ELFv2. +Author: Adam Conrad <adconrad@ubuntu.com> + +--- a/sljit/sljitConfigInternal.h ++++ b/sljit/sljitConfigInternal.h +@@ -109,7 +109,11 @@ + #elif defined (__aarch64__) + #define SLJIT_CONFIG_ARM_64 1 + #elif defined(__ppc64__) || defined(__powerpc64__) || defined(_ARCH_PPC64) || (defined(_POWER) && defined(__64BIT__)) +-#define SLJIT_CONFIG_PPC_64 1 ++# if _CALL_ELF != 2 ++# define SLJIT_CONFIG_PPC_64 1 ++# else ++# define SLJIT_CONFIG_UNSUPPORTED 1 ++# endif + #elif defined(__ppc__) || defined(__powerpc__) || defined(_ARCH_PPC) || defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER) + #define SLJIT_CONFIG_PPC_32 1 + #elif defined(__mips__) && !defined(_LP64) |