diff --git a/.cvsignore b/.cvsignore index 461e4a3..e985543 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -squid-2.6.STABLE13.tar.bz2 +squid-2.6.STABLE14.tar.bz2 diff --git a/sources b/sources index 4109897..0e87e03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fdc4ece264b47bab1b112d8f6f842b8b squid-2.6.STABLE13.tar.bz2 +eadb138d48320df8b99349121159c6bf squid-2.6.STABLE14.tar.bz2 diff --git a/squid-2.5.STABLE11-config.patch b/squid-2.5.STABLE11-config.patch deleted file mode 100644 index a9ec590..0000000 --- a/squid-2.5.STABLE11-config.patch +++ /dev/null @@ -1,115 +0,0 @@ ---- 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-2.6.STABLE14-config.patch b/squid-2.6.STABLE14-config.patch new file mode 100644 index 0000000..7b003af --- /dev/null +++ b/squid-2.6.STABLE14-config.patch @@ -0,0 +1,114 @@ +--- squid-2.6.STABLE14/src/cf.data.pre.config 2007-06-26 01:34:57.000000000 +0200 ++++ squid-2.6.STABLE14/src/cf.data.pre 2007-07-19 21:22:45.000000000 +0200 +@@ -2961,6 +2961,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 +@@ -3243,11 +3244,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 + + NAME: mail_from +@@ -3275,21 +3276,22 @@ + + 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 +@@ -3299,6 +3301,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 + + NAME: httpd_suppress_version_string +@@ -3929,7 +3932,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 +@@ -3945,6 +3948,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 + + NAME: append_domain +@@ -4546,10 +4551,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 +@@ -4583,12 +4596,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 d0eba89..65e371c 100644 --- a/squid.spec +++ b/squid.spec @@ -4,7 +4,7 @@ Summary: The Squid proxy caching server Name: squid -Version: 2.6.STABLE13 +Version: 2.6.STABLE14 Release: 1%{?dist} Epoch: 7 License: GPL @@ -26,7 +26,7 @@ Source98: perl-requires-squid.sh # Local patches # Applying upstream patches first makes it less likely that local patches # will break upstream ones. -Patch201: squid-2.5.STABLE11-config.patch +Patch201: squid-2.6.STABLE14-config.patch Patch202: squid-2.5.STABLE4-location.patch Patch203: squid-2.6.STABLE2-build.patch Patch204: squid-2.5.STABLE4-perlpath.patch @@ -326,6 +326,9 @@ fi chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || : %changelog +* Wed Aug 1 2007 Martin Bacovsky - 7:2.6.STABLE14-1 +- upgrade to latest upstream 2.6.STABLE14 + * Mon Jun 4 2007 Martin Bacovsky - 7:2.6.STABLE13-1 - update to latest upstream 2.6.STABLE13 - resolves: #242423: Squid Version Violation