rpms/squid/F-7 squid-2.6.STABLE16-config.patch, 1.1, 1.2 squid.spec, 1.88, 1.89

[Martin Nagy (mnagy)]

Author: mnagy

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

Modified Files:
	squid-2.6.STABLE16-config.patch squid.spec 
Log Message:
* Tue Mar 11 2008 Martin Nagy <mnagy at redhat.com> - 2.6.STABLE16-3
- set default of cache_effective_group to none (#252197)


squid-2.6.STABLE16-config.patch:

Index: squid-2.6.STABLE16-config.patch
===================================================================
RCS file: /cvs/extras/rpms/squid/F-7/squid-2.6.STABLE16-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squid-2.6.STABLE16-config.patch	7 Sep 2007 16:36:44 -0000	1.1
+++ squid-2.6.STABLE16-config.patch	13 Mar 2008 14:26:29 -0000	1.2
@@ -1,6 +1,6 @@
 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
++++ squid-2.6.STABLE16/src/cf.data.pre	2008-03-11 11:41:29.000000000 +0100
 @@ -692,6 +692,7 @@ http_access deny CONNECT !SSL_ports
  #http_access allow our_networks
  
@@ -41,7 +41,7 @@
  DOC_END
  
  NAME: mail_from
-@@ -3374,21 +3377,22 @@ DOC_END
+@@ -3374,12 +3377,12 @@ DOC_END
  
  NAME: cache_effective_user
  TYPE: string
@@ -56,26 +56,7 @@
  	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
+@@ -4018,12 +4021,12 @@ COMMENT_END
  NAME: snmp_port
  TYPE: ushort
  LOC: Config.Port.snmp
@@ -91,7 +72,7 @@
  DOC_END
  
  NAME: snmp_access
-@@ -4402,15 +4407,22 @@ TYPE: string
+@@ -4402,15 +4405,22 @@ TYPE: string
  LOC: Config.errorDirectory
  DEFAULT: @DEFAULT_ERROR_DIR@
  DOC_START


Index: squid.spec
===================================================================
RCS file: /cvs/extras/rpms/squid/F-7/squid.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- squid.spec	6 Dec 2007 11:55:48 -0000	1.88
+++ squid.spec	13 Mar 2008 14:26:29 -0000	1.89
@@ -5,7 +5,7 @@
 Summary:  The Squid proxy caching server
 Name:     squid
 Version:  2.6.STABLE16
-Release:  2%{?dist}
+Release:  3%{?dist}
 Epoch:    7
 License:  GPL
 Group:    System Environment/Daemons
@@ -34,7 +34,7 @@
 Patch205: squid-2.5.STABLE12-smb-path.patch
 Patch206: squid-2.6.STABLE5-fd-config.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Prereq: /sbin/chkconfig logrotate shadow-utils
 Requires: bash >= 2.0
 Requires(pre): shadow-utils
@@ -328,6 +328,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Mar 11 2008 Martin Nagy <mnagy at redhat.com> - 2.6.STABLE16-3
+- set default of cache_effective_group to none (#252197)
+
 * Thu Dec 06 2007 Martin Nagy <mnagy at redhat.com> - 7:2.6.STABLE16-1
 - Upstream patch to fix CVE-2007-6239 (#410181)