Commit Debian 3.0 (quilt) metadata

[dgit (3.11~deb9u1) quilt-fixup]

diff --git a/debian/patches/patch-from-mariadb-to-fix-stack-frame-si b/debian/patches/patch-from-mariadb-to-fix-stack-frame-si
new file mode 100644 (file)
index 0000000..3f6d7e3
--- /dev/null
+++ b/debian/patches/patch-from-mariadb-to-fix-stack-frame-si
@@ -0,0 +1,26 @@
+From: Matthew Vernon <matthew@debian.org>
+Date: Thu, 30 Nov 2017 15:37:30 +0000
+X-Dgit-Generated: 2:8.39-6 a1c9961364820d491470bba8fb48bf51b0c56895
+Subject: Patch from MariaDB to fix stack frame size detection
+
+This comes via Ondřej Surý <ondrej@debian.org> in #878107. Upstream
+don't consider it sufficiently important to fix, but it is causing us
+issues.
+
+---
+
+--- pcre3-8.39.orig/pcre_exec.c
++++ pcre3-8.39/pcre_exec.c
+@@ -509,6 +509,12 @@ Returns:       MATCH_MATCH if matched
+                  (e.g. stopped by repeated call or recursion limit)
+ */
+ 
++#ifdef __GNUC__
++static int
++match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
++  PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
++  unsigned int rdepth) __attribute__((noinline,noclone));
++#endif
+ static int
+ match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
+   PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,

diff --git a/debian/patches/series b/debian/patches/series
index 517fc16f6e143c0f389d167f54a2a0696df93f9f..6b773a675e4a76484e19417d2839e296e44b1d26 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ no_jit_x32_powerpcspe.patch
 Disable_JIT_on_sparc64.patch
 CVE-2017-6004.patch
 upstream-fix-for-cve-2017-7186-upstream-
+patch-from-mariadb-to-fix-stack-frame-si