From b2be039835a17864bee45c37450c6ed0605ecfa9 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 23 Sep 2005 11:25:41 +0000 Subject: [PATCH] update to STABLE11 --- .cvsignore | 1 + sources | 2 +- squid-2.5.STABLE11-config.patch | 115 ++++++++++++++++++++++++++++++++ squid.spec | 27 ++------ 4 files changed, 124 insertions(+), 21 deletions(-) create mode 100644 squid-2.5.STABLE11-config.patch diff --git a/.cvsignore b/.cvsignore index 418ac1a..e4e4242 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ squid-2.5.STABLE9.tar.bz2 squid-2.5.STABLE10.tar.bz2 +squid-2.5.STABLE11.tar.bz2 diff --git a/sources b/sources index f916a5a..e04792c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6db8bdfc783b3baed7de803c9a39e55 squid-2.5.STABLE10.tar.bz2 +5e7f13ad95b64b60ddd6cdc2ab800d67 squid-2.5.STABLE11.tar.bz2 diff --git a/squid-2.5.STABLE11-config.patch b/squid-2.5.STABLE11-config.patch new file mode 100644 index 0000000..a9ec590 --- /dev/null +++ b/squid-2.5.STABLE11-config.patch @@ -0,0 +1,115 @@ +--- squid-2.5.STABLE11/src/cf.data.pre.config 2005-09-13 15:44:35.000000000 +0200 ++++ squid-2.5.STABLE11/src/cf.data.pre 2005-09-23 11:13:06.000000000 +0200 +@@ -2210,6 +2210,7 @@ + #http_access allow our_networks + + # And finally deny all other access to this proxy ++http_access allow localhost + http_access deny all + NOCOMMENT_END + DOC_END +@@ -2436,11 +2437,11 @@ + + NAME: cache_mgr + TYPE: string +-DEFAULT: webmaster ++DEFAULT: root + LOC: Config.adminEmail + DOC_START + Email-address of local cache manager who will receive +- mail if the cache dies. The default is "webmaster". ++ mail if the cache dies. The default is "root". + DOC_END + + +@@ -2471,22 +2472,23 @@ + + NAME: cache_effective_user + TYPE: string +-DEFAULT: nobody ++DEFAULT: squid + LOC: Config.effectiveUser + DOC_START + If you start Squid as root, it will change its effective/real + UID/GID to the user specified below. The default is to change +- to UID to nobody. If you define cache_effective_user, but not ++ to UID to "squid". If you define cache_effective_user, but not + cache_effective_group, Squid sets the GID to the effective + user's default group ID (taken from the password file) and + supplementary group list from the from groups membership of + cache_effective_user. ++cache_effective_user squid + DOC_END + + + NAME: cache_effective_group + TYPE: string +-DEFAULT: none ++DEFAULT: squid + LOC: Config.effectiveGroup + DOC_START + If you want Squid to run with a specific GID regardless of +@@ -2496,6 +2498,7 @@ + and only this GID is effective. If Squid is not started as + root the user starting Squid must be member of the specified + group. ++cache_effective_group squid + DOC_END + + +@@ -2723,7 +2726,7 @@ + + NAME: logfile_rotate + TYPE: int +-DEFAULT: 10 ++DEFAULT: 0 + LOC: Config.Log.rotateNumber + DOC_START + Specifies the number of logfile rotations to make when you +@@ -2739,6 +2742,8 @@ + purposes, so -k rotate uses another signal. It is best to get + in the habit of using 'squid -k rotate' instead of 'kill -USR1 + '. ++ ++logfile_rotate 0 + DOC_END + + +@@ -3296,10 +3301,18 @@ + LOC: Config.errorDirectory + DEFAULT: @DEFAULT_ERROR_DIR@ + DOC_START +- If you wish to create your own versions of the default +- (English) error files, either to customize them to suit your +- language or company copy the template English files to another ++ Directory where the error files are read from. ++ /usr/lib/squid/errors contains sets of error files ++ in different languages. The default error directory ++ is /etc/squid/errors, which is a link to one of these ++ error sets. ++ ++ If you wish to create your own versions of the error files, ++ either to customize them to suit your language or company, ++ copy the template English files to another + directory and point this tag at them. ++ ++error_directory @DEFAULT_ERROR_DIR@ + DOC_END + + NAME: maximum_single_addr_tries +@@ -3333,12 +3346,12 @@ + NAME: snmp_port + TYPE: ushort + LOC: Config.Port.snmp +-DEFAULT: 3401 ++DEFAULT: 0 + IFDEF: SQUID_SNMP + DOC_START + Squid can now serve statistics and status information via SNMP. +- By default it listens to port 3401 on the machine. If you don't +- wish to use SNMP, set this to "0". ++ A value of "0" disables SNMP support. If you wish to use SNMP, ++ set this to "3401" to use the normal SNMP support. + DOC_END + + NAME: snmp_access diff --git a/squid.spec b/squid.spec index fb10f97..4c25af6 100644 --- a/squid.spec +++ b/squid.spec @@ -4,8 +4,8 @@ Summary: The Squid proxy caching server. Name: squid -Version: 2.5.STABLE10 -Release: 4 +Version: 2.5.STABLE11 +Release: 1 Epoch: 7 License: GPL Group: System Environment/Daemons @@ -18,24 +18,15 @@ Source5: squid.pam Source98: perl-requires-squid.sh ## Source99: filter-requires-squid.sh -# Upstream patches -Patch100: squid-2.5.STABLE10-spanish.patch -Patch101: squid-2.5.STABLE10-sslConnectTimeout.patch -Patch102: squid-2.5.STABLE10-statHistAssert.patch -Patch103: squid-2.5.STABLE10-fortify_source.patch -Patch104: squid-2.5.STABLE10-greek.patch -Patch105: squid-2.5.STABLE10-store_pending.patch - - # Local patches # Applying upstream patches first makes it less likely that local patches # will break upstream ones. -Patch201: squid-2.5.STABLE7-config.patch +Patch201: squid-2.5.STABLE11-config.patch Patch202: squid-2.5.STABLE4-location.patch Patch203: squid-2.5.STABLE7-build.patch Patch204: squid-2.5.STABLE4-perlpath.patch Patch205: squid-2.5.STABLE5-pipe.patch -Patch206: squid-2.5.STABLE10-libbind.patch +Patch206: squid-2.5.STABLE11-libbind.patch Patch207: squid-2.5.STABLE10-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -59,13 +50,6 @@ lookup program (dnsserver), a program for retrieving FTP data %prep %setup -q -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 - %patch201 -p1 -b .config %patch202 -p1 -b .location %patch203 -p1 -b .build @@ -318,6 +302,9 @@ fi chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true %changelog +* Fri Sep 23 2005 Martin Stransky 7:2.5.STABLE11-1 +- update to STABLE11 + * Mon Sep 5 2005 Martin Stransky 7:2.5.STABLE10-4 - Three upstream patches for #167414 - Spanish and Greek messages