merge el6
This commit is contained in:
commit
676eccca8b
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
varnish-2.0.6.tar.gz
|
||||
varnish-2.1.2.tar.gz
|
||||
varnish-2.1.3.tar.gz
|
||||
|
11
varnish.ppc64_stacksize_test.patch
Normal file
11
varnish.ppc64_stacksize_test.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- bin/varnishtest/tests/c00031.vtc.orig 2010-08-24 12:33:29.062232351 +0200
|
||||
+++ bin/varnishtest/tests/c00031.vtc 2010-08-24 12:31:57.804150780 +0200
|
||||
@@ -9,7 +9,7 @@
|
||||
txresp
|
||||
} -start
|
||||
|
||||
-varnish v1 -arg "-p thread_pool_stack=131072" -vcl+backend {} -start
|
||||
+varnish v1 -arg "-p thread_pool_stack=262144" -vcl+backend {} -start
|
||||
|
||||
client c1 {
|
||||
txreq -url "/"
|
22
varnish.spec
22
varnish.spec
@ -1,12 +1,13 @@
|
||||
Summary: High-performance HTTP accelerator
|
||||
Name: varnish
|
||||
Version: 2.1.3
|
||||
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
|
||||
Patch1: varnish.s390_pagesize.patch
|
||||
Patch2: varnish.ppc64_stacksize_test.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
|
||||
@ -67,6 +68,11 @@ Varnish is a high-performance HTTP accelerator
|
||||
|
||||
%patch1
|
||||
|
||||
# tests/c00031.vtc crashes on rhel6/ppc64 because of hardcoded stack size
|
||||
%ifarch ppc64
|
||||
%patch2
|
||||
%endif
|
||||
|
||||
# The svn sources needs to generate a suitable configure script
|
||||
# Release tarballs would not need this
|
||||
#./autogen.sh
|
||||
@ -98,12 +104,11 @@ cp bin/varnishd/default.vcl etc/zope-plone.vcl examples
|
||||
%endif
|
||||
|
||||
# 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 RHEL kernel koji server :-(
|
||||
# Fedora users running varnish on ppc with a fedora kernel might want to try
|
||||
# to build with jemalloc.
|
||||
%ifarch ppc64 ppc
|
||||
if [[ `uname -r` =~ "2.6.18-.*" ]]
|
||||
then %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
|
||||
else %configure --disable-static --localstatedir=/var/lib
|
||||
fi
|
||||
%configure --disable-static --localstatedir=/var/lib --disable-jemalloc
|
||||
%else
|
||||
%configure --disable-static --localstatedir=/var/lib
|
||||
%endif
|
||||
@ -255,6 +260,11 @@ fi
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Tue Aug 24 2010 Ingvar Hagelund <ingvar@redpill-linpro.com> - 2.1.3-2
|
||||
- Added a RHEL6/ppc64 specific patch for that changes the hard coded
|
||||
stack size in tests/c00031.vtc
|
||||
|
||||
>>>>>>> el6
|
||||
* 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
|
||||
|
Loading…
Reference in New Issue
Block a user