rpms/squid/devel squid-2.5.STABLE12-setenv.patch, NONE, 1.1 squid.spec, 1.45, 1.46

[fedora-cvs-commits at redhat.com]

Author: stransky

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25882

Modified Files:
	squid.spec 
Added Files:
	squid-2.5.STABLE12-setenv.patch 
Log Message:
setenv patch/rebuild for ssl

squid-2.5.STABLE12-setenv.patch:
 cache_cf.c |   10 !!!!!!!!!!
 1 files changed, 10 modifications(!)

--- NEW FILE squid-2.5.STABLE12-setenv.patch ---
Index: squid/src/cache_cf.c
diff -c squid/src/cache_cf.c:1.396.2.31 squid/src/cache_cf.c:1.396.2.32
*** squid/src/cache_cf.c:1.396.2.31	Wed Sep 28 15:42:33 2005
--- squid/src/cache_cf.c	Wed Oct 26 14:25:42 2005
***************
*** 440,447 ****
  		    Config.effectiveUser);
  	    Config2.effectiveUserID = pwd->pw_uid;
  	    Config2.effectiveGroupID = pwd->pw_gid;
! 	    if (pwd->pw_dir && *pwd->pw_dir)
! 		setenv("HOME", pwd->pw_dir, 1);
  	}
      } else {
  	Config2.effectiveUserID = geteuid();
--- 440,453 ----
  		    Config.effectiveUser);
  	    Config2.effectiveUserID = pwd->pw_uid;
  	    Config2.effectiveGroupID = pwd->pw_gid;
! #if HAVE_PUTENV
! 	    if (pwd->pw_dir && *pwd->pw_dir) {
! 		int len;
! 		char *env_str = xcalloc((len = strlen(pwd->pw_dir) + 6), 1);
! 		snprintf(env_str, len, "HOME=%s", pwd->pw_dir);
! 		putenv(env_str);
! 	    }
! #endif
  	}
      } else {
  	Config2.effectiveUserID = geteuid();


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- squid.spec	24 Oct 2005 13:54:41 -0000	1.45
+++ squid.spec	9 Nov 2005 09:05:14 -0000	1.46
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE11
-Release: 6
+Release: 7
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -31,6 +31,7 @@
 Patch109: squid-2.5.STABLE11-setcookie.patch
 Patch110: squid-2.5.STABLE11-rfc1738_do_escape.patch
 Patch111: squid-2.5.STABLE11-delaypool_3_255.patch
+Patch112: squid-2.5.STABLE12-setenv.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -76,6 +77,7 @@
 %patch109 -p1
 %patch110 -p1
 %patch111 -p1
+%patch112 -p1
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -332,6 +334,10 @@
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Wed Nov 9 2005  Martin Stransky <stransky at redhat.com> 7:2.5.STABLE11-7
+- rebuild for the new openssl
+- setenv patch
+
 * Mon Oct 24 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE11-6
 - fix for delay pool from upstream