- rediffed

diff --git a/squid-cachemgr-webapp.patch b/squid-cachemgr-webapp.patch
index f36beba4248948cc4d0d278030f40b707767a4af..ce612c08490bc1bde86429e4241dc3a7eddb041d 100644 (file)
--- a/squid-cachemgr-webapp.patch
+++ b/squid-cachemgr-webapp.patch
@@ -1,11 +1,11 @@
 --- squid-2.7.STABLE5/tools/Makefile.am~       2006-09-22 12:08:46.000000000 +0300
 +++ squid-2.7.STABLE5/tools/Makefile.am        2008-11-12 15:55:17.030499323 +0200
 @@ -39,7 +39,7 @@
- EXTRA_DIST = \
-       cachemgr.conf
+ 
+ ## ##### cachemgr.cgi  #####
  
 -DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
 +DEFAULT_CACHEMGR_CONFIG = /etc/webapps/cachemgr/cachemgr.conf
  
- $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
+ libexec_PROGRAMS = cachemgr$(CGIEXT)
  

diff --git a/squid-location.patch b/squid-location.patch
index 84f3585abb4c1bea95d1a8b83ed2a90e1c4ca4a5..73fed5464ffb3dd7aaf7244fea3c8cf13a557acb 100644 (file)
--- a/squid-location.patch
+++ b/squid-location.patch
@@ -15,8 +15,8 @@ diff -ur squid-2.6.STABLE19/QUICKSTART squid-2.6.STABLE19.new/QUICKSTART
  ==============================================================================
  
 @@ -26,7 +25,7 @@
-     always ask permission before adding a parent cache. See also the
-     never_direct/always_direct directives.
+     as after startup (typically "nobody" and "nogroup").  Do not use
+     "root", for security reasons.
  
 -cache_dir ufs /usr/local/squid/var/cache 100 16 256
 +cache_dir ufs /var/cache/squid 100 16 256