From: Adam Gołębiowski <adamg@pld-linux.org>
Date: Wed, 7 Jul 2021 18:21:01 +0000 (+0000)
Subject: - rediffed
X-Git-Tag: auto/th/squid-4.16-1~2
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=e444bacf3d2d2a5c3a248e26f839ea811a1a002c;p=packages%2Fsquid.git

- rediffed
---

diff --git a/squid-cachemgr-webapp.patch b/squid-cachemgr-webapp.patch
index f36beba..ce612c0 100644
--- 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 84f3585..73fed54 100644
--- 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