From 192a0a2ccb16df3f19b5d13230ec0a84203e664d Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@fedoraproject.org>
Date: Fri, 5 Jun 2009 12:10:37 +0000
Subject: [PATCH] Added a s390 specific patch to libjemalloc

---
 varnish.s390x_pagesize.patch | 15 +++++++++++++++
 varnish.spec                 |  9 +++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 varnish.s390x_pagesize.patch

diff --git a/varnish.s390x_pagesize.patch b/varnish.s390x_pagesize.patch
new file mode 100644
index 0000000..cc1117f
--- /dev/null
+++ b/varnish.s390x_pagesize.patch
@@ -0,0 +1,15 @@
+diff -Naur ../varnish-2.0.3.orig/lib/libjemalloc/jemalloc_linux.c ./lib/libjemalloc/jemalloc_linux.c
+--- ../varnish-2.0.3.orig/lib/libjemalloc/jemalloc_linux.c	2009-02-12 12:15:24.000000000 +0100
++++ ./lib/libjemalloc/jemalloc_linux.c	2009-06-04 15:27:34.000000000 +0200
+@@ -272,6 +272,11 @@
+ #  define QUANTUM_2POW		4
+ #  define SIZEOF_PTR_2POW	2
+ #endif
++#ifdef __s390x__
++#  define PAGESIZE_2POW		12
++#  define QUANTUM_2POW		4
++#  define SIZEOF_PTR_2POW	3
++#endif
+ 
+ #define	QUANTUM			((size_t)(1U << QUANTUM_2POW))
+ #define	QUANTUM_MASK		(QUANTUM - 1)
diff --git a/varnish.spec b/varnish.spec
index e9c4dae..e5459ad 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -1,12 +1,13 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 2.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 Patch0: varnish.varnishtest_debugflag.patch
+Patch1: varnish.s390x_pagesize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -69,6 +70,7 @@ Varnish is a high-performance HTTP accelerator
 #./autogen.sh
 
 %patch0 -p0
+%patch1 -p0
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -91,7 +93,7 @@ cp bin/varnishd/default.vcl etc/zope-plone.vcl examples
 %build
 
 # Remove "--disable static" if you want to build static libraries 
-# jemalloc is not compatible with Red Hat's ppc64 RHEL5 kernel koji server :-(
+# jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
 %ifarch ppc64 ppc
 %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
 %else
@@ -235,6 +237,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu May 04 2009 Ingvar Hagelund <ingvar@linpro.no> - 2.0.4-2
+- Added a s390 specific patch to libjemalloc.
+
 * Fri Mar 27 2009 Ingvar Hagelund <ingvar@linpro.no> - 2.0.4-1
   New upstream release 2.0.4