Hello community,

here is the log from the commit of package varnish for openSUSE:Factory checked 
in at 2013-10-14 09:32:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/varnish (Old)
 and      /work/SRC/openSUSE:Factory/.varnish.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "varnish"

Changes:
--------
--- /work/SRC/openSUSE:Factory/varnish/varnish.changes  2012-10-07 
20:08:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.varnish.new/varnish.changes     2013-10-14 
09:32:43.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Oct  4 21:48:01 UTC 2013 - jeng...@inai.de
+
+- Deactivate libpcre JIT (bnc#839358), add varnish-disable-pcrejit.diff
+
+-------------------------------------------------------------------

New:
----
  varnish-disable-pcrejit.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ varnish.spec ++++++
--- /var/tmp/diff_new_pack.hsVmgq/_old  2013-10-14 09:32:45.000000000 +0200
+++ /var/tmp/diff_new_pack.hsVmgq/_new  2013-10-14 09:32:45.000000000 +0200
@@ -33,6 +33,7 @@
 Source6:    varnishlog.init
 Source7:       varnish.service
 Source8:       varnishlog.service
+Patch1:                varnish-disable-pcrejit.diff
 
 BuildRoot:      %_tmppath/%name-%version-build
 BuildRequires:  libxslt, ncurses-devel, pcre-devel
@@ -95,11 +96,11 @@
 
 %prep
 %setup -q
+%patch -P 1 -p1
 
 %build
-%if 0%{?suse_version} > 1000
-export CFLAGS="%optflags -fstack-protector"
-%endif
+# bnc#839358: Force-deactivate JIT
+export CFLAGS="%optflags -fstack-protector -DPCRE_STUDY_JIT_COMPILE=0"
 %configure --disable-static \
            --localstatedir=%_localstatedir/cache/ \
            --enable-developer-warnings

++++++ varnish-disable-pcrejit.diff ++++++
From: Piotr Jankowski <piotr.jankow...@nsn.com>
Date: 2013-09-10 10:55:57 CEST
References: http://bugzilla.novell.com/show_bug.cgi?id=839358
References: https://www.varnish-cache.org/trac/ticket/1191

"The JIT compiler is broken on some versions of PCRE, at least on
i386, so disable it by default."

---
 lib/libvarnish/vre.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: varnish-3.0.3/lib/libvarnish/vre.c
===================================================================
--- varnish-3.0.3.orig/lib/libvarnish/vre.c
+++ varnish-3.0.3/lib/libvarnish/vre.c
@@ -40,9 +40,8 @@ struct vre {
        pcre_extra              *re_extra;
 };
 
-#ifndef PCRE_STUDY_JIT_COMPILE
+#undef PCRE_STUDY_JIT_COMPILE
 #define PCRE_STUDY_JIT_COMPILE 0
-#endif
 
 /*
  * We don't want to spread or even expose the majority of PCRE options
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to