r4692 - in branches/2.1: . varnish-cache/bin/varnishd varnish-cache/bin/varnishtest/tests varnish-cache/include varnish-cache/lib/libvarnish varnish-cache/lib/libvcl varnish-cache/redhat
tfheen at varnish-cache.org
tfheen at varnish-cache.org
Mon Apr 19 14:30:23 CEST 2010
Author: tfheen
Date: 2010-04-19 14:30:23 +0200 (Mon, 19 Apr 2010)
New Revision: 4692
Modified:
branches/2.1/
branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
branches/2.1/varnish-cache/bin/varnishd/vparam.h
branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
branches/2.1/varnish-cache/include/vct.h
branches/2.1/varnish-cache/include/vev.h
branches/2.1/varnish-cache/lib/libvarnish/tcp.c
branches/2.1/varnish-cache/lib/libvarnish/vev.c
branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
branches/2.1/varnish-cache/redhat/varnish.spec
branches/2.1/varnish-cache/redhat/varnish.sysconfig
Log:
Merge r4664: Added the -S option as default in the redhat package
Property changes on: branches/2.1
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:4637,4640,4643-4645,4647-4650,4654-4663
+ /trunk:4637,4640,4643-4645,4647-4650,4654-4664
Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643-4645,4647-4650,4654-4663
+ /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643-4645,4647-4650,4654-4664
Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643-4645,4647-4650,4654-4663
+ /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643-4645,4647-4650,4654-4664
Property changes on: branches/2.1/varnish-cache/bin/varnishd/vparam.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643-4645,4647-4650,4654-4663
+ /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643-4645,4647-4650,4654-4664
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643-4645,4647-4650,4654-4663
+ /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643-4645,4647-4650,4654-4664
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643-4645,4647-4650,4654-4663
+ /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643-4645,4647-4650,4654-4664
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643-4645,4647-4650,4654-4663
+ /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643-4645,4647-4650,4654-4664
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643-4645,4647-4650,4654-4663
+ /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643-4645,4647-4650,4654-4664
Property changes on: branches/2.1/varnish-cache/include/vct.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/include/vct.h:4637,4643-4645,4647-4650,4654-4663
+ /trunk/varnish-cache/include/vct.h:4637,4643-4645,4647-4650,4654-4664
Property changes on: branches/2.1/varnish-cache/include/vev.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/include/vev.h:4637,4643-4645,4647-4650,4654-4663
+ /trunk/varnish-cache/include/vev.h:4637,4643-4645,4647-4650,4654-4664
Property changes on: branches/2.1/varnish-cache/lib/libvarnish/tcp.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643-4645,4647-4650,4654-4663
+ /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643-4645,4647-4650,4654-4664
Property changes on: branches/2.1/varnish-cache/lib/libvarnish/vev.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643-4645,4647-4650,4654-4663
+ /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643-4645,4647-4650,4654-4664
Property changes on: branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643-4645,4647-4650,4654-4663
+ /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643-4645,4647-4650,4654-4664
Modified: branches/2.1/varnish-cache/redhat/varnish.spec
===================================================================
--- branches/2.1/varnish-cache/redhat/varnish.spec 2010-04-19 12:14:47 UTC (rev 4691)
+++ branches/2.1/varnish-cache/redhat/varnish.spec 2010-04-19 12:30:23 UTC (rev 4692)
@@ -1,22 +1,22 @@
Summary: High-performance HTTP accelerator
Name: varnish
-Version: 2.0.7
-Release: 0.1svn20100201r4527%{?dist}
+Version: 2.1.1
+Release: 0.svn20100415%{?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
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: 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
@@ -61,15 +61,13 @@
#Varnish is a high-performance HTTP accelerator
%prep
-%setup -q
-#%setup -q -n varnish-cache
+#%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
+./autogen.sh
-#%patch0
-
# Hack to get 32- and 64-bits tests run concurrently on the same build machine
case `uname -m` in
ppc64 | s390x | x86_64 | sparc64 )
@@ -101,6 +99,11 @@
%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;
@@ -144,9 +147,6 @@
%endif
%endif
-# p class checks are still unstable
-rm bin/varnishtest/tests/p*.vtc
-
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"
@@ -234,6 +234,7 @@
/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
@@ -250,10 +251,19 @@
%postun libs -p /sbin/ldconfig
%changelog
-* Mon Jan 25 2010 Ingvar Hagelund <ingvar at linpro.no> - 2.0.7-0.1
-- changes-2.0.6.html works now, so remove fix
-- Added pcre-devel and pkgconfig to the build requirements
+* Wed Apr 14 2010 Ingvar Hagelund <ingvar at linpro.no> - 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 <ingvar at linpro.no> - 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 <ingvar at linpro.no> - 2.0.6-2
- Added a test that enables jemalloc on ppc if the kernel is
not a rhel5 kernel (as on redhat builders)
Modified: branches/2.1/varnish-cache/redhat/varnish.sysconfig
===================================================================
--- branches/2.1/varnish-cache/redhat/varnish.sysconfig 2010-04-19 12:14:47 UTC (rev 4691)
+++ branches/2.1/varnish-cache/redhat/varnish.sysconfig 2010-04-19 12:30:23 UTC (rev 4692)
@@ -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"
More information about the varnish-commit
mailing list