From cd5e79635843b19c7d61adc5ec8b15f2f25bd786 Mon Sep 17 00:00:00 2001
From: Martin Nagy <mnagy@fedoraproject.org>
Date: Mar 13 2008 13:26:09 +0000
Subject: - set default of cache_effective_group to none (#252197)


---

diff --git a/squid-2.6.STABLE16-config.patch b/squid-2.6.STABLE16-config.patch
index 39c0804..c3590cf 100644
--- a/squid-2.6.STABLE16-config.patch
+++ b/squid-2.6.STABLE16-config.patch
@@ -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
+diff -up squid-2.6.STABLE17/src/cf.data.pre.config squid-2.6.STABLE17/src/cf.data.pre
+--- squid-2.6.STABLE17/src/cf.data.pre.config	2007-11-26 12:03:45.000000000 +0100
++++ squid-2.6.STABLE17/src/cf.data.pre	2008-03-11 11:39:23.000000000 +0100
 @@ -692,6 +692,7 @@ http_access deny CONNECT !SSL_ports
  #http_access allow our_networks
  
@@ -9,7 +9,7 @@ diff -up squid-2.6.STABLE16/src/cf.data.pre.config squid-2.6.STABLE16/src/cf.dat
  http_access deny all
  NOCOMMENT_END
  DOC_END
-@@ -2250,7 +2251,7 @@ DOC_END
+@@ -2225,7 +2226,7 @@ DOC_END
  
  NAME: logfile_rotate
  TYPE: int
@@ -18,7 +18,7 @@ diff -up squid-2.6.STABLE16/src/cf.data.pre.config squid-2.6.STABLE16/src/cf.dat
  LOC: Config.Log.rotateNumber
  DOC_START
  	Specifies the number of logfile rotations to make when you
-@@ -2266,6 +2267,8 @@ DOC_START
+@@ -2241,6 +2242,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>'.
@@ -27,7 +27,7 @@ diff -up squid-2.6.STABLE16/src/cf.data.pre.config squid-2.6.STABLE16/src/cf.dat
  DOC_END
  
  NAME: emulate_httpd_log
-@@ -3342,11 +3345,11 @@ COMMENT_END
+@@ -3356,11 +3359,11 @@ COMMENT_END
  
  NAME: cache_mgr
  TYPE: string
@@ -41,7 +41,7 @@ diff -up squid-2.6.STABLE16/src/cf.data.pre.config squid-2.6.STABLE16/src/cf.dat
  DOC_END
  
  NAME: mail_from
-@@ -3374,21 +3377,22 @@ DOC_END
+@@ -3389,12 +3392,12 @@ DOC_END
  
  NAME: cache_effective_user
  TYPE: string
@@ -56,26 +56,7 @@ diff -up squid-2.6.STABLE16/src/cf.data.pre.config squid-2.6.STABLE16/src/cf.dat
  	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
+@@ -4031,12 +4034,12 @@ COMMENT_END
  NAME: snmp_port
  TYPE: ushort
  LOC: Config.Port.snmp
@@ -91,7 +72,7 @@ diff -up squid-2.6.STABLE16/src/cf.data.pre.config squid-2.6.STABLE16/src/cf.dat
  DOC_END
  
  NAME: snmp_access
-@@ -4402,15 +4407,22 @@ TYPE: string
+@@ -4430,15 +4433,22 @@ TYPE: string
  LOC: Config.errorDirectory
  DEFAULT: @DEFAULT_ERROR_DIR@
  DOC_START
diff --git a/squid.spec b/squid.spec
index be585f1..eba4bdd 100644
--- a/squid.spec
+++ b/squid.spec
@@ -5,7 +5,7 @@
 Summary:  The Squid proxy caching server
 Name:     squid
 Version:  2.6.STABLE17
-Release:  1%{?dist}
+Release:  2%{?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
 Patch206: squid-2.6.STABLE16-fd.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 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Mar 11 2008 Martin Nagy <mnagy@redhat.com> - 2.6.STABLE17-2
+- set default of cache_effective_group to none (#252197)
+
 * Tue Dec 06 2007 Martin Nagy <mnagy@redhat.com> - 2.6.STABLE17-1
 - upgrade to latest upstream 2.6.STABLE17