From 341c24c518ced557b972de975d024e0f0d8e66c3 Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@yum.linpro.no>
Date: Mon, 2 Aug 2010 15:40:21 +0200
Subject: [PATCH] * Thu Jul 29 2010 Ingvar Hagelund <ingvar@redpill-linpro.com>
 - 2.1.3-1 - New upstream release - Add a patch for jemalloc on s390 that
 lacks upstream

---
 .gitignore                  |  1 +
 sources                     |  2 +-
 varnish.s390_pagesize.patch | 15 +++++++++++++++
 varnish.spec                | 11 +++++++++--
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 varnish.s390_pagesize.patch

diff --git a/.gitignore b/.gitignore
index d7726fd..492405a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 varnish-2.1.2.tar.gz
+varnish-2.1.3.tar.gz
diff --git a/sources b/sources
index 4b7a161..5b1ebb2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8b0d80e47acf4946671c381af55518b9  varnish-2.1.2.tar.gz
+357d99a760de173d841ac37bf2052be8  varnish-2.1.3.tar.gz
diff --git a/varnish.s390_pagesize.patch b/varnish.s390_pagesize.patch
new file mode 100644
index 0000000..ec43aba
--- /dev/null
+++ b/varnish.s390_pagesize.patch
@@ -0,0 +1,15 @@
+diff -Naur ../varnish-2.1.2.orig/lib/libjemalloc/jemalloc_linux.c ./lib/libjemalloc/jemalloc_linux.c
+--- ../varnish-2.1.2.orig/lib/libjemalloc/jemalloc_linux.c	2010-05-05 09:32:02.000000000 +0200
++++ ./lib/libjemalloc/jemalloc_linux.c	2010-07-29 15:39:00.221232248 +0200
+@@ -273,6 +273,11 @@
+ #  define QUANTUM_2POW		4
+ #  define SIZEOF_PTR_2POW	2
+ #endif
++#ifdef __s390__
++#  define PAGESIZE_2POW		12
++#  define QUANTUM_2POW		4
++#  define SIZEOF_PTR_2POW	2
++#endif
+ #ifdef __s390x__
+ #  define PAGESIZE_2POW		12
+ #  define QUANTUM_2POW		4
diff --git a/varnish.spec b/varnish.spec
index 4932107..a05ca8d 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -1,11 +1,12 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.1.2
+Version: 2.1.3
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
+Patch1: varnish.s390_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
@@ -64,6 +65,8 @@ Varnish is a high-performance HTTP accelerator
 %setup -q
 #%setup -q -n varnish-cache
 
+%patch1
+
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 #./autogen.sh
@@ -97,7 +100,7 @@ cp bin/varnishd/default.vcl etc/zope-plone.vcl examples
 # Remove "--disable static" if you want to build static libraries 
 # jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
 %ifarch ppc64 ppc
-	if [[ `uname -r` =~ '.el5' ]]
+	if [[ `uname -r` =~ "2.6.18-.*" ]]
 		then %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
 		else %configure --disable-static --localstatedir=/var/lib
 	fi
@@ -252,6 +255,10 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Jul 29 2010 Ingvar Hagelund <ingvar@redpill-linpro.com> - 2.1.3-1
+- New upstream release
+- Add a patch for jemalloc on s390 that lacks upstream
+
 * Wed May 05 2010 Ingvar Hagelund <ingvar@redpill-linpro.com> - 2.1.2-1
 - New upstream release
 - Remove patches merged upstream