rpms/squid/F-7 squid-2.6.STABLE16-config.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 sources, 1.30, 1.31 squid.spec, 1.86, 1.87 squid-2.6.STABLE14-config.patch, 1.1, NONE

Fri Sep 7 16:37:16 UTC 2007

Author: mbacovsk

Update of /cvs/pkgs/rpms/squid/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17835

Modified Files:
	.cvsignore sources squid.spec 
Added Files:
	squid-2.6.STABLE16-config.patch 
Removed Files:
	squid-2.6.STABLE14-config.patch 
Log Message:
* Fri Sep  7 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-1
- upgrade to latest upstream 2.6.STABLE14


squid-2.6.STABLE16-config.patch:

--- NEW FILE squid-2.6.STABLE16-config.patch ---
diff -up squid-2.6.STABLE16/src/cf.data.pre.config squid-2.6.STABLE16/src/cf.data.pre
--- squid-2.6.STABLE16/src/cf.data.pre.config	2007-09-05 23:50:15.000000000 +0200
+++ squid-2.6.STABLE16/src/cf.data.pre	2007-09-07 15:11:59.000000000 +0200
@@ -692,6 +692,7 @@ http_access deny CONNECT !SSL_ports
 #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
@@ -2250,7 +2251,7 @@ DOC_END
 
 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
@@ -2266,6 +2267,8 @@ DOC_START
 	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: emulate_httpd_log
@@ -3342,11 +3345,11 @@ COMMENT_END
 
 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
@@ -3374,21 +3377,22 @@ DOC_END
 
 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
@@ -3398,6 +3402,7 @@ DOC_START
 	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
@@ -4018,12 +4023,12 @@ COMMENT_END
 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
@@ -4402,15 +4407,22 @@ TYPE: string
 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.
-
-	The squid developers are interested in making squid available in
-	a wide variety of languages. If you are making translations for a
-	langauge that Squid does not currently provide please consider
-	contributing your translation back to the project.
+	
+    The squid developers are interested in making squid available in
+    a wide variety of languages. If you are making translations for a
+    langauge that Squid does not currently provide please consider
+    contributing your translation back to the project.
+error_directory @DEFAULT_ERROR_DIR@
 DOC_END
 
 NAME: error_map


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-7/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	2 Aug 2007 10:07:22 -0000	1.28
+++ .cvsignore	7 Sep 2007 16:36:44 -0000	1.29
@@ -1 +1 @@
-squid-2.6.STABLE14.tar.bz2
+squid-2.6.STABLE16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-7/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	2 Aug 2007 10:07:22 -0000	1.30
+++ sources	7 Sep 2007 16:36:44 -0000	1.31
@@ -1 +1 @@
-eadb138d48320df8b99349121159c6bf  squid-2.6.STABLE14.tar.bz2
+849bee6f269e6c773f215fd4b41de0e3  squid-2.6.STABLE16.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-7/squid.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- squid.spec	2 Aug 2007 10:07:22 -0000	1.86
+++ squid.spec	7 Sep 2007 16:36:44 -0000	1.87
@@ -4,7 +4,7 @@
 
 Summary:  The Squid proxy caching server
 Name:     squid
-Version:  2.6.STABLE14
+Version:  2.6.STABLE16
 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.6.STABLE14-config.patch
+Patch201: squid-2.6.STABLE16-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
+* Fri Sep  7 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE16-1
+- upgrade to latest upstream 2.6.STABLE14
+
 * 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 DELETED ---


