rpms/squid/F-7 squid-2.6.STABLE14-config.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 sources, 1.29, 1.30 squid.spec, 1.85, 1.86 squid-2.5.STABLE11-config.patch, 1.1, NONE
Martin Bacovsky (mbacovsk)
fedora-extras-commits at redhat.com
Thu Aug 2 10:07:55 UTC 2007
Author: mbacovsk
Update of /cvs/pkgs/rpms/squid/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19710
Modified Files:
.cvsignore sources squid.spec
Added Files:
squid-2.6.STABLE14-config.patch
Removed Files:
squid-2.5.STABLE11-config.patch
Log Message:
* Wed Aug 1 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE14-1
- upgrade to latest upstream 2.6.STABLE14
squid-2.6.STABLE14-config.patch:
--- NEW FILE squid-2.6.STABLE14-config.patch ---
--- 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
<pid>'.
+
+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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-7/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore 4 Jun 2007 13:53:54 -0000 1.27
+++ .cvsignore 2 Aug 2007 10:07:22 -0000 1.28
@@ -1 +1 @@
-squid-2.6.STABLE13.tar.bz2
+squid-2.6.STABLE14.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-7/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 4 Jun 2007 13:53:54 -0000 1.29
+++ sources 2 Aug 2007 10:07:22 -0000 1.30
@@ -1 +1 @@
-fdc4ece264b47bab1b112d8f6f842b8b squid-2.6.STABLE13.tar.bz2
+eadb138d48320df8b99349121159c6bf squid-2.6.STABLE14.tar.bz2
Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-7/squid.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- squid.spec 4 Jun 2007 13:53:54 -0000 1.85
+++ squid.spec 2 Aug 2007 10:07:22 -0000 1.86
@@ -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 @@
# 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 @@
chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
%changelog
+* Wed Aug 1 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE14-1
+- upgrade to latest upstream 2.6.STABLE14
+
* Mon Jun 4 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE13-1
- update to latest upstream 2.6.STABLE13
- resolves: #242423: Squid Version Violation
--- squid-2.5.STABLE11-config.patch DELETED ---
More information about the fedora-extras-commits
mailing list