From des at projects.linpro.no Thu Nov 2 12:57:11 2006 From: des at projects.linpro.no (des at projects.linpro.no) Date: Thu, 2 Nov 2006 13:57:11 +0100 (CET) Subject: r1208 - in trunk/varnish-cache: include/compat lib/libcompat Message-ID: <20061102125711.69FF51EC35F@projects.linpro.no> Author: des Date: 2006-11-02 13:57:11 +0100 (Thu, 02 Nov 2006) New Revision: 1208 Modified: trunk/varnish-cache/include/compat/vis.h trunk/varnish-cache/lib/libcompat/vis.c Log: As per ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change, remove the so-called advertising clause from these files' license, making it compatible with the Debian Free Software Guidelines. As these files were obtained from FreeBSD, this change was discussed with and approved by the FreeBSD core team. Modified: trunk/varnish-cache/include/compat/vis.h =================================================================== --- trunk/varnish-cache/include/compat/vis.h 2006-10-23 12:21:17 UTC (rev 1207) +++ trunk/varnish-cache/include/compat/vis.h 2006-11-02 12:57:11 UTC (rev 1208) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: trunk/varnish-cache/lib/libcompat/vis.c =================================================================== --- trunk/varnish-cache/lib/libcompat/vis.c 2006-10-23 12:21:17 UTC (rev 1207) +++ trunk/varnish-cache/lib/libcompat/vis.c 2006-11-02 12:57:11 UTC (rev 1208) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * From des at projects.linpro.no Thu Nov 2 12:57:50 2006 From: des at projects.linpro.no (des at projects.linpro.no) Date: Thu, 2 Nov 2006 13:57:50 +0100 (CET) Subject: r1209 - in branches/1.0: . redhat Message-ID: <20061102125750.EB02D1EC97B@projects.linpro.no> Author: des Date: 2006-11-02 13:57:50 +0100 (Thu, 02 Nov 2006) New Revision: 1209 Added: branches/1.0/redhat/ branches/1.0/redhat/README.redhat branches/1.0/redhat/TODO branches/1.0/redhat/varnish.initrc branches/1.0/redhat/varnish.spec branches/1.0/redhat/varnish.sysconfig Modified: branches/1.0/ Log: r33286 at cat (orig r1202): ingvar | 2006-10-19 14:43:29 +0200 Added build scripts for Red Hat rpm package Property changes on: branches/1.0 ___________________________________________________________________ Name: svk:merge - d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1198 + d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1202 Added: branches/1.0/redhat/README.redhat =================================================================== --- branches/1.0/redhat/README.redhat 2006-11-02 12:57:11 UTC (rev 1208) +++ branches/1.0/redhat/README.redhat 2006-11-02 12:57:50 UTC (rev 1209) @@ -0,0 +1,46 @@ +GCC +=== +Varnish requires a GCC-compiler compatible with the compiler used to +build varnish with. This means GCC 3.4.6 on a standard RHEL4 system. + +Varnish should work fine with GCC 3.3 and above. + + +Configuration of addresses and ports +==================================== +In this package, varnish is configured to make the accelerator daemon +listen to port 6081. The administration interface listens to port 6082 +on 127.0.0.1. Addresses and ports can be changed in +/etc/sysconfig/varnish. + +The admin interface can be accessed by standard telnet. + +The default config will try to forward http requests to +localhost:80. You may change this in /etc/varnish/vcl.conf. Please +read the vcl(7) man page for more information on the vcl language. + +To gain actual value from varnish, you may want to move the listening +port to port 80, and your webserver to 8080 or similar. + + +Builing a RPM package from SVN +=============================== +You may build the package from a svn checkout. Follow the instructions +at http://varnish.projects.linpro.no/wiki/Repository to get the +source. Then enter the trunk directory and edit +varnish-cache/redhat/varnish.spec. At least bump the version and/or +release numbers. Then use something like this to build the rpm package: + +#!/bin/bash +VERSION=$( awk ' /^Version:/ { print $2 } ' varnish-cache/redhat/varnish.spec ) +ln -s varnish-cache varnish-$VERSION +tar $( + find varnish-$VERSION/ -type d -name .svn | \ + while read i; do + echo -n "--exclude $i " + done +) -cvzf varnish-$VERSION.tar.gz varnish-$VERSION/* +rm varnish-$VERSION +rpmbuild -tb varnish-$VERSION.tar.gz + + Added: branches/1.0/redhat/TODO =================================================================== --- branches/1.0/redhat/TODO 2006-11-02 12:57:11 UTC (rev 1208) +++ branches/1.0/redhat/TODO 2006-11-02 12:57:50 UTC (rev 1209) @@ -0,0 +1,5 @@ +Todolist for the rpm package + +* Perhaps add a default logger, adding Common Logfile Format logs +* Add the package to Fedora Extras + Added: branches/1.0/redhat/varnish.initrc =================================================================== --- branches/1.0/redhat/varnish.initrc 2006-11-02 12:57:11 UTC (rev 1208) +++ branches/1.0/redhat/varnish.initrc 2006-11-02 12:57:50 UTC (rev 1209) @@ -0,0 +1,74 @@ +#! /bin/sh +# +# varnish Control the varnish HTTP accelerator +# +# chkconfig: - 90 10 +# description: HTTP accelerator +# processname: varnishd +# config: /etc/varnish.conf +# pidfile: /var/run/varnish/varnishd.pid + +# Source function library. +. /etc/init.d/functions + +RETVAL=0 +PROCNAME=varnishd + +. /etc/sysconfig/varnish +if [ "$DAEMON" = "" ]; then DAEMON="/usr/sbin/varnishd"; fi +DAEMON_OPTS="-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT} \ + -h ${VARNISH_HASHOPTION} \ + -f ${VARNISH_VCL_CONF} \ + -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \ + -t ${VARNISH_TTL} \ + -w ${VARNISH_MIN_WORKER_THREADS},${VARNISH_MAX_WORKER_THREADS},${VARNISH_WORKER_THREAD_TIMEOUT} \ + -s ${VARNISH_BACKEND_STORAGE}" + + +mkdir -p /var/run/varnish 2>/dev/null + +# See how we were called. +case "$1" in + start) + echo -n "Starting varnish HTTP accelerator: " + daemon $DAEMON "$DAEMON_OPTS" + sleep 1 + pkill -0 $PROCNAME + RETVAL=$? + if [ $RETVAL -eq 0 ] + then + echo_success + touch /var/lock/subsys/varnishd + else + echo_failure + fi + echo + ;; + stop) + echo -n "Stopping varnish HTTP accelerator: " + killproc $DAEMON + RETVAL=$? + if [ $RETVAL -eq 0 ] + then + echo_success + rm -f /var/lock/subsys/varnishd + else + echo_failure + fi + echo + ;; + status) + status $PROCNAME + RETVAL=$? + ;; + restart|reload) + $0 stop + $0 start + RETVAL=$? + ;; + *) + echo "Usage: $0 {start|stop|status|restart}" + exit 1 +esac + +exit $RETVAL Property changes on: branches/1.0/redhat/varnish.initrc ___________________________________________________________________ Name: svn:executable + * Added: branches/1.0/redhat/varnish.spec =================================================================== --- branches/1.0/redhat/varnish.spec 2006-11-02 12:57:11 UTC (rev 1208) +++ branches/1.0/redhat/varnish.spec 2006-11-02 12:57:50 UTC (rev 1209) @@ -0,0 +1,126 @@ +Summary: Varnish is a high-performance HTTP accelerator. +Name: varnish +Version: 1.0.2 +Release: 6 +License: BSD-like +Group: System Environment/Daemons +URL: http://www.varnish-cache.org/ +Packager: Ingvar Hagelund +Source0: %{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: gcc gcc-c++ ncurses-devel libtool autoconf automake +Requires: gcc ncurses kernel >= 2.6.0 + +%description +This is the Varnish high-performance HTTP accelerator. +Documentation and additional information about Varnish is available on +the following web sites: + http://www.varnish-cache.org/ Official web site + http://varnish.projects.linpro.no/ Developer site and wiki + +Technical questions about Varnish and this release should be addressed +to . + +Questions about commercial support and services related to Varnish +should be addressed to . + +Copyright (c) 2006 Verdens Gang AS +Copyright (c) 2006 Linpro AS +All rights reserved. +Author: Poul-Henning Kamp + +%prep +%setup -q + +%build +rm -rf $RPM_BUILD_ROOT + +./autogen.sh +%configure --sbindir=/usr/sbin +%{__make} + +sed -e ' s/8080/80/g ' etc/vcl.conf > redhat/vcl.conf + +%install +%{makeinstall} +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_docdir}/%{name}-%{version} +mkdir -p %{buildroot}/etc/varnish +mkdir -p %{buildroot}/etc/init.d +mkdir -p %{buildroot}/etc/sysconfig +mkdir -p %{buildroot}/var/lib/varnish + +%{__install} -m 0644 INSTALL %{buildroot}%{_docdir}/%{name}-%{version}/INSTALL +%{__install} -m 0644 LICENSE %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE +%{__install} -m 0644 README %{buildroot}%{_docdir}/%{name}-%{version}/README +%{__install} -m 0644 ChangeLog %{buildroot}%{_docdir}/%{name}-%{version}/ChangeLog +%{__install} -m 0644 redhat/README.redhat %{buildroot}%{_docdir}/%{name}-%{version}/README.redhat +%{__install} -m 0644 redhat/vcl.conf %{buildroot}%{_docdir}/%{name}-%{version}/vcl.example.conf +%{__install} -m 0644 redhat/vcl.conf %{buildroot}/etc/varnish/vcl.conf +%{__install} -m 0644 redhat/varnish.sysconfig %{buildroot}/etc/sysconfig/varnish +%{__install} -m 0755 redhat/varnish.initrc %{buildroot}/etc/init.d/varnish + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%{_sbindir}/varnishd +%{_bindir}/varnishhist +%{_bindir}/varnishlog +%{_bindir}/varnishncsa +%{_bindir}/varnishstat +%{_bindir}/varnishtop +%{_libdir}/libvarnish.a +%{_libdir}/libvarnish.la +%{_libdir}/libvarnish.so.0.0.0 +%{_libdir}/libvarnish.so.0 +%{_libdir}/libvarnishapi.a +%{_libdir}/libvarnishapi.la +%{_libdir}/libvarnishapi.so.0.0.0 +%{_libdir}/libvarnishapi.so.0 +%{_libdir}/libvcl.a +%{_libdir}/libvcl.la +%{_libdir}/libvcl.so.0.0.0 +%{_libdir}/libvcl.so.0 +%{_var}/lib/varnish +%{_mandir}/man1/varnishd.1.gz +%{_mandir}/man1/varnishhist.1.gz +%{_mandir}/man1/varnishlog.1.gz +%{_mandir}/man1/varnishncsa.1.gz +%{_mandir}/man1/varnishstat.1.gz +%{_mandir}/man1/varnishtop.1.gz +%{_mandir}/man7/vcl.7.gz + +%doc %{_docdir}/%{name}-%{version}/INSTALL +%doc %{_docdir}/%{name}-%{version}/LICENSE +%doc %{_docdir}/%{name}-%{version}/README +%doc %{_docdir}/%{name}-%{version}/README.redhat +%doc %{_docdir}/%{name}-%{version}/ChangeLog +%doc %{_docdir}/%{name}-%{version}/vcl.example.conf +%config(noreplace) /etc/varnish/vcl.conf +%config /etc/init.d/varnish +%config /etc/sysconfig/varnish + +%post +/sbin/chkconfig --add varnish +/sbin/chkconfig --list varnish + +%changelog +* Thu Oct 19 2006 Ingvar Hagelund - 1.02-1 +- Added redhat subdir to svn +- Removed default vcl config file. Used the new upstream variant instead. +- Based build on svn. Running autogen.sh as start of build. Also added + libtool, autoconf and automake to BuildRequires. +- Removed rule to move varnishd to sbin. This is now fixed in upstream +- Changed the sysconfig script to include a lot more nice features. + Most of these were ripped from the Debian package. Updated initscript + to reflect this. +* Tue Oct 10 2006 Ingvar Hagelund - 1.01-3 +- Moved Red Hat specific files to its own subdirectory +* Tue Sep 26 2006 Ingvar Hagelund - 1.0.1-2 +- Added gcc requirement. +- Changed to an even simpler example vcl in to /etc/varnish (thanks, perbu) +- Added a sysconfig entry +* Fri Sep 22 2006 Ingvar Hagelund - 1.0.1-1 +- Initial build. Added: branches/1.0/redhat/varnish.sysconfig =================================================================== --- branches/1.0/redhat/varnish.sysconfig 2006-11-02 12:57:11 UTC (rev 1208) +++ branches/1.0/redhat/varnish.sysconfig 2006-11-02 12:57:50 UTC (rev 1209) @@ -0,0 +1,51 @@ +# +# Default variables for varnish +# + +# The main daemon binary +VARNISHD=/usr/sbin/varnish + +# VCL Configuration file. This is the "main configuration file" +VARNISH_VCL_CONF=/etc/varnish/vcl.conf + + +# Default address and port to bind to. +# To make varnish accept normal http traffic, +# change the listen port to 80 +VARNISH_LISTEN_ADDRESS=0.0.0.0 +VARNISH_LISTEN_PORT=6081 + + +# Telnet admin interface listen address and port +VARNISH_ADMIN_LISTEN_ADDRESS=127.0.0.1 +VARNISH_ADMIN_LISTEN_PORT=6082 + + +# The minimum number of threads to start +VARNISH_MIN_WORKER_THREADS=1 + + +# Maximum number of worker threads or INF for unlimited +VARNISH_MAX_WORKER_THREADS=INF + + +# Timeout value in seconds for threads to return +VARNISH_WORKER_THREAD_TIMEOUT=10 + + +# Hash algorithm to be used +VARNISH_HASHOPTION=classic + + +# Maximum size of the backend storagefile in bytes +VARNISH_BACKEND_STORAGE_SIZE=10240000 +VARNISH_BACKEND_STORAGE_FILE=/var/lib/varnish/varnish_storage.bin + + +# Backend storage specification +VARNISH_BACKEND_STORAGE="file,${VARNISH_BACKEND_STORAGE_FILE},${VARNISH_BACKEND_STORAGE_SIZE}" + + +# Set default ttl in secounds +VARNISH_TTL=120 + From des at projects.linpro.no Thu Nov 2 12:57:52 2006 From: des at projects.linpro.no (des at projects.linpro.no) Date: Thu, 2 Nov 2006 13:57:52 +0100 (CET) Subject: r1210 - in branches/1.0: . redhat Message-ID: <20061102125752.1ECCA1EC99D@projects.linpro.no> Author: des Date: 2006-11-02 13:57:52 +0100 (Thu, 02 Nov 2006) New Revision: 1210 Modified: branches/1.0/ branches/1.0/redhat/varnish.spec Log: r33287 at cat (orig r1203): ingvar | 2006-10-19 14:55:20 +0200 Added a vendor tag to the rpm package. Property changes on: branches/1.0 ___________________________________________________________________ Name: svk:merge - d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1202 + d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1203 Modified: branches/1.0/redhat/varnish.spec =================================================================== --- branches/1.0/redhat/varnish.spec 2006-11-02 12:57:50 UTC (rev 1209) +++ branches/1.0/redhat/varnish.spec 2006-11-02 12:57:52 UTC (rev 1210) @@ -1,7 +1,7 @@ Summary: Varnish is a high-performance HTTP accelerator. Name: varnish Version: 1.0.2 -Release: 6 +Release: 7 License: BSD-like Group: System Environment/Daemons URL: http://www.varnish-cache.org/ @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gcc gcc-c++ ncurses-devel libtool autoconf automake Requires: gcc ncurses kernel >= 2.6.0 +Vendor: Linpro AS, http://www.linpro.no/ %description This is the Varnish high-performance HTTP accelerator. @@ -107,7 +108,9 @@ /sbin/chkconfig --list varnish %changelog -* Thu Oct 19 2006 Ingvar Hagelund - 1.02-1 +* Thu Oct 19 2006 Ingvar Hagelund - 1.02-7 +- Added a Vendor tag +* Thu Oct 19 2006 Ingvar Hagelund - 1.02-6 - Added redhat subdir to svn - Removed default vcl config file. Used the new upstream variant instead. - Based build on svn. Running autogen.sh as start of build. Also added From des at projects.linpro.no Thu Nov 2 12:57:53 2006 From: des at projects.linpro.no (des at projects.linpro.no) Date: Thu, 2 Nov 2006 13:57:53 +0100 (CET) Subject: r1211 - in branches/1.0: . debian Message-ID: <20061102125753.29F951EC99D@projects.linpro.no> Author: des Date: 2006-11-02 13:57:53 +0100 (Thu, 02 Nov 2006) New Revision: 1211 Modified: branches/1.0/ branches/1.0/debian/control Log: r33288 at cat (orig r1204): bahner | 2006-10-19 15:44:27 +0200 Reverted accidental reversion of dependencies Property changes on: branches/1.0 ___________________________________________________________________ Name: svk:merge - d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1203 + d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1204 Modified: branches/1.0/debian/control =================================================================== --- branches/1.0/debian/control 2006-11-02 12:57:52 UTC (rev 1210) +++ branches/1.0/debian/control 2006-11-02 12:57:53 UTC (rev 1211) @@ -3,14 +3,14 @@ Priority: optional Maintainer: Stig Sandbeck Mathiesen Uploaders: Lars Bahner -Build-Depends: debhelper (>= 5), autotools-dev, automake1.9, libtool, autoconf, gcc (>= 4.1) +Build-Depends: debhelper (>= 5), autotools-dev, automake1.9, libtool, autoconf, libncurses-dev Standards-Version: 3.7.2 Package: varnish Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, gcc ( >= 3.3) Description: A state-of-the-art, high-performance HTTP accelerator - Varnish is the server-side alternative to Squid, written primarily with + varnish is the server-side alternative to Squid, written primarily with speed in mind, and with a look to implementing full ESI-support in a future release. . From des at projects.linpro.no Thu Nov 2 12:57:54 2006 From: des at projects.linpro.no (des at projects.linpro.no) Date: Thu, 2 Nov 2006 13:57:54 +0100 (CET) Subject: r1212 - in branches/1.0: . debian Message-ID: <20061102125754.292181EC9A0@projects.linpro.no> Author: des Date: 2006-11-02 13:57:54 +0100 (Thu, 02 Nov 2006) New Revision: 1212 Modified: branches/1.0/ branches/1.0/debian/changelog branches/1.0/debian/copyright Log: r33289 at cat (orig r1205): bahner | 2006-10-19 15:55:12 +0200 Bumped version to 1.0.2 proper Added wording regarding the origination of the source of varnish with relation to debian. Property changes on: branches/1.0 ___________________________________________________________________ Name: svk:merge - d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1204 + d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1205 Modified: branches/1.0/debian/changelog =================================================================== --- branches/1.0/debian/changelog 2006-11-02 12:57:53 UTC (rev 1211) +++ branches/1.0/debian/changelog 2006-11-02 12:57:54 UTC (rev 1212) @@ -1,3 +1,9 @@ +varnish (1.0.2-1) unstable; urgency=low + + * New upstream release + + -- Lars Bahner Thu, 19 Oct 2006 15:51:37 +0200 + varnish (1.0.2-1~svn20061012) unstable; urgency=low * Added README for Debian Modified: branches/1.0/debian/copyright =================================================================== --- branches/1.0/debian/copyright 2006-11-02 12:57:53 UTC (rev 1211) +++ branches/1.0/debian/copyright 2006-11-02 12:57:54 UTC (rev 1212) @@ -4,6 +4,13 @@ It was pulled from the Subversion repository with svn co http://varnish.projects.linpro.no/svn/trunk +Debianizations are an integral part of the main source for varnish, +so the change for Debian are made before publication of releases, +and are as such checked. + +Files are downloadable from the following URL +http://sourceforge.net/project/showfiles.php?group_id=155816 + Copyright: 2006 Verdens Gang AS 2006 Linpro AS All rights reserved. From des at projects.linpro.no Thu Nov 2 12:57:55 2006 From: des at projects.linpro.no (des at projects.linpro.no) Date: Thu, 2 Nov 2006 13:57:55 +0100 (CET) Subject: r1213 - in branches/1.0: . debian Message-ID: <20061102125755.280DA1EC2AF@projects.linpro.no> Author: des Date: 2006-11-02 13:57:55 +0100 (Thu, 02 Nov 2006) New Revision: 1213 Modified: branches/1.0/ branches/1.0/debian/TODO branches/1.0/debian/varnish.init Log: r33290 at cat (orig r1206): bahner | 2006-10-23 14:12:07 +0200 Preliminary LSB compliance in init-scripts Property changes on: branches/1.0 ___________________________________________________________________ Name: svk:merge - d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1205 + d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1206 Modified: branches/1.0/debian/TODO =================================================================== --- branches/1.0/debian/TODO 2006-11-02 12:57:54 UTC (rev 1212) +++ branches/1.0/debian/TODO 2006-11-02 12:57:55 UTC (rev 1213) @@ -1,2 +1,3 @@ - Write helper script to create storage_file from defaults - possibly setup default logging +- get the 4. (advertising) clause BSD license removed from the source, if possible Modified: branches/1.0/debian/varnish.init =================================================================== --- branches/1.0/debian/varnish.init 2006-11-02 12:57:54 UTC (rev 1212) +++ branches/1.0/debian/varnish.init 2006-11-02 12:57:55 UTC (rev 1213) @@ -10,6 +10,21 @@ # Version: @(#)skeleton 1.9 26-Feb-2001 miquels at cistron.nl # +### BEGIN INIT INFO +# Provides: varnish +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Should-Start: $remote_fs +# Should-Stop: $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start HTTPd accelerator +# Description: This script provides a server-side cache +# to be run in front of a httpd and should +# listen on port 80 on a properly configured +# system +### END INIT INFO + NAME=varnish DESC="HTTPd accelerator" PATH=/sbin:/bin:/usr/sbin:/usr/bin From des at projects.linpro.no Thu Nov 2 12:57:56 2006 From: des at projects.linpro.no (des at projects.linpro.no) Date: Thu, 2 Nov 2006 13:57:56 +0100 (CET) Subject: r1214 - in branches/1.0: . debian Message-ID: <20061102125756.2B9961EC9A7@projects.linpro.no> Author: des Date: 2006-11-02 13:57:56 +0100 (Thu, 02 Nov 2006) New Revision: 1214 Modified: branches/1.0/ branches/1.0/debian/changelog branches/1.0/debian/dirs branches/1.0/debian/rules Log: r33291 at cat (orig r1207): bahner | 2006-10-23 14:21:17 +0200 Lintian overrides for debian-acceptance Property changes on: branches/1.0 ___________________________________________________________________ Name: svk:merge - d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1206 + d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1207 Modified: branches/1.0/debian/changelog =================================================================== --- branches/1.0/debian/changelog 2006-11-02 12:57:55 UTC (rev 1213) +++ branches/1.0/debian/changelog 2006-11-02 12:57:56 UTC (rev 1214) @@ -1,3 +1,10 @@ +varnish (1.0.2-2) unstable; urgency=low + + * Preliminary LSB compliabnce in init-script + * Lintian override + + -- Lars Bahner Mon, 23 Oct 2006 14:20:22 +0200 + varnish (1.0.2-1) unstable; urgency=low * New upstream release Modified: branches/1.0/debian/dirs =================================================================== --- branches/1.0/debian/dirs 2006-11-02 12:57:55 UTC (rev 1213) +++ branches/1.0/debian/dirs 2006-11-02 12:57:56 UTC (rev 1214) @@ -4,3 +4,4 @@ usr/sbin var/log var/lib/varnish +usr/share/lintian/overrides/ Modified: branches/1.0/debian/rules =================================================================== --- branches/1.0/debian/rules 2006-11-02 12:57:55 UTC (rev 1213) +++ branches/1.0/debian/rules 2006-11-02 12:57:56 UTC (rev 1214) @@ -68,6 +68,7 @@ $(MAKE) install DESTDIR=$(CURDIR)/debian/varnish install -m 644 $(CURDIR)/debian/vcl.conf $(CURDIR)/debian/varnish/etc/varnish/ + install -m 644 $(CURDIR)/debian/lintian-override $(CURDIR)/debian/varnish/usr/share/lintian/overrides/varnish # Build architecture-independent files here. From des at projects.linpro.no Thu Nov 2 12:57:57 2006 From: des at projects.linpro.no (des at projects.linpro.no) Date: Thu, 2 Nov 2006 13:57:57 +0100 (CET) Subject: r1215 - in branches/1.0: . include/compat lib/libcompat Message-ID: <20061102125757.2EDD13BC067@projects.linpro.no> Author: des Date: 2006-11-02 13:57:57 +0100 (Thu, 02 Nov 2006) New Revision: 1215 Modified: branches/1.0/ branches/1.0/include/compat/vis.h branches/1.0/lib/libcompat/vis.c Log: r33651 at cat (orig r1208): des | 2006-11-02 13:57:11 +0100 As per ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change, remove the so-called advertising clause from these files' license, making it compatible with the Debian Free Software Guidelines. As these files were obtained from FreeBSD, this change was discussed with and approved by the FreeBSD core team. Property changes on: branches/1.0 ___________________________________________________________________ Name: svk:merge - d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1207 + d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1208 Modified: branches/1.0/include/compat/vis.h =================================================================== --- branches/1.0/include/compat/vis.h 2006-11-02 12:57:56 UTC (rev 1214) +++ branches/1.0/include/compat/vis.h 2006-11-02 12:57:57 UTC (rev 1215) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: branches/1.0/lib/libcompat/vis.c =================================================================== --- branches/1.0/lib/libcompat/vis.c 2006-11-02 12:57:56 UTC (rev 1214) +++ branches/1.0/lib/libcompat/vis.c 2006-11-02 12:57:57 UTC (rev 1215) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * From bahner at projects.linpro.no Fri Nov 3 09:37:47 2006 From: bahner at projects.linpro.no (bahner at projects.linpro.no) Date: Fri, 3 Nov 2006 10:37:47 +0100 (CET) Subject: r1216 - trunk/varnish-cache/debian Message-ID: <20061103093747.4F53A1EC9A0@projects.linpro.no> Author: bahner Date: 2006-11-03 10:37:47 +0100 (Fri, 03 Nov 2006) New Revision: 1216 Added: trunk/varnish-cache/debian/lintian-override Log: Adding lintian-overrides for debian acceptance Added: trunk/varnish-cache/debian/lintian-override =================================================================== --- trunk/varnish-cache/debian/lintian-override 2006-11-02 12:57:57 UTC (rev 1215) +++ trunk/varnish-cache/debian/lintian-override 2006-11-03 09:37:47 UTC (rev 1216) @@ -0,0 +1,4 @@ +varnish: non-dev-pkg-with-shlib-symlink usr/lib/libvarnish.so.0.0.0 usr/lib/libvarnish.so +varnish: non-dev-pkg-with-shlib-symlink usr/lib/libvarnishapi.so.0.0.0 usr/lib/libvarnishapi.so +varnish: non-dev-pkg-with-shlib-symlink usr/lib/libvcl.so.0.0.0 usr/lib/libvcl.so +varnish: package-name-doesnt-match-sonames libvarnishapi0 libvcl0 libvarnish0 From des at projects.linpro.no Mon Nov 6 12:07:09 2006 From: des at projects.linpro.no (des at projects.linpro.no) Date: Mon, 6 Nov 2006 13:07:09 +0100 (CET) Subject: r1217 - in branches/1.0: . debian Message-ID: <20061106120709.0A02A1EC97B@projects.linpro.no> Author: des Date: 2006-11-06 13:07:08 +0100 (Mon, 06 Nov 2006) New Revision: 1217 Added: branches/1.0/debian/lintian-override Modified: branches/1.0/ Log: r33659 at cat (orig r1216): bahner | 2006-11-03 10:37:47 +0100 Adding lintian-overrides for debian acceptance Property changes on: branches/1.0 ___________________________________________________________________ Name: svk:merge - d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1208 + d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1216 Added: branches/1.0/debian/lintian-override =================================================================== --- branches/1.0/debian/lintian-override 2006-11-03 09:37:47 UTC (rev 1216) +++ branches/1.0/debian/lintian-override 2006-11-06 12:07:08 UTC (rev 1217) @@ -0,0 +1,4 @@ +varnish: non-dev-pkg-with-shlib-symlink usr/lib/libvarnish.so.0.0.0 usr/lib/libvarnish.so +varnish: non-dev-pkg-with-shlib-symlink usr/lib/libvarnishapi.so.0.0.0 usr/lib/libvarnishapi.so +varnish: non-dev-pkg-with-shlib-symlink usr/lib/libvcl.so.0.0.0 usr/lib/libvcl.so +varnish: package-name-doesnt-match-sonames libvarnishapi0 libvcl0 libvarnish0 From des at projects.linpro.no Mon Nov 6 12:19:10 2006 From: des at projects.linpro.no (des at projects.linpro.no) Date: Mon, 6 Nov 2006 13:19:10 +0100 (CET) Subject: r1218 - branches/1.0 Message-ID: <20061106121910.A90B51EC1E5@projects.linpro.no> Author: des Date: 2006-11-06 13:19:10 +0100 (Mon, 06 Nov 2006) New Revision: 1218 Modified: branches/1.0/ChangeLog Log: Regenerate. Modified: branches/1.0/ChangeLog =================================================================== --- branches/1.0/ChangeLog 2006-11-06 12:07:08 UTC (rev 1217) +++ branches/1.0/ChangeLog 2006-11-06 12:19:10 UTC (rev 1218) @@ -1,3 +1,100 @@ +2006-11-02 12:57 des + + * branches/1.0, branches/1.0/include/compat/vis.h, + branches/1.0/lib/libcompat/vis.c: + + r33651 at cat (orig r1208): des | 2006-11-02 13:57:11 +0100 + As per ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change, + remove the so-called advertising clause from these files' license, + making it compatible with the Debian Free Software Guidelines. As + these files were obtained from FreeBSD, this change was discussed + with and approved by the FreeBSD core team. + +2006-11-02 12:57 des + + * branches/1.0, branches/1.0/debian/changelog, branches/1.0/debian/dirs, + branches/1.0/debian/rules: + + r33291 at cat (orig r1207): bahner | 2006-10-23 14:21:17 +0200 + Lintian overrides for debian-acceptance + + +2006-11-02 12:57 des + + * branches/1.0, branches/1.0/debian/TODO, branches/1.0/debian/varnish.init: + + r33290 at cat (orig r1206): bahner | 2006-10-23 14:12:07 +0200 + Preliminary LSB compliance in init-scripts + + +2006-11-02 12:57 des + + * branches/1.0, branches/1.0/debian/changelog, + branches/1.0/debian/copyright: + + r33289 at cat (orig r1205): bahner | 2006-10-19 15:55:12 +0200 + Bumped version to 1.0.2 proper + Added wording regarding the origination of the source of + varnish with relation to debian. + + +2006-11-02 12:57 des + + * branches/1.0, branches/1.0/debian/control: + + r33288 at cat (orig r1204): bahner | 2006-10-19 15:44:27 +0200 + Reverted accidental reversion of dependencies + + +2006-11-02 12:57 des + + * branches/1.0, branches/1.0/redhat/varnish.spec: + + r33287 at cat (orig r1203): ingvar | 2006-10-19 14:55:20 +0200 + Added a vendor tag to the rpm package. + +2006-11-02 12:57 des + + * branches/1.0, branches/1.0/redhat, branches/1.0/redhat/README.redhat, + branches/1.0/redhat/TODO, branches/1.0/redhat/varnish.initrc, + branches/1.0/redhat/varnish.spec, branches/1.0/redhat/varnish.sysconfig: + + r33286 at cat (orig r1202): ingvar | 2006-10-19 14:43:29 +0200 + Added build scripts for Red Hat rpm package + +2006-10-19 09:21 des + + * branches/1.0, branches/1.0/debian/control: + + r33282 at cat (orig r1198): des | 2006-10-19 11:19:28 +0200 + Capitalize. + +2006-10-19 09:21 des + + * branches/1.0, branches/1.0/etc/vcl.conf: + + r33281 at cat (orig r1197): des | 2006-10-19 11:16:42 +0200 + Additional commentary + +2006-10-19 09:21 des + + * branches/1.0, branches/1.0/etc, branches/1.0/etc/vcl.conf: + + r33280 at cat (orig r1196): des | 2006-10-19 11:16:03 +0200 + Add sample VCL config. + +2006-10-18 14:32 des + + * branches/1.0/configure.ac: + + Bump version number. + +2006-10-18 14:31 des + + * branches/1.0/ChangeLog: + + Regenerate. + 2006-10-18 14:27 des * branches/1.0, branches/1.0/man/vcl.7: From des at projects.linpro.no Tue Nov 7 12:17:47 2006 From: des at projects.linpro.no (des at projects.linpro.no) Date: Tue, 7 Nov 2006 13:17:47 +0100 (CET) Subject: r1219 - tags Message-ID: <20061107121747.ED92A1EC325@projects.linpro.no> Author: des Date: 2006-11-07 13:17:47 +0100 (Tue, 07 Nov 2006) New Revision: 1219 Added: tags/varnish-1.0.2/ Log: Tag 1.0.2. Copied: tags/varnish-1.0.2 (from rev 1218, branches/1.0) From des at projects.linpro.no Wed Nov 8 08:49:57 2006 From: des at projects.linpro.no (des at projects.linpro.no) Date: Wed, 8 Nov 2006 09:49:57 +0100 (CET) Subject: r1220 - trunk/varnish-cache/bin/varnishd Message-ID: <20061108084957.789D41EC1D7@projects.linpro.no> Author: des Date: 2006-11-08 09:49:57 +0100 (Wed, 08 Nov 2006) New Revision: 1220 Modified: trunk/varnish-cache/bin/varnishd/varnishd.c Log: Remove printf() from signal handler. Make the pipe-juggling code slightly more readable. Modified: trunk/varnish-cache/bin/varnishd/varnishd.c =================================================================== --- trunk/varnish-cache/bin/varnishd/varnishd.c 2006-11-07 12:17:47 UTC (rev 1219) +++ trunk/varnish-cache/bin/varnishd/varnishd.c 2006-11-08 08:49:57 UTC (rev 1220) @@ -31,15 +31,16 @@ * The management process and CLI handling */ -#include +#include #include #include #include +#include #include #include -#include #include #include +#include #include #include @@ -238,15 +239,12 @@ static pid_t d_child; -#include static void DebugSigPass(int sig) { - int i; - i = kill(d_child, sig); - printf("sig %d i %d pid %d\n", sig, i, d_child); + kill(d_child, sig); } static void @@ -261,27 +259,33 @@ AZ(pipe(pipes[0])); AZ(pipe(pipes[1])); d_child = fork(); + xxxassert(d_child >= 0); if (!d_child) { - assert(dup2(pipes[0][0], 0) >= 0); - assert(dup2(pipes[1][1], 1) >= 0); - assert(dup2(pipes[1][1], 2) >= 0); + /* stdin from parent, std{out,err} to parent */ + assert(dup2(pipes[0][0], 0) == 0); + assert(dup2(pipes[1][1], 1) == 1); + assert(dup2(pipes[1][1], 2) == 2); AZ(close(pipes[0][0])); AZ(close(pipes[0][1])); AZ(close(pipes[1][0])); AZ(close(pipes[1][1])); return; } + + /* set up parent's end of pipe to child's stdin */ AZ(close(pipes[0][0])); - assert(dup2(pipes[0][1], 3) >= 0); pipes[0][0] = 0; + assert(dup2(pipes[0][1], 3) == 3); pipes[0][1] = 3; - assert(dup2(pipes[1][0], 4) >= 0); + /* set up parent's end of pipe from child's std{out,err} */ + assert(dup2(pipes[1][0], 4) == 4); + pipes[1][0] = 4; AZ(close(pipes[1][1])); - pipes[1][0] = 4; pipes[1][1] = 1; - for (i = 5; i < 100; i++) + /* close the rest */ + for (i = 5; i < getdtablesize(); i++) close(i); pfd[0].fd = pipes[0][0]; @@ -292,6 +296,7 @@ signal(SIGPIPE, SIG_IGN); signal(SIGINT, DebugSigPass); i = read(pipes[1][0], buf, sizeof buf - 1); + xxxassert(i >= 0); buf[i] = '\0'; d_child = strtoul(buf, &p, 0); xxxassert(p != NULL); From des at projects.linpro.no Wed Nov 8 08:59:21 2006 From: des at projects.linpro.no (des at projects.linpro.no) Date: Wed, 8 Nov 2006 09:59:21 +0100 (CET) Subject: r1221 - trunk/varnish-cache/bin/varnishd Message-ID: <20061108085921.03D491EC1D7@projects.linpro.no> Author: des Date: 2006-11-08 09:59:20 +0100 (Wed, 08 Nov 2006) New Revision: 1221 Modified: trunk/varnish-cache/bin/varnishd/varnishd.c Log: Rewrite tackle_warg(): don't override the default max or timeout unless the user asks; bail if max < min; fix usage string. Modified: trunk/varnish-cache/bin/varnishd/varnishd.c =================================================================== --- trunk/varnish-cache/bin/varnishd/varnishd.c 2006-11-08 08:49:57 UTC (rev 1220) +++ trunk/varnish-cache/bin/varnishd/varnishd.c 2006-11-08 08:59:20 UTC (rev 1221) @@ -194,7 +194,7 @@ fprintf(stderr, " %-28s # %s\n", "", " -w min,max"); fprintf(stderr, " %-28s # %s\n", "", - " -w min,max,timeout [default: -w1,INF,10]"); + " -w min,max,timeout [default: -w1,1000,120]"); #if 0 -c clusterid at cluster_controller -m memory_limit @@ -211,21 +211,23 @@ static void tackle_warg(const char *argv) { - int i; - unsigned ua, ub, uc; + unsigned int ua, ub, uc; - i = sscanf(argv, "%u,%u,%u", &ua, &ub, &uc); - if (i == 0) + switch (sscanf(argv, "%u,%u,%u", &ua, &ub, &uc)) { + case 3: + params->wthread_timeout = uc; + case 2: + if (ub < ua) + usage(); + params->wthread_max = ub; + case 1: + if (ua < 1) + usage(); + params->wthread_min = ua; + break; + default: usage(); - if (ua < 1) - usage(); - params->wthread_min = ua; - params->wthread_max = ua; - params->wthread_timeout = 10; - if (i >= 2) - params->wthread_max = ub; - if (i >= 3) - params->wthread_timeout = uc; + } } /*-------------------------------------------------------------------- From ingvar at projects.linpro.no Wed Nov 8 09:03:40 2006 From: ingvar at projects.linpro.no (ingvar at projects.linpro.no) Date: Wed, 8 Nov 2006 10:03:40 +0100 (CET) Subject: r1222 - trunk/varnish-cache/redhat Message-ID: <20061108090340.70C671EC5E0@projects.linpro.no> Author: ingvar Date: 2006-11-08 10:03:40 +0100 (Wed, 08 Nov 2006) New Revision: 1222 Modified: trunk/varnish-cache/redhat/varnish.initrc trunk/varnish-cache/redhat/varnish.sysconfig Log: Removed the usage of -w in the initscript until that bug is fixed in varnishd Modified: trunk/varnish-cache/redhat/varnish.initrc =================================================================== --- trunk/varnish-cache/redhat/varnish.initrc 2006-11-08 08:59:20 UTC (rev 1221) +++ trunk/varnish-cache/redhat/varnish.initrc 2006-11-08 09:03:40 UTC (rev 1222) @@ -21,9 +21,11 @@ -f ${VARNISH_VCL_CONF} \ -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \ -t ${VARNISH_TTL} \ - -w ${VARNISH_MIN_WORKER_THREADS},${VARNISH_MAX_WORKER_THREADS},${VARNISH_WORKER_THREAD_TIMEOUT} \ -s ${VARNISH_BACKEND_STORAGE}" +# Note: The set of working threads is temporary broken in varnish-1.0.2. +# This will be fixed in an upcoming release +# -w ${VARNISH_MIN_WORKER_THREADS},${VARNISH_MAX_WORKER_THREADS},${VARNISH_WORKER_THREAD_TIMEOUT} \ mkdir -p /var/run/varnish 2>/dev/null Modified: trunk/varnish-cache/redhat/varnish.sysconfig =================================================================== --- trunk/varnish-cache/redhat/varnish.sysconfig 2006-11-08 08:59:20 UTC (rev 1221) +++ trunk/varnish-cache/redhat/varnish.sysconfig 2006-11-08 09:03:40 UTC (rev 1222) @@ -20,6 +20,9 @@ VARNISH_ADMIN_LISTEN_ADDRESS=127.0.0.1 VARNISH_ADMIN_LISTEN_PORT=6082 +# Note: The working set of threads is temporary broken in +# varnish-1.0.2. The following 3 entries will not be used. +# This will be fixed in an upcoming release # The minimum number of threads to start VARNISH_MIN_WORKER_THREADS=1 From ingvar at projects.linpro.no Wed Nov 8 09:05:48 2006 From: ingvar at projects.linpro.no (ingvar at projects.linpro.no) Date: Wed, 8 Nov 2006 10:05:48 +0100 (CET) Subject: r1223 - tags/varnish-1.0.2/redhat Message-ID: <20061108090548.23CEB1EC943@projects.linpro.no> Author: ingvar Date: 2006-11-08 10:05:48 +0100 (Wed, 08 Nov 2006) New Revision: 1223 Modified: tags/varnish-1.0.2/redhat/varnish.initrc tags/varnish-1.0.2/redhat/varnish.sysconfig Log: Removed the usage of -w in the initscript until that bug is fixed in varnishd Modified: tags/varnish-1.0.2/redhat/varnish.initrc =================================================================== --- tags/varnish-1.0.2/redhat/varnish.initrc 2006-11-08 09:03:40 UTC (rev 1222) +++ tags/varnish-1.0.2/redhat/varnish.initrc 2006-11-08 09:05:48 UTC (rev 1223) @@ -21,9 +21,11 @@ -f ${VARNISH_VCL_CONF} \ -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \ -t ${VARNISH_TTL} \ - -w ${VARNISH_MIN_WORKER_THREADS},${VARNISH_MAX_WORKER_THREADS},${VARNISH_WORKER_THREAD_TIMEOUT} \ -s ${VARNISH_BACKEND_STORAGE}" +# Note: The set of working threads is temporary broken in varnish-1.0.2. +# This will be fixed in an upcoming release +# -w ${VARNISH_MIN_WORKER_THREADS},${VARNISH_MAX_WORKER_THREADS},${VARNISH_WORKER_THREAD_TIMEOUT} \ mkdir -p /var/run/varnish 2>/dev/null Modified: tags/varnish-1.0.2/redhat/varnish.sysconfig =================================================================== --- tags/varnish-1.0.2/redhat/varnish.sysconfig 2006-11-08 09:03:40 UTC (rev 1222) +++ tags/varnish-1.0.2/redhat/varnish.sysconfig 2006-11-08 09:05:48 UTC (rev 1223) @@ -20,6 +20,9 @@ VARNISH_ADMIN_LISTEN_ADDRESS=127.0.0.1 VARNISH_ADMIN_LISTEN_PORT=6082 +# Note: The working set of threads is temporary broken in +# varnish-1.0.2. The following 3 entries will not be used. +# This will be fixed in an upcoming release # The minimum number of threads to start VARNISH_MIN_WORKER_THREADS=1 From des at linpro.no Wed Nov 8 09:18:48 2006 From: des at linpro.no (Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?=) Date: Wed, 08 Nov 2006 10:18:48 +0100 Subject: r1223 - tags/varnish-1.0.2/redhat In-Reply-To: <20061108090548.23CEB1EC943@projects.linpro.no> (ingvar@projects.linpro.no's message of "Wed, 8 Nov 2006 10:05:48 +0100 (CET)") References: <20061108090548.23CEB1EC943@projects.linpro.no> Message-ID: ingvar at projects.linpro.no writes: > Log: > Removed the usage of -w in the initscript until that bug is fixed in varnishd You're not supposed to commit to tags. DES -- Dag-Erling Sm?rgrav Senior Software Developer Linpro AS - www.linpro.no From des at linpro.no Wed Nov 8 09:22:20 2006 From: des at linpro.no (Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?=) Date: Wed, 08 Nov 2006 10:22:20 +0100 Subject: r1222 - trunk/varnish-cache/redhat In-Reply-To: <20061108090340.70C671EC5E0@projects.linpro.no> (ingvar@projects.linpro.no's message of "Wed, 8 Nov 2006 10:03:40 +0100 (CET)") References: <20061108090340.70C671EC5E0@projects.linpro.no> Message-ID: ingvar at projects.linpro.no writes: > Log: > Removed the usage of -w in the initscript until that bug is fixed in varnishd I really wish you had consulted with me before committing this. There is nothing wrong with -w in 1.0.2. DES -- Dag-Erling Sm?rgrav Senior Software Developer Linpro AS - www.linpro.no From ingvar at projects.linpro.no Wed Nov 8 11:23:48 2006 From: ingvar at projects.linpro.no (ingvar at projects.linpro.no) Date: Wed, 8 Nov 2006 12:23:48 +0100 (CET) Subject: r1224 - tags/varnish-1.0.2/redhat Message-ID: <20061108112348.B1AB11EC1E8@projects.linpro.no> Author: ingvar Date: 2006-11-08 12:23:48 +0100 (Wed, 08 Nov 2006) New Revision: 1224 Modified: tags/varnish-1.0.2/redhat/varnish.initrc tags/varnish-1.0.2/redhat/varnish.sysconfig Log: Thou shall not commit to tags. Reverting changes in rev 1223 Modified: tags/varnish-1.0.2/redhat/varnish.initrc =================================================================== --- tags/varnish-1.0.2/redhat/varnish.initrc 2006-11-08 09:05:48 UTC (rev 1223) +++ tags/varnish-1.0.2/redhat/varnish.initrc 2006-11-08 11:23:48 UTC (rev 1224) @@ -21,11 +21,9 @@ -f ${VARNISH_VCL_CONF} \ -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \ -t ${VARNISH_TTL} \ + -w ${VARNISH_MIN_WORKER_THREADS},${VARNISH_MAX_WORKER_THREADS},${VARNISH_WORKER_THREAD_TIMEOUT} \ -s ${VARNISH_BACKEND_STORAGE}" -# Note: The set of working threads is temporary broken in varnish-1.0.2. -# This will be fixed in an upcoming release -# -w ${VARNISH_MIN_WORKER_THREADS},${VARNISH_MAX_WORKER_THREADS},${VARNISH_WORKER_THREAD_TIMEOUT} \ mkdir -p /var/run/varnish 2>/dev/null Modified: tags/varnish-1.0.2/redhat/varnish.sysconfig =================================================================== --- tags/varnish-1.0.2/redhat/varnish.sysconfig 2006-11-08 09:05:48 UTC (rev 1223) +++ tags/varnish-1.0.2/redhat/varnish.sysconfig 2006-11-08 11:23:48 UTC (rev 1224) @@ -20,9 +20,6 @@ VARNISH_ADMIN_LISTEN_ADDRESS=127.0.0.1 VARNISH_ADMIN_LISTEN_PORT=6082 -# Note: The working set of threads is temporary broken in -# varnish-1.0.2. The following 3 entries will not be used. -# This will be fixed in an upcoming release # The minimum number of threads to start VARNISH_MIN_WORKER_THREADS=1 From bahner at projects.linpro.no Thu Nov 9 10:25:47 2006 From: bahner at projects.linpro.no (bahner at projects.linpro.no) Date: Thu, 9 Nov 2006 11:25:47 +0100 (CET) Subject: r1225 - tags/varnish-1.0.2/debian Message-ID: <20061109102547.544001EC5BF@projects.linpro.no> Author: bahner Date: 2006-11-09 11:25:47 +0100 (Thu, 09 Nov 2006) New Revision: 1225 Modified: tags/varnish-1.0.2/debian/copyright Log: Changed comments on copyright (which have been fixed). Modified: tags/varnish-1.0.2/debian/copyright =================================================================== --- tags/varnish-1.0.2/debian/copyright 2006-11-08 11:23:48 UTC (rev 1224) +++ tags/varnish-1.0.2/debian/copyright 2006-11-09 10:25:47 UTC (rev 1225) @@ -2,7 +2,7 @@ Fri, 6 Oct 2006 16:26:57 +0200. It was pulled from the Subversion repository with -svn co http://varnish.projects.linpro.no/svn/trunk +svn co http://varnish.projects.linpro.no/svn/tags/varnish-1.0.2 Debianizations are an integral part of the main source for varnish, so the change for Debian are made before publication of releases, @@ -16,28 +16,45 @@ All rights reserved. License: +The source files are under either 2 og 3 clause BSD-style licenses +as found on this system in the file /usr/share/common-licenses/BSD -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. +There are no longer four clause BSD-licenses in the source. FreeBSD have +been contacted and the license altered in accordance with this +statement from University of California, Berkeley +ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change +which reads as follows: -THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. +============================================================================= +July 22, 1999 +To All Licensees, Distributors of Any Version of BSD: + +As you know, certain of the Berkeley Software Distribution ("BSD") source +code files require that further distributions of products containing all or +portions of the software, acknowledge within their advertising materials +that such products contain software developed by UC Berkeley and its +contributors. + +Specifically, the provision reads: + +" * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors." + +Effective immediately, licensees and distributors are no longer required to +include the acknowledgement within advertising materials. Accordingly, the +foregoing paragraph of those BSD Unix files containing it is hereby deleted +in its entirety. + +William Hoskins +Director, Office of Technology Licensing +University of California, Berkeley +============================================================================= + + * + The Debian packaging is (C) 2006, Lars Bahner and is licensed under the GPL version 2. The full text of which can be found in the file /usr/share/common-licenses/GPL-2 on this system.