packages: varnish/varnish.init, varnish/varnish.spec, varnish/varnish.sysco...

glen glen at pld-linux.org
Wed Jan 4 17:28:42 CET 2012 

Author: glen                         Date: Wed Jan  4 16:28:42 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.0.2, 2.1.x in VARNISH_2_1 branch

---- Files affected:
packages/varnish:
   varnish.init (1.20 -> 1.21) , varnish.spec (1.66 -> 1.67) , varnish.sysconfig (1.9 -> 1.10) , no-ccache.patch (NONE -> 1.1)  (NEW), varnish-build.patch (1.4 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/varnish/varnish.init
diff -u packages/varnish/varnish.init:1.20 packages/varnish/varnish.init:1.21
--- packages/varnish/varnish.init:1.20	Fri Sep 17 16:08:08 2010
+++ packages/varnish/varnish.init	Wed Jan  4 17:28:36 2012
@@ -120,8 +120,6 @@
 	# default limits
 	SERVICE_LIMITS="${SERVICE_LIMIS:--n $NFILES -l $MEMLOCK}"
 
-	# DAEMON_OPTS is used by the init script. If you add or remove options, make
-	# sure you update this section, too.
 	DAEMON_OPTS="
 		-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT}
 		-f ${VARNISH_VCL_CONF}
@@ -130,6 +128,7 @@
 		-u ${VARNISH_USER} -g ${VARNISH_GROUP}
 		-w ${VARNISH_MIN_THREADS},${VARNISH_MAX_THREADS},${VARNISH_THREAD_TIMEOUT}
 		-n ${VARNISH_NAME}
+		${VARNISH_SECRET_FILE:+-S ${VARNISH_SECRET_FILE}}
 		-s ${VARNISH_STORAGE}
 		-P ${PIDFILE}
 	"

================================================================
Index: packages/varnish/varnish.spec
diff -u packages/varnish/varnish.spec:1.66 packages/varnish/varnish.spec:1.67
--- packages/varnish/varnish.spec:1.66	Tue Jan  3 19:18:16 2012
+++ packages/varnish/varnish.spec	Wed Jan  4 17:28:36 2012
@@ -2,6 +2,7 @@
 # TODO
 # - make tests use secure dir, not /tmp, see varnish-2.0.6/bin/varnishtest
 # - hungs ac builders: tests/a00009.vtc
+# -S support
 
 # Conditional build:
 %bcond_without	doc		# build documentation
@@ -10,12 +11,12 @@
 Summary:	Varnish - a high-performance HTTP accelerator
 Summary(pl.UTF-8):	Varnish - wydajny akcelerator HTTP
 Name:		varnish
-Version:	2.1.5
-Release:	2
+Version:	3.0.2
+Release:	1.1
 License:	BSD
 Group:		Networking/Daemons/HTTP
 Source0:	http://repo.varnish-cache.org/source/%{name}-%{version}.tar.gz
-# Source0-md5:	2d2f227da36a2a240c475304c717b8e3
+# Source0-md5:	c8eae0aabbe66b6daabdf3a1f58cd47a
 Source1:	%{name}.init
 Source3:	%{name}ncsa.init
 Source4:	%{name}.sysconfig
@@ -23,7 +24,7 @@
 Source6:	%{name}.logrotate
 Source7:	%{name}.conf
 #Patch100:	branch.diff
-Patch0:		%{name}-build.patch
+Patch0:		no-ccache.patch
 URL:		http://www.varnish-cache.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -107,7 +108,7 @@
 
 %build
 export CPPFLAGS="-I/usr/include/ncurses"
-%{__aclocal}
+%{__aclocal} -I m4
 %{__libtoolize}
 %{__autoheader}
 %{__automake}
@@ -144,6 +145,9 @@
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/logrotate.d/varnish
 cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.vcl
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/vmods/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -194,6 +198,13 @@
 %attr(755,root,root) %{_bindir}/varnishstat
 %attr(755,root,root) %{_bindir}/varnishtest
 %attr(755,root,root) %{_bindir}/varnishtop
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/libvarnish.so
+%attr(755,root,root) %{_libdir}/%{name}/libvarnishcompat.so
+%attr(755,root,root) %{_libdir}/%{name}/libvcl.so
+%attr(755,root,root) %{_libdir}/%{name}/libvgz.so
+%dir %{_libdir}/%{name}/vmods
+%attr(755,root,root) %{_libdir}/%{name}/vmods/libvmod_std.so
 %{_mandir}/man1/varnishadm.1*
 %{_mandir}/man1/varnishd.1*
 %{_mandir}/man1/varnishhist.1*
@@ -204,6 +215,9 @@
 %{_mandir}/man1/varnishstat.1*
 %{_mandir}/man1/varnishtest.1*
 %{_mandir}/man1/varnishtop.1*
+%{_mandir}/man3/vmod_std.3*
+%{_mandir}/man7/varnish-cli.7*
+%{_mandir}/man7/varnish-counters.7*
 %{_mandir}/man7/vcl.7*
 %dir /var/lib/varnish
 %dir /var/run/varnish
@@ -213,34 +227,24 @@
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvarnish.so.*.*.*
-%ghost %{_libdir}/libvarnish.so.1
 %attr(755,root,root) %{_libdir}/libvarnishapi.so.*.*.*
 %ghost %{_libdir}/libvarnishapi.so.1
-%attr(755,root,root) %{_libdir}/libvarnishcompat.so.*.*.*
-%ghost %{_libdir}/libvarnishcompat.so.1
-%attr(755,root,root) %{_libdir}/libvcl.so.*.*.*
-%ghost %{_libdir}/libvcl.so.1
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/varnish
-%{_libdir}/libvarnish.la
-%{_libdir}/libvarnish.so
 %{_libdir}/libvarnishapi.la
 %{_libdir}/libvarnishapi.so
-%{_libdir}/libvarnishcompat.la
-%{_libdir}/libvarnishcompat.so
-%{_libdir}/libvcl.la
-%{_libdir}/libvcl.so
 %{_pkgconfigdir}/varnishapi.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libvarnish.a
 %{_libdir}/libvarnishapi.a
-%{_libdir}/libvarnishcompat.a
-%{_libdir}/libvcl.a
+%{_libdir}/%{name}/libvarnish.a
+%{_libdir}/%{name}/libvarnishcompat.a
+%{_libdir}/%{name}/libvcl.a
+%{_libdir}/%{name}/libvgz.a
+%{_libdir}/%{name}/vmods/libvmod_std.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -248,6 +252,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2012/01/04 16:28:36  glen
+- up to 3.0.2, 2.1.x in VARNISH_2_1 branch
+
 Revision 1.66  2012/01/03 18:18:16  lisu
 - rel 2
 

================================================================
Index: packages/varnish/varnish.sysconfig
diff -u packages/varnish/varnish.sysconfig:1.9 packages/varnish/varnish.sysconfig:1.10
--- packages/varnish/varnish.sysconfig:1.9	Fri Nov 20 13:29:57 2009
+++ packages/varnish/varnish.sysconfig	Wed Jan  4 17:28:36 2012
@@ -8,6 +8,7 @@
 # Maximum locked memory size (for ulimit -l)
 # Used for locking the shared memory log in memory.  If you increase log size,
 # you need to increase this number as well
+# Default log size is 82MB + header
 MEMLOCK=82000
 
 # Main configuration file. You probably want to change it :)
@@ -34,6 +35,9 @@
 # Telnet admin interface listen address and port
 VARNISH_ADMIN_LISTEN_ADDRESS=127.0.0.1
 VARNISH_ADMIN_LISTEN_PORT=6082
+
+# Shared secret file for admin interface. Disable to use none.
+VARNISH_SECRET_FILE=/etc/varnish/secret
 
 # The minimum number of worker threads to start
 VARNISH_MIN_THREADS=1

================================================================
Index: packages/varnish/no-ccache.patch
diff -u /dev/null packages/varnish/no-ccache.patch:1.1
--- /dev/null	Wed Jan  4 17:28:42 2012
+++ packages/varnish/no-ccache.patch	Wed Jan  4 17:28:36 2012
@@ -0,0 +1,11 @@
+--- varnish-3.0.2/configure.ac~	2011-10-24 10:25:13.000000000 +0300
++++ varnish-3.0.2/configure.ac	2011-10-30 11:45:58.270940488 +0200
+@@ -540,6 +540,8 @@
+ if test "$ac_cv_env_VCC_CC_set" = "set"; then
+ 	VCC_CC="$ac_cv_env_VCC_CC_value"
+ else
++	# cleanup "ccache" from compiler as we don't want end user varnish to use ccache if we used one at compile time
++	PTHREAD_CC=${PTHREAD_CC#ccache }
+ 	case $target in
+ 	*-*-solaris*)
+ 		case $PTHREAD_CC in
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/varnish.init?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/varnish.spec?r1=1.66&r2=1.67&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/varnish.sysconfig?r1=1.9&r2=1.10&f=u

More information about the pld-cvs-commit mailing list