summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-www/squid/files/squid-2.4.2s-gentoo.diff')
-rw-r--r--net-www/squid/files/squid-2.4.2s-gentoo.diff89
1 files changed, 0 insertions, 89 deletions
diff --git a/net-www/squid/files/squid-2.4.2s-gentoo.diff b/net-www/squid/files/squid-2.4.2s-gentoo.diff
deleted file mode 100644
index 6112183d0bc0..000000000000
--- a/net-www/squid/files/squid-2.4.2s-gentoo.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -ur squid-2.4.STABLE2.orig/src/Makefile.in squid-2.4.STABLE2/src/Makefile.in
---- squid-2.4.STABLE2.orig/src/Makefile.in Wed Apr 4 02:01:12 2001
-+++ squid-2.4.STABLE2/src/Makefile.in Wed Oct 24 22:31:22 2001
-@@ -37,16 +37,16 @@
- DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
- DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
- DEFAULT_DNSSERVER = $(libexecdir)/$(DNSSERVER_EXE)
--DEFAULT_CACHE_LOG = $(localstatedir)/logs/cache.log
--DEFAULT_ACCESS_LOG = $(localstatedir)/logs/access.log
--DEFAULT_STORE_LOG = $(localstatedir)/logs/store.log
--DEFAULT_PID_FILE = $(localstatedir)/logs/squid.pid
--DEFAULT_SWAP_DIR = $(localstatedir)/cache
-+DEFAULT_CACHE_LOG = $(localstatedir)/log/squid/cache.log
-+DEFAULT_ACCESS_LOG = $(localstatedir)/log/squid/access.log
-+DEFAULT_STORE_LOG = $(localstatedir)/log/squid/store.log
-+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
-+DEFAULT_SWAP_DIR = $(localstatedir)/spool/squid
- DEFAULT_PINGER = $(libexecdir)/$(PINGER_EXE)
- DEFAULT_UNLINKD = $(libexecdir)/$(UNLINKD_EXE)
- DEFAULT_DISKD = $(libexecdir)/$(DISKD_EXE)
--DEFAULT_ICON_DIR = $(sysconfdir)/icons
--DEFAULT_ERROR_DIR = $(sysconfdir)/errors
-+DEFAULT_ICON_DIR = $(libexecdir)/icons
-+DEFAULT_ERROR_DIR = $(libexecdir)/errors
- DEFAULT_MIB_PATH = $(sysconfdir)/mib.txt
-
- CC = @CC@
-@@ -326,11 +326,6 @@
- echo "mkdir $(localstatedir)"; \
- mkdir -p $(localstatedir); \
- fi
-- -@if test ! -d $(localstatedir)/logs; then \
-- echo "mkdir $(localstatedir)/logs"; \
-- mkdir -p $(localstatedir)/logs; \
-- fi
--
- # Michael Lupp <mike@nemesis.saar.de> wants to know about additions
- # to the install target.
- install: all install-mkdirs
-diff -ur squid-2.4.STABLE2.orig/icons/Makefile.in squid-2.4.STABLE2/icons/Makefile.in
---- squid-2.4.STABLE2.orig/icons/Makefile.in Tue Jan 16 16:12:30 2001
-+++ squid-2.4.STABLE2/icons/Makefile.in Mon Oct 22 05:23:21 2001
-@@ -15,7 +15,7 @@
-
- INSTALL = @INSTALL@
- INSTALL_FILE = @INSTALL_DATA@
--DEFAULT_ICON_DIR = $(sysconfdir)/icons
-+DEFAULT_ICON_DIR = $(libexecdir)/icons
-
- ICONS = anthony-binhex.gif \
- anthony-bomb.gif \
-diff -ur squid-2.4.STABLE2.orig/src/cf.data.pre squid-2.4.STABLE2/src/cf.data.pre
---- squid-2.4.STABLE2.orig/src/cf.data.pre Wed Apr 4 02:01:12 2001
-+++ squid-2.4.STABLE2/src/cf.data.pre Mon Oct 22 05:25:59 2001
-@@ -1890,19 +1890,19 @@
-
- NAME: cache_effective_user
- TYPE: string
--DEFAULT: nobody
-+DEFAULT: squid
- LOC: Config.effectiveUser
- DOC_NONE
-
- NAME: cache_effective_group
- TYPE: string
--DEFAULT: nogroup
-+DEFAULT: squid
- LOC: Config.effectiveGroup
- DOC_START
-
- If the cache is run as root, it will change its effective/real
- UID/GID to the UID/GID specified below. The default is to
-- change to UID to nobody and GID to nogroup.
-+ change to UID to squid and GID to squid.
-
- If Squid is not started as root, the default is to keep the
- current UID/GID. Note that if Squid is not started as root then
-diff -ur squid-2.4.STABLE2.orig/src/defines.h squid-2.4.STABLE2/src/defines.h
---- squid-2.4.STABLE2.orig/src/defines.h Thu Jan 11 19:51:46 2001
-+++ squid-2.4.STABLE2/src/defines.h Mon Oct 22 05:27:01 2001
-@@ -219,7 +219,7 @@
- #define N_COUNT_HOUR_HIST (86400 * 3) / (60 * COUNT_INTERVAL)
-
- /* were to look for errors if config path fails */
--#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors"
-+#define DEFAULT_SQUID_ERROR_DIR "/usr/lib/squid/errors"
-
- /* gb_type operations */
- #define gb_flush_limit (0x3FFFFFFF)