From 215d9c46db2ee246f020a9f3686c98c38cf4e5ac Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Mon, 9 Nov 2009 20:39:32 +0000 Subject: [PATCH 01/10] New upstream release --- .cvsignore | 2 +- sources | 2 +- varnish.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index b921538..993205d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -varnish-2.0.4.tar.gz +varnish-2.0.5.tar.gz diff --git a/sources b/sources index 35abf74..dbdb884 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8044d59cb6d2ec6d09b7ae6033f06bbf varnish-2.0.4.tar.gz +fde37b8c571cb69cf9e9f0da62a8310b varnish-2.0.5.tar.gz diff --git a/varnish.spec b/varnish.spec index 51aab53..f1048fb 100644 --- a/varnish.spec +++ b/varnish.spec @@ -1,7 +1,7 @@ Summary: High-performance HTTP accelerator Name: varnish -Version: 2.0.4 -Release: 4%{?dist} +Version: 2.0.5 +Release: 1%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.varnish-cache.org/ @@ -239,6 +239,9 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Mon Nov 09 2009 Ingvar Hagelund - 2.0.5-1 +- New upstream release + * Thu Aug 13 2009 Ingvar Hagelund - 2.0.4-4 - Added a sparc specific patch to libjemalloc. From 12c59b42ff7570fd70d98e0fc8b02cfa19c05961 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:11:51 +0000 Subject: [PATCH 02/10] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 345cba9..2f0990a 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: varnish -# $Id$ +# $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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From de5fe61b60e49879f2bc1be8f9bf8592ab58379a Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Mon, 21 Dec 2009 21:58:31 +0000 Subject: [PATCH 03/10] New upstream release --- .cvsignore | 2 +- sources | 2 +- varnish.spec | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 993205d..72c39af 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -varnish-2.0.5.tar.gz +varnish-2.0.6.tar.gz diff --git a/sources b/sources index dbdb884..57e2edc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fde37b8c571cb69cf9e9f0da62a8310b varnish-2.0.5.tar.gz +d91dc21c636db61c69b5e8f061c5bb95 varnish-2.0.6.tar.gz diff --git a/varnish.spec b/varnish.spec index f1048fb..b6e2e40 100644 --- a/varnish.spec +++ b/varnish.spec @@ -1,14 +1,12 @@ Summary: High-performance HTTP accelerator Name: varnish -Version: 2.0.5 +Version: 2.0.6 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.s390x_pagesize.patch -Patch2: varnish.sparc_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 @@ -71,8 +69,6 @@ Varnish is a high-performance HTTP accelerator #./autogen.sh %patch0 -p0 -%patch1 -p0 -%patch2 -p0 # Hack to get 32- and 64-bits tests run concurrently on the same build machine case `uname -m` in @@ -239,6 +235,10 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Thu Dec 17 2009 Ingvar Hagelund - 2.0.6-1 +- New upstream release +- Removed patches for libjemalloc, as they are added upstream + * Mon Nov 09 2009 Ingvar Hagelund - 2.0.5-1 - New upstream release From b7f5ea97adb825985b6066e4a3fd2dd0daf61cac Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Wed, 23 Dec 2009 17:31:24 +0000 Subject: [PATCH 04/10] - Added a test that enables jemalloc on ppc if the kernel is not a rhel5 kernel (as on redhat builders) - Removed tests c00031.vtc and r00387on rhel4/ppc as they fail on the Red Hat ppc builders (but works on my rhel4 ppc instance) - Added a patch that fixes broken changes-2.0.6.html in doc --- varnish.spec | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/varnish.spec b/varnish.spec index b6e2e40..ec2bd66 100644 --- a/varnish.spec +++ b/varnish.spec @@ -1,12 +1,13 @@ Summary: High-performance HTTP accelerator Name: varnish Version: 2.0.6 -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.changes-2.0.6.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 @@ -68,7 +69,8 @@ Varnish is a high-performance HTTP accelerator # Release tarballs would not need this #./autogen.sh -%patch0 -p0 +%patch0 +%patch1 # Hack to get 32- and 64-bits tests run concurrently on the same build machine case `uname -m` in @@ -93,9 +95,12 @@ 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 -%configure --disable-static --localstatedir=/var/lib --disable-jemalloc + if [[ `uname -r` =~ "2.6.18-.*" ]] + then %configure --disable-static --localstatedir=/var/lib --disable-jemalloc + else %configure --disable-static --localstatedir=/var/lib + fi %else -%configure --disable-static --localstatedir=/var/lib + %configure --disable-static --localstatedir=/var/lib %endif # We have to remove rpath - not allowed in Fedora @@ -124,6 +129,11 @@ 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 @@ -132,6 +142,15 @@ tail -n +11 etc/default.vcl >> redhat/default.vcl %endif %endif +# The redhat ppc builders seem to have some ulimit problems? +# These tests work on a rhel4 ppc/ppc64 instance outside the builders +%ifarch ppc64 ppc + %if 0%{?rhel} == 4 + rm bin/varnishtest/tests/c00031.vtc + rm bin/varnishtest/tests/r00387.vtc + %endif +%endif + LD_LIBRARY_PATH="lib/libvarnish/.libs:lib/libvarnishcompat/.libs:lib/libvarnishapi/.libs:lib/libvcl/.libs" bin/varnishd/varnishd -b 127.0.0.1:80 -C -n /tmp/foo %{__make} check LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcl/.libs" @@ -235,7 +254,14 @@ fi %postun libs -p /sbin/ldconfig %changelog -* Thu Dec 17 2009 Ingvar Hagelund - 2.0.6-1 +* 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) +- Removed tests c00031.vtc and r00387on rhel4/ppc as they fail + on the Red Hat ppc builders (but works on my rhel4 ppc instance) +- Added a patch that fixes broken changes-2.0.6.html in doc + +* Mon Dec 14 2009 Ingvar Hagelund - 2.0.6-1 - New upstream release - Removed patches for libjemalloc, as they are added upstream From c62c2a94f42af9bbe199a0e030c6c1acf31fa924 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Wed, 23 Dec 2009 17:34:47 +0000 Subject: [PATCH 05/10] fixes broken changelog --- varnish.changes-2.0.6.patch | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 varnish.changes-2.0.6.patch diff --git a/varnish.changes-2.0.6.patch b/varnish.changes-2.0.6.patch new file mode 100644 index 0000000..2712599 --- /dev/null +++ b/varnish.changes-2.0.6.patch @@ -0,0 +1,9 @@ +--- doc/changes-2.0.5-2.0.6.xml.orig 2009-12-23 11:42:58.168643121 +0100 ++++ doc/changes-2.0.5-2.0.6.xml 2009-12-23 11:43:05.827643574 +0100 +@@ -49,5 +49,5 @@ + Document the -C option + to varnishd. + +- ++ + From 7b2ec15acf9989d69e5a0d307ac2ac756897020f Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Wed, 23 Dec 2009 19:17:42 +0000 Subject: [PATCH 06/10] Forgot to commit a patch. Bump release for rebuild. --- varnish.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/varnish.spec b/varnish.spec index ec2bd66..4dc110a 100644 --- a/varnish.spec +++ b/varnish.spec @@ -1,7 +1,7 @@ Summary: High-performance HTTP accelerator Name: varnish Version: 2.0.6 -Release: 2%{?dist} +Release: 2.1%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.varnish-cache.org/ @@ -254,7 +254,7 @@ fi %postun libs -p /sbin/ldconfig %changelog -* Wed Dec 23 2009 Ingvar Hagelund - 2.0.6-2 +* Wed Dec 23 2009 Ingvar Hagelund - 2.0.6-2.1 - Added a test that enables jemalloc on ppc if the kernel is not a rhel5 kernel (as on redhat builders) - Removed tests c00031.vtc and r00387on rhel4/ppc as they fail From c6f3686cd96c7efff8f8605fbe1c27cba2c73393 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Wed, 23 Dec 2009 19:32:12 +0000 Subject: [PATCH 07/10] Forgot to commit a patch. Bump release for rebuild. --- varnish.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/varnish.spec b/varnish.spec index 4dc110a..811341c 100644 --- a/varnish.spec +++ b/varnish.spec @@ -1,7 +1,7 @@ Summary: High-performance HTTP accelerator Name: varnish Version: 2.0.6 -Release: 2.1%{?dist} +Release: 2.2%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.varnish-cache.org/ @@ -254,7 +254,7 @@ fi %postun libs -p /sbin/ldconfig %changelog -* Wed Dec 23 2009 Ingvar Hagelund - 2.0.6-2.1 +* Wed Dec 23 2009 Ingvar Hagelund - 2.0.6-2.2 - Added a test that enables jemalloc on ppc if the kernel is not a rhel5 kernel (as on redhat builders) - Removed tests c00031.vtc and r00387on rhel4/ppc as they fail From 5aaf1a053600ef727aaa42286c3766738c043307 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:27:15 +0000 Subject: [PATCH 08/10] Initialize branch EL-6 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..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From e80274523cdde7f7b6a930f13c1c761f1ec3214a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:54:03 +0000 Subject: [PATCH 09/10] 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 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 From 2e84a8401315501e64369104fdef8fa5566b9ad8 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Tue, 24 Aug 2010 15:39:45 +0200 Subject: [PATCH 10/10] Updated el6 branch to the 2.1.x series. --- .gitignore | 2 + sources | 2 +- varnish.ppc64_stacksize_test.patch | 11 +++++ varnish.s390_pagesize.patch | 15 ++++++ varnish.spec | 78 ++++++++++++++++++++++-------- 5 files changed, 87 insertions(+), 21 deletions(-) create mode 100644 varnish.ppc64_stacksize_test.patch create mode 100644 varnish.s390_pagesize.patch diff --git a/.gitignore b/.gitignore index 72c39af..4512e76 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ varnish-2.0.6.tar.gz +varnish-2.1.3.tar.gz +/varnish-2.1.3.tar.gz diff --git a/sources b/sources index 57e2edc..5b1ebb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d91dc21c636db61c69b5e8f061c5bb95 varnish-2.0.6.tar.gz +357d99a760de173d841ac37bf2052be8 varnish-2.1.3.tar.gz diff --git a/varnish.ppc64_stacksize_test.patch b/varnish.ppc64_stacksize_test.patch new file mode 100644 index 0000000..1f671b8 --- /dev/null +++ b/varnish.ppc64_stacksize_test.patch @@ -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 "/" 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 811341c..c175845 100644 --- a/varnish.spec +++ b/varnish.spec @@ -1,23 +1,24 @@ Summary: High-performance HTTP accelerator Name: varnish -Version: 2.0.6 -Release: 2.2%{?dist} +Version: 2.1.3 +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.changes-2.0.6.patch +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 #BuildRequires: automake autoconf libtool -BuildRequires: ncurses-devel libxslt groff +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 @@ -65,13 +66,17 @@ Varnish is a high-performance HTTP accelerator %setup -q #%setup -q -n varnish-cache +%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 -%patch0 -%patch1 - # Hack to get 32- and 64-bits tests run concurrently on the same build machine case `uname -m` in ppc64 | s390x | x86_64 | sparc64 ) @@ -92,13 +97,18 @@ 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 :-( +# 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 @@ -129,11 +139,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 +243,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,7 +260,39 @@ fi %postun libs -p /sbin/ldconfig %changelog -* Wed Dec 23 2009 Ingvar Hagelund - 2.0.6-2.2 +* Tue Aug 24 2010 Ingvar Hagelund - 2.1.3-2 +- Added a RHEL6/ppc64 specific patch for that changes the hard coded + stack size in tests/c00031.vtc + +* 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 + +* 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 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 +- 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) - Removed tests c00031.vtc and r00387on rhel4/ppc as they fail