From e76ad92515b2dec593d81f3b2feabcaf22f9ab55 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:24:18 +0000 Subject: [PATCH 1/7] Initialize branch F-13 for varnish --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 2ecc71890eee84a45f1fcc1aae8ac0bbfcb3e2ae Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Wed, 14 Apr 2010 10:59:01 +0000 Subject: [PATCH 2/7] New upstream release. Some fixes for CVE-2009-2936. --- .cvsignore | 2 +- sources | 2 +- varnish.S-option.patch | 32 ++++++++++++++++++++++++++++++++ varnish.floor.patch | 15 +++++++++++++++ varnish.spec | 40 ++++++++++++++++++++++++++-------------- 5 files changed, 75 insertions(+), 16 deletions(-) create mode 100644 varnish.S-option.patch create mode 100644 varnish.floor.patch diff --git a/.cvsignore b/.cvsignore index 72c39af..e795082 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -varnish-2.0.6.tar.gz +varnish-2.1.tar.gz diff --git a/sources b/sources index 57e2edc..5c0e157 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d91dc21c636db61c69b5e8f061c5bb95 varnish-2.0.6.tar.gz +91d92ea69f7dce470e55ef4721ef9b7d varnish-2.1.tar.gz diff --git a/varnish.S-option.patch b/varnish.S-option.patch new file mode 100644 index 0000000..fdb261d --- /dev/null +++ b/varnish.S-option.patch @@ -0,0 +1,32 @@ +--- ../varnish-2.1.orig/man/vcl.7so ++++ man/vcl.7so +@@ -126,7 +126,6 @@ it's saintmode list + can be set to the maximum list size. Setting a value of 0 disables + saintmode checking entirely for that backend. The value in the backend + declaration overrides the parameter. +- + .Ss Directors + Directors choose from different backends based on health status and a + per-director algorithm. +--- ../varnish-2.1.orig/bin/varnishd/varnishd.1 ++++ bin/varnishd/varnishd.1 +@@ -173,6 +173,9 @@ to the specified + See + .Sx Run-Time Parameters + for a list of parameters. ++.It Fl S Ar file ++Path to a file containing a secret used for authorizing access to the ++management port. + .It Fl s Ar type Ns Xo + .Op , Ns Ar options + .Xc +--- ../varnish-2.1.orig/redhat/varnish.sysconfig ++++ ./redhat/varnish.sysconfig +@@ -38,6 +38,7 @@ + -T localhost:6082 \ + -f /etc/varnish/default.vcl \ + -u varnish -g varnish \ ++ -S /etc/varnish/secret \ + -s file,/var/lib/varnish/varnish_storage.bin,1G" + + diff --git a/varnish.floor.patch b/varnish.floor.patch new file mode 100644 index 0000000..c8252d2 --- /dev/null +++ b/varnish.floor.patch @@ -0,0 +1,15 @@ +Patch by Robert Scheck for varnish >= 2.1, which adds the +missing (former implicit) linking to libm. And as implicit linking can be dangerous, +this changed, see: http://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking + +--- bin/varnishtest/Makefile.am 2010-03-24 10:44:13.000000000 +0100 ++++ bin/varnishtest/Makefile.am.libm 2010-04-07 22:57:03.000000000 +0200 +@@ -25,7 +25,7 @@ + $(top_builddir)/lib/libvarnish/libvarnish.la \ + $(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ + $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ +- ${PTHREAD_LIBS} ++ ${LIBM} ${PTHREAD_LIBS} + + EXTRA_DIST = $(top_srcdir)/bin/varnishtest/tests/*.vtc \ + $(top_srcdir)/bin/varnishtest/tests/README diff --git a/varnish.spec b/varnish.spec index ec2bd66..7fef031 100644 --- a/varnish.spec +++ b/varnish.spec @@ -1,23 +1,25 @@ Summary: High-performance HTTP accelerator Name: varnish -Version: 2.0.6 -Release: 2%{?dist} +Version: 2.1.0 +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 -Patch0: varnish.varnishtest_debugflag.patch -Patch1: varnish.changes-2.0.6.patch +#Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/varnish/varnish-2.1.tar.gz +patch0: varnish.S-option.patch +patch1: varnish.floor.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 -#BuildRequires: automake autoconf libtool -BuildRequires: ncurses-devel libxslt groff +BuildRequires: automake autoconf libtool +BuildRequires: ncurses-devel libxslt groff pcre-devel pkgconfig Requires: varnish-libs = %{version}-%{release} Requires: logrotate Requires: ncurses +Requires: pcre Requires(pre): shadow-utils -Requires(post): /sbin/chkconfig +Requires(post): /sbin/chkconfig, /usr/bin/mkpasswd Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(preun): initscripts @@ -62,7 +64,8 @@ Varnish is a high-performance HTTP accelerator #Varnish is a high-performance HTTP accelerator %prep -%setup -q +#%setup -q +%setup -q -n varnish-2.1 #%setup -q -n varnish-cache # The svn sources needs to generate a suitable configure script @@ -72,6 +75,9 @@ Varnish is a high-performance HTTP accelerator %patch0 %patch1 +# Makefile.am was patched. Needs to rerun autoconf +./autogen.sh + # Hack to get 32- and 64-bits tests run concurrently on the same build machine case `uname -m` in ppc64 | s390x | x86_64 | sparc64 ) @@ -129,11 +135,6 @@ tail -n +11 etc/default.vcl >> redhat/default.vcl redhat/varnish.initrc redhat/varnishlog.initrc redhat/varnishncsa.initrc %endif -# Fix for broken changes-2.0.6.html -pushd doc -%{__make} clean; %{__make} -popd - %check # rhel5 on ppc64 is just too strange %ifarch ppc64 @@ -238,6 +239,7 @@ exit 0 /sbin/chkconfig --add varnish /sbin/chkconfig --add varnishlog /sbin/chkconfig --add varnishncsa +test -f /etc/varnish/secret || (mkpasswd > /etc/varnish/secret && chmod 0600 /etc/varnish/secret) %preun if [ $1 -lt 1 ]; then @@ -254,6 +256,16 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Tue Apr 06 2010 Ingvar Hagelund - 2.1.0-1 +- New upstream release; note: Configuration changes, see the README +- Removed unneeded patches +- CVE-2009-2936: Added a patch from Debian that adds the -S option + to the varnisdh(1) manpage and to the sysconfig defaults, thus + password-protecting the admin interface port (#579536,#579533) +- Generates that password in the post script, requires mkpasswd +- Added a patch from Robert Scheck for explicit linking to libm +- Requires pcre + * Wed Dec 23 2009 Ingvar Hagelund - 2.0.6-2 - Added a test that enables jemalloc on ppc if the kernel is not a rhel5 kernel (as on redhat builders) From 964195a5e6de616aec923d5d3eb3a7b13b9f38aa Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Wed, 14 Apr 2010 20:34:34 +0000 Subject: [PATCH 3/7] Added a patch from svn that fixes doc/changes-2.0.6-2.1.0.xml --- varnish.changes-2.1.0.patch | 53 +++++++++++++++++++++++++++++++++++++ varnish.spec | 17 +++++++++--- 2 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 varnish.changes-2.1.0.patch diff --git a/varnish.changes-2.1.0.patch b/varnish.changes-2.1.0.patch new file mode 100644 index 0000000..460bd5f --- /dev/null +++ b/varnish.changes-2.1.0.patch @@ -0,0 +1,53 @@ +--- doc/changes-2.0.6-2.1.0.xml.orig 2010-04-14 15:16:12.308484148 +0200 ++++ doc/changes-2.0.6-2.1.0.xml 2010-04-14 15:16:28.844484368 +0200 +@@ -2,7 +2,7 @@ + + ]> +- ++ + + + varnishd +@@ -48,7 +48,7 @@ + When closing connections, we experimented with sending RST + to free up load balancers and free up threads more quickly. + This caused some problems with NAT routers and so has been +- reverted for now. ++ reverted for now. + + + +@@ -176,7 +176,7 @@ + + + purge.hash is now deprecated and no longer +- shown in help listings.. ++ shown in help listings. + + + +@@ -298,11 +298,19 @@ + Exit at the end of the file when started + with -d. + ++ + ++ ++ varnishadm + +-varnishadm: +- - timeout support +- - secret support +- - handle cli banner ++ ++ varnishadm can now have a timeout when trying ++ to connect to the running varnishd. ++ + ++ ++ varnishadm now knows how to respond to the ++ secret from a secured varnishd ++ ++ + diff --git a/varnish.spec b/varnish.spec index 7fef031..3f82967 100644 --- a/varnish.spec +++ b/varnish.spec @@ -1,7 +1,7 @@ Summary: High-performance HTTP accelerator Name: varnish Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.varnish-cache.org/ @@ -9,11 +9,12 @@ URL: http://www.varnish-cache.org/ Source0: http://downloads.sourceforge.net/varnish/varnish-2.1.tar.gz patch0: varnish.S-option.patch patch1: varnish.floor.patch +patch2: varnish.changes-2.1.0.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 BuildRequires: automake autoconf libtool -BuildRequires: ncurses-devel libxslt groff pcre-devel pkgconfig +BuildRequires: ncurses-devel libxslt groff pcre-devel pkgconfig pcre Requires: varnish-libs = %{version}-%{release} Requires: logrotate Requires: ncurses @@ -74,6 +75,7 @@ Varnish is a high-performance HTTP accelerator %patch0 %patch1 +%patch2 # Makefile.am was patched. Needs to rerun autoconf ./autogen.sh @@ -109,6 +111,11 @@ cp bin/varnishd/default.vcl etc/zope-plone.vcl examples %configure --disable-static --localstatedir=/var/lib %endif +# Have to regenerate the docs because of patched doc/changes-2.0.6-2.1.0.xml +pushd doc/ +make clean +popd + # We have to remove rpath - not allowed in Fedora # (This problem only visible on 64 bit arches) sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g; @@ -256,8 +263,12 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Wed Apr 14 2010 Ingvar Hagelund - 2.1.0-2 +- Added a patch from svn that fixes doc/changes-2.0.6-2.1.0.xml + * Tue Apr 06 2010 Ingvar Hagelund - 2.1.0-1 -- New upstream release; note: Configuration changes, see the README +- New upstream release; note: Configuration changes, see + doc/changes-2.1.0.html - Removed unneeded patches - CVE-2009-2936: Added a patch from Debian that adds the -S option to the varnisdh(1) manpage and to the sysconfig defaults, thus From ed357aa99a76956ea3f33dcebd9aa60051880696 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Mon, 31 May 2010 12:03:13 +0000 Subject: [PATCH 4/7] New upstream release. A bugfix relase. --- .cvsignore | 2 +- sources | 2 +- varnish.spec | 53 ++++++++++++++++++++++++++-------------------------- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/.cvsignore b/.cvsignore index e795082..d7726fd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -varnish-2.1.tar.gz +varnish-2.1.2.tar.gz diff --git a/sources b/sources index 5c0e157..4b7a161 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -91d92ea69f7dce470e55ef4721ef9b7d varnish-2.1.tar.gz +8b0d80e47acf4946671c381af55518b9 varnish-2.1.2.tar.gz diff --git a/varnish.spec b/varnish.spec index 3f82967..4932107 100644 --- a/varnish.spec +++ b/varnish.spec @@ -1,20 +1,16 @@ Summary: High-performance HTTP accelerator Name: varnish -Version: 2.1.0 -Release: 2%{?dist} +Version: 2.1.2 +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 -Source0: http://downloads.sourceforge.net/varnish/varnish-2.1.tar.gz -patch0: varnish.S-option.patch -patch1: varnish.floor.patch -patch2: varnish.changes-2.1.0.patch +Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz 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 -BuildRequires: automake autoconf libtool -BuildRequires: ncurses-devel libxslt groff pcre-devel pkgconfig pcre +#BuildRequires: automake autoconf libtool +BuildRequires: ncurses-devel libxslt groff pcre-devel pkgconfig Requires: varnish-libs = %{version}-%{release} Requires: logrotate Requires: ncurses @@ -65,21 +61,13 @@ Varnish is a high-performance HTTP accelerator #Varnish is a high-performance HTTP accelerator %prep -#%setup -q -%setup -q -n varnish-2.1 +%setup -q #%setup -q -n varnish-cache # The svn sources needs to generate a suitable configure script # Release tarballs would not need this #./autogen.sh -%patch0 -%patch1 -%patch2 - -# Makefile.am was patched. Needs to rerun autoconf -./autogen.sh - # Hack to get 32- and 64-bits tests run concurrently on the same build machine case `uname -m` in ppc64 | s390x | x86_64 | sparc64 ) @@ -100,10 +88,16 @@ cp bin/varnishd/default.vcl etc/zope-plone.vcl examples %build +# No pkgconfig/libpcre.pc in rhel4 +%if 0%{?rhel} == 4 + export PCRE_CFLAGS=`pcre-config --cflags` + export PCRE_LIBS=`pcre-config --libs` +%endif + # 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` =~ "2.6.18-.*" ]] + if [[ `uname -r` =~ '.el5' ]] then %configure --disable-static --localstatedir=/var/lib --disable-jemalloc else %configure --disable-static --localstatedir=/var/lib fi @@ -111,11 +105,6 @@ cp bin/varnishd/default.vcl etc/zope-plone.vcl examples %configure --disable-static --localstatedir=/var/lib %endif -# Have to regenerate the docs because of patched doc/changes-2.0.6-2.1.0.xml -pushd doc/ -make clean -popd - # We have to remove rpath - not allowed in Fedora # (This problem only visible on 64 bit arches) sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g; @@ -263,12 +252,22 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Wed May 05 2010 Ingvar Hagelund - 2.1.2-1 +- New upstream release +- Remove patches merged upstream + +* Tue Apr 27 2010 Ingvar Hagelund - 2.1.1-1 +- New upstream release +- Added a fix for missing pkgconfig/libpcre.pc on rhel4 +- Added a patch from trunk making the rpm buildable on lowspec + build hosts (like Red Hat's ppc build farm nodes) +- Removed patches that are merged upstream + * Wed Apr 14 2010 Ingvar Hagelund - 2.1.0-2 -- Added a patch from svn that fixes doc/changes-2.0.6-2.1.0.xml +- Added a patch from svn that fixes changes-2.0.6-2.1.0.xml * Tue Apr 06 2010 Ingvar Hagelund - 2.1.0-1 -- New upstream release; note: Configuration changes, see - doc/changes-2.1.0.html +- New upstream release; note: Configuration changes, see the README - Removed unneeded patches - CVE-2009-2936: Added a patch from Debian that adds the -S option to the varnisdh(1) manpage and to the sysconfig defaults, thus From b42a833ef51300d742d2cfe65261c144f6212f19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:53:54 +0000 Subject: [PATCH 5/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 2f0990a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: varnish -# $Id: Makefile,v 1.1 2007/05/21 17:21:09 wtogami Exp $ -NAME := varnish -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From 341c24c518ced557b972de975d024e0f0d8e66c3 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Mon, 2 Aug 2010 15:40:21 +0200 Subject: [PATCH 6/7] * Thu Jul 29 2010 Ingvar Hagelund - 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 - 2.1.3-1 +- New upstream release +- Add a patch for jemalloc on s390 that lacks upstream + * Wed May 05 2010 Ingvar Hagelund - 2.1.2-1 - New upstream release - Remove patches merged upstream From 86ed39741e1b47561f4e50a6ee2bd6052db31ce7 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Mon, 2 Aug 2010 15:40:21 +0200 Subject: [PATCH 7/7] * Thu Jul 29 2010 Ingvar Hagelund - 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 - 2.1.3-1 +- New upstream release +- Add a patch for jemalloc on s390 that lacks upstream + * Wed May 05 2010 Ingvar Hagelund - 2.1.2-1 - New upstream release - Remove patches merged upstream