r4664 - trunk/varnish-cache/redhat

[ingvar at varnish-cache.org]

Author: ingvar
Date: 2010-04-15 16:04:11 +0200 (Thu, 15 Apr 2010)
New Revision: 4664

Modified:
   trunk/varnish-cache/redhat/varnish.spec
   trunk/varnish-cache/redhat/varnish.sysconfig
Log:
Added the -S option as default in the redhat package

Modified: trunk/varnish-cache/redhat/varnish.spec
===================================================================
--- trunk/varnish-cache/redhat/varnish.spec	2010-04-15 12:01:56 UTC (rev 4663)
+++ trunk/varnish-cache/redhat/varnish.spec	2010-04-15 14:04:11 UTC (rev 4664)
@@ -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: trunk/varnish-cache/redhat/varnish.sysconfig
===================================================================
--- trunk/varnish-cache/redhat/varnish.sysconfig	2010-04-15 12:01:56 UTC (rev 4663)
+++ trunk/varnish-cache/redhat/varnish.sysconfig	2010-04-15 14:04:11 UTC (rev 4664)
@@ -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"