On Thu, 22 Jan 2015, Adam Borowski wrote:
> Control: reopen -1
> Control: found -1 1:8.35-3
> Control: fixed -1 1:8.35-3.2
> Control: found -1 2:8.35-3.2
Thanks for the BTS juggling! When I discovered that there were
new uploads still not fixing pcre3 on x32 (and powerpcspe) I
feared I had to reopen the bugreport.
Anyway, I just created a new pcre3 source package (also adding
back the two changelog entries Ivo dropped), built it on x32,
uploaded that, built it on i386 (just to verify), and installed
both (M-A) on my x32 desktop system.
So, please apply.
Thanks,
//mirabilos
--
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-235
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Alexander Steeg
diff -Nru pcre3-8.35/debian/changelog pcre3-8.35/debian/changelog
--- pcre3-8.35/debian/changelog 2015-05-26 09:27:56.000000000 +0200
+++ pcre3-8.35/debian/changelog 2015-06-11 09:44:05.000000000 +0200
@@ -1,3 +1,11 @@
+pcre3 (2:8.35-5+powerpcspe+x32.1) unreleased; urgency=medium
+
+ [ Thorsten Glaser ]
+ * Re-add patch disabling JIT on powerpcspe and x32 (Closes: #760327)
+ * Add back missing debian/changelog entries for 1:8.35-3.2 and 1:8.36-1
+
+ -- Thorsten Glaser <[email protected]> Thu, 11 Jun 2015 09:41:54 +0200
+
pcre3 (2:8.35-5) unstable; urgency=low
* re-enable jit on ppc64el (by dropping the patch that disables it)
@@ -36,6 +44,21 @@
-- Ivo De Decker <[email protected]> Sat, 06 Dec 2014 19:21:39 +0100
+pcre3 (1:8.36-1) unstable; urgency=medium
+
+ * New upstream release
+ * Upped shlibs dependency to 8.35 (Closes: #767903)
+ * Upstream patch for heap buffer overflow, CVE-2014-8964 (Closes: #770478)
+
+ -- Mark Baker <[email protected]> Mon, 24 Nov 2014 22:41:12 +0000
+
+pcre3 (1:8.35-3.2) unstable; urgency=low
+
+ * Non-maintainer upload with maintainer permission.
+ * Disable JIT on x32 and powerpcspe (Closes: #760327).
+
+ -- Thorsten Glaser <[email protected]> Wed, 12 Nov 2014 14:30:23 +0000
+
pcre3 (1:8.35-3.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru pcre3-8.35/debian/patches/no_jit_x32_powerpcspe.patch
pcre3-8.35/debian/patches/no_jit_x32_powerpcspe.patch
--- pcre3-8.35/debian/patches/no_jit_x32_powerpcspe.patch 1970-01-01
01:00:00.000000000 +0100
+++ pcre3-8.35/debian/patches/no_jit_x32_powerpcspe.patch 2015-06-11
09:41:30.000000000 +0200
@@ -0,0 +1,31 @@
+Description: Disable JIT on x32, needs explicit porting to ILP32 amd64,
FPU-less PowerPC.
+Author: Thorsten Glaser <[email protected]>, Roland Stigge <[email protected]>
+
+--- a/sljit/sljitConfigInternal.h
++++ b/sljit/sljitConfigInternal.h
+@@ -97,7 +97,11 @@
+ #if defined(__i386__) || defined(__i386)
+ #define SLJIT_CONFIG_X86_32 1
+ #elif defined(__x86_64__)
+-#define SLJIT_CONFIG_X86_64 1
++# if defined(__ILP32__)
++# define SLJIT_CONFIG_UNSUPPORTED 1
++# else
++# define SLJIT_CONFIG_X86_64 1
++# endif
+ #elif defined(__arm__) || defined(__ARM__)
+ #ifdef __thumb2__
+ #define SLJIT_CONFIG_ARM_THUMB2 1
+@@ -111,7 +115,11 @@
+ #elif defined(__ppc64__) || defined(__powerpc64__) || defined(_ARCH_PPC64) ||
(defined(_POWER) && defined(__64BIT__))
+ #define SLJIT_CONFIG_PPC_64 1
+ #elif defined(__ppc__) || defined(__powerpc__) || defined(_ARCH_PPC) ||
defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER)
+-#define SLJIT_CONFIG_PPC_32 1
++# ifndef __NO_FPRS__
++# define SLJIT_CONFIG_PPC_32 1
++# else
++# define SLJIT_CONFIG_UNSUPPORTED 1
++# endif
+ #elif defined(__mips__) && !defined(_LP64)
+ #define SLJIT_CONFIG_MIPS_32 1
+ #elif defined(__mips64)
diff -Nru pcre3-8.35/debian/patches/series pcre3-8.35/debian/patches/series
--- pcre3-8.35/debian/patches/series 2015-05-26 09:23:27.000000000 +0200
+++ pcre3-8.35/debian/patches/series 2015-06-11 09:41:15.000000000 +0200
@@ -5,3 +5,4 @@
soname.patch
Fix-silly-quantifier-size-check.patch
cve-2014-8964.patch
+no_jit_x32_powerpcspe.patch
