From 03dda37bf63f647b962a98ee075225d303eb103a Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@redpill-linpro.com>
Date: Nov 05 2013 13:53:55 +0000
Subject: Revert "Added a patch from phk, fixing upstream ppc64 bug #1194"


This reverts commit cb45c3a7b534faa4525b17c29d59d0c8c4b33b43.

---

diff --git a/varnish.fix_ppc64_upstream_bug_1194.patch b/varnish.fix_ppc64_upstream_bug_1194.patch
deleted file mode 100644
index 550011b..0000000
--- a/varnish.fix_ppc64_upstream_bug_1194.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 30e49c3..dfe60a7 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -1,7 +1,7 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 3.0.3
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -11,7 +11,6 @@ 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
@@ -91,8 +90,6 @@ Documentation files for %name
 %patch1
 %endif
 
-%patch2
-
 mkdir examples
 cp bin/varnishd/default.vcl etc/zope-plone.vcl examples
 
@@ -307,9 +304,6 @@ fi
 %endif
 
 %changelog
-* Tue Sep 18 2012 Ingvar Hagelund <ingvar@redpill-linpro.com> - 3.0.3-2
-- Added a patch from phk, fixing upstream ppc64 bug #1194
-
 * Tue Aug 21 2012 Ingvar Hagelund <ingvar@redpill-linpro.com> - 3.0.3-1
 - New upstream release
 - Remove unneeded hacks for ppc