| Index: trunk/debs/squid/debian/control |
| — | — | @@ -3,7 +3,7 @@ |
| 4 | 4 | Priority: optional |
| 5 | 5 | Maintainer: Mark Bergsma <mark@wikimedia.org> |
| 6 | 6 | Standards-Version: 3.7.2 |
| 7 | | -Build-Depends: libldap2-dev, libpam0g-dev, sharutils, dpatch (>= 2.0.9), debhelper, devscripts, po-debconf, libdb4.4-dev, wget, libgoogle-perftools-dev |
| | 7 | +Build-Depends: libldap2-dev, libpam0g-dev, sharutils, dpatch (>= 2.0.9), debhelper, devscripts, po-debconf, libdb4.7-dev |
| 8 | 8 | |
| 9 | 9 | Package: squid |
| 10 | 10 | Architecture: any |
| Index: trunk/debs/squid/debian/changelog |
| — | — | @@ -1,9 +1,18 @@ |
| 2 | | -squid (2.7.6-1wm2) hardy; urgency=low |
| | 2 | +squid (2.7.7-1wm1) karmic; urgency=low |
| 3 | 3 | |
| | 4 | + [ Tim Starling ] |
| 4 | 5 | * Added error-en.html |
| 5 | 6 | |
| 6 | | - -- Tim Starling <tstarling@wikimedia.org> Sun, 31 Jan 2010 13:11:13 +1100 |
| | 7 | + [ Mark Bergsma ] |
| | 8 | + * Upgrade to upstream version 2.7.7 |
| | 9 | + * Increase maximum FDs to 131072, default at 65535 |
| | 10 | + * Build for karmic: |
| | 11 | + - Replace libdb4.4-dev build dependency by libdb4.7-dev |
| | 12 | + - Drop tcmalloc linking, as it's uninstallable in karmic |
| | 13 | + * Add LSB information to init scripts |
| 7 | 14 | |
| | 15 | + -- Mark Bergsma <mark@wikimedia.org> Mon, 01 Feb 2010 13:14:56 +0000 |
| | 16 | + |
| 8 | 17 | squid (2.7.6-1wm1) hardy; urgency=low |
| 9 | 18 | |
| 10 | 19 | * New upstream release |
| Index: trunk/debs/squid/debian/squid.rc |
| — | — | @@ -5,6 +5,17 @@ |
| 6 | 6 | # Version: @(#)squid.rc 2.20 01-Oct-2001 miquels@cistron.nl |
| 7 | 7 | # |
| 8 | 8 | |
| | 9 | +### BEGIN INIT INFO |
| | 10 | +# Provides: squid |
| | 11 | +# Required-Start: $all |
| | 12 | +# Required-Stop: $remote_fs $syslog |
| | 13 | +# Default-Start: 2 3 4 5 |
| | 14 | +# Default-Stop: 0 1 6 |
| | 15 | +# Short-Description: Start's the backend Squid daemon |
| | 16 | +# Description: Controls the backend Squid daemon |
| | 17 | +# Action 'clean' wipes the disk cache |
| | 18 | +### END INIT INFO |
| | 19 | + |
| 9 | 20 | NAME=squid |
| 10 | 21 | DAEMON=/usr/sbin/squid |
| 11 | 22 | LIB=/usr/lib/squid |
| Index: trunk/debs/squid/debian/rules |
| — | — | @@ -148,9 +148,8 @@ |
| 149 | 149 | --enable-carp \ |
| 150 | 150 | --disable-icmp \ |
| 151 | 151 | --with-large-files \ |
| 152 | | - --with-maxfd=65536 \ |
| | 152 | + --with-maxfd=131072 \ |
| 153 | 153 | --enable-stacktraces \ |
| 154 | | - --enable-dlmalloc=-ltcmalloc \ |
| 155 | 154 | --enable-vary-options \ |
| 156 | 155 | $(DEB_HOST_ARCH_CPU)-debian-$(DEB_HOST_ARCH_OS) |
| 157 | 156 | ifeq ($(DEB_HOST_ARCH_OS), linux) |
| Index: trunk/debs/squid/debian/squid-frontend.rc |
| — | — | @@ -5,6 +5,16 @@ |
| 6 | 6 | # Version: @(#)squid.rc 2.20 01-Oct-2001 miquels@cistron.nl |
| 7 | 7 | # |
| 8 | 8 | |
| | 9 | +### BEGIN INIT INFO |
| | 10 | +# Provides: squid-frontend |
| | 11 | +# Required-Start: $all |
| | 12 | +# Required-Stop: $remote_fs $syslog |
| | 13 | +# Default-Start: 2 3 4 5 |
| | 14 | +# Default-Stop: 0 1 6 |
| | 15 | +# Short-Description: Start's the frontend Squid daemon |
| | 16 | +# Description: Controls the frontend Squid daemon |
| | 17 | +### END INIT INFO |
| | 18 | + |
| 9 | 19 | NAME=squid-frontend |
| 10 | 20 | DAEMON=/usr/sbin/squid-frontend |
| 11 | 21 | LIB=/usr/lib/squid |
| Index: trunk/debs/squid/debian/default.squid |
| — | — | @@ -3,6 +3,6 @@ |
| 4 | 4 | # |
| 5 | 5 | |
| 6 | 6 | # Max. number of filedescriptors to use. You can increase this on a busy |
| 7 | | -# cache to a maximum of (currently) 65536 filedescriptors. Default is 16384. |
| 8 | | -SQUID_MAXFD=16384 |
| | 7 | +# cache to a maximum of (currently) 131072 filedescriptors. Default is 65535. |
| | 8 | +SQUID_MAXFD=65535 |
| 9 | 9 | |
| Index: trunk/debs/squid/debian/errors/README |
| — | — | @@ -1,3 +1,3 @@ |
| 2 | | -See: https://wikitech.leuksman.com/view/Squid_error_pages |
| | 2 | +See: http://wikitech.wikimedia.org/view/Squid_error_pages |
| 3 | 3 | |
| 4 | 4 | http://meta.wikimedia.org/wiki/Multilingual_error_messages/Translations |