rpms/varnish
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Thu Jul 29 2010 Ingvar Hagelund <ingvar@redpill-linpro.com> - 2.1.3-1

Browse Source 
- New upstream release
- Add a patch for jemalloc on s390 that lacks upstream
This commit is contained in:
Ingvar Hagelund 2010-08-02 15:40:21 +02:00
parent b42a833ef5
commit 341c24c518
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
varnish-2.1.2.tar.gz varnish-2.1.2.tar.gz
varnish-2.1.3.tar.gz

2
sources
View File

@ -1 +1 @@
8b0d80e47acf4946671c381af55518b9 varnish-2.1.2.tar.gz 357d99a760de173d841ac37bf2052be8 varnish-2.1.3.tar.gz

15
varnish.s390_pagesize.patch Normal file
View File

@ -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

11
varnish.spec
View File

@ -1,11 +1,12 @@
Summary: High-performance HTTP accelerator Summary: High-performance HTTP accelerator
Name: varnish Name: varnish
Version: 2.1.2 Version: 2.1.3
Release: 1%{?dist} Release: 1%{?dist}
License: BSD License: BSD
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.varnish-cache.org/ URL: http://www.varnish-cache.org/
Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
Patch1: varnish.s390_pagesize.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# The svn sources needs autoconf, automake and libtool to generate a suitable # The svn sources needs autoconf, automake and libtool to generate a suitable
# configure script. Release tarballs would not need this # configure script. Release tarballs would not need this
@ -64,6 +65,8 @@ Varnish is a high-performance HTTP accelerator
%setup -q %setup -q
#%setup -q -n varnish-cache #%setup -q -n varnish-cache
%patch1
# The svn sources needs to generate a suitable configure script # The svn sources needs to generate a suitable configure script
# Release tarballs would not need this # Release tarballs would not need this
#./autogen.sh #./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 # Remove "--disable static" if you want to build static libraries
# jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-( # jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
%ifarch ppc64 ppc %ifarch ppc64 ppc
if [[ `uname -r` =~ '.el5' ]] if [[ `uname -r` =~ "2.6.18-.*" ]]
then %configure --disable-static --localstatedir=/var/lib --disable-jemalloc then %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
else %configure --disable-static --localstatedir=/var/lib else %configure --disable-static --localstatedir=/var/lib
fi fi
@ -252,6 +255,10 @@ fi
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %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 * Wed May 05 2010 Ingvar Hagelund <ingvar@redpill-linpro.com> - 2.1.2-1
- New upstream release - New upstream release
- Remove patches merged upstream - Remove patches merged upstream