[varnish/f18] Added a patch from phk, fixing upstream ppc64 bug #1194

Ingvar Hagelund ingvar at fedoraproject.org
Tue Sep 18 10:39:51 UTC 2012


commit cb45c3a7b534faa4525b17c29d59d0c8c4b33b43
Author: Ingvar Hagelund <ingvar at redpill-linpro.com>
Date:   Tue Sep 18 12:39:45 2012 +0200

    Added a patch from phk, fixing upstream ppc64 bug #1194

 varnish.fix_ppc64_upstream_bug_1194.patch |   11 +++++++++++
 varnish.spec                              |    8 +++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/varnish.fix_ppc64_upstream_bug_1194.patch b/varnish.fix_ppc64_upstream_bug_1194.patch
new file mode 100644
index 0000000..550011b
--- /dev/null
+++ b/varnish.fix_ppc64_upstream_bug_1194.patch
@@ -0,0 +1,11 @@
+--- bin/varnishd/cache_ban.c.orig	2012-09-18 11:44:55.867165803 +0200
++++ bin/varnishd/cache_ban.c	2012-09-18 11:45:37.879300620 +0200
+@@ -81,7 +81,7 @@
+ 	const void		*arg2_spec;
+ };
+ 
+-static VTAILQ_HEAD(banhead_s,ban) ban_head = VTAILQ_HEAD_INITIALIZER(ban_head);
++static volatile VTAILQ_HEAD(banhead_s,ban) ban_head = VTAILQ_HEAD_INITIALIZER(ban_head);
+ static struct lock ban_mtx;
+ static struct ban *ban_magic;
+ static pthread_t ban_thread;
diff --git a/varnish.spec b/varnish.spec
index dfe60a7..30e49c3 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -1,7 +1,7 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 3.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -11,6 +11,7 @@ Source2: varnish.params
 Source3: varnishncsa.service
 Source4: varnishlog.service
 Patch1:  varnish.no_pcre_jit.patch
+Patch2:  varnish.fix_ppc64_upstream_bug_1194.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # To build from git, start with a make dist, see redhat/README.redhat 
 # You will need at least automake autoconf libtool python-docutils
@@ -90,6 +91,8 @@ Documentation files for %name
 %patch1
 %endif
 
+%patch2
+
 mkdir examples
 cp bin/varnishd/default.vcl etc/zope-plone.vcl examples
 
@@ -304,6 +307,9 @@ fi
 %endif
 
 %changelog
+* Tue Sep 18 2012 Ingvar Hagelund <ingvar at redpill-linpro.com> - 3.0.3-2
+- Added a patch from phk, fixing upstream ppc64 bug #1194
+
 * Tue Aug 21 2012 Ingvar Hagelund <ingvar at redpill-linpro.com> - 3.0.3-1
 - New upstream release
 - Remove unneeded hacks for ppc


More information about the scm-commits mailing list