diff options
Diffstat (limited to 'www-proxy/squid/files/squid-2.5.3-gentoo.diff')
| -rw-r--r-- | www-proxy/squid/files/squid-2.5.3-gentoo.diff | 336 |
1 files changed, 0 insertions, 336 deletions
diff --git a/www-proxy/squid/files/squid-2.5.3-gentoo.diff b/www-proxy/squid/files/squid-2.5.3-gentoo.diff deleted file mode 100644 index f4ab4c7dbc49..000000000000 --- a/www-proxy/squid/files/squid-2.5.3-gentoo.diff +++ /dev/null @@ -1,336 +0,0 @@ -diff -uNr squid-2.5.STABLE3.orig/errors/Makefile.in squid-2.5.STABLE3/errors/Makefile.in ---- squid-2.5.STABLE3.orig/errors/Makefile.in 2003-02-11 21:02:09.000000000 -0500 -+++ squid-2.5.STABLE3/errors/Makefile.in 2003-06-03 01:23:51.000000000 -0400 -@@ -116,7 +116,7 @@ - install_sh = @install_sh@ - makesnmplib = @makesnmplib@ - --errordir = $(datadir)/errors -+errordir = $(libexecdir)/errors - - DEFAULT_ERROR_DIR = $(errordir) - -diff -uNr squid-2.5.STABLE3.orig/helpers/basic_auth/SMB/Makefile.in squid-2.5.STABLE3/helpers/basic_auth/SMB/Makefile.in ---- squid-2.5.STABLE3.orig/helpers/basic_auth/SMB/Makefile.in 2003-02-11 21:02:25.000000000 -0500 -+++ squid-2.5.STABLE3/helpers/basic_auth/SMB/Makefile.in 2003-06-03 01:23:51.000000000 -0400 -@@ -126,7 +126,7 @@ - makesnmplib = @makesnmplib@ - - SMB_AUTH_HELPER = smb_auth.sh --SAMBAPREFIX = /usr/local/samba -+SAMBAPREFIX = /usr - SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) - - libexec_SCRIPTS = $(SMB_AUTH_HELPER) -diff -uNr squid-2.5.STABLE3.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.5.STABLE3/helpers/basic_auth/SMB/smb_auth.sh ---- squid-2.5.STABLE3.orig/helpers/basic_auth/SMB/smb_auth.sh 2001-01-07 18:36:46.000000000 -0500 -+++ squid-2.5.STABLE3/helpers/basic_auth/SMB/smb_auth.sh 2003-06-03 01:23:51.000000000 -0400 -@@ -24,7 +24,7 @@ - read AUTHSHARE - read AUTHFILE - read SMBUSER --read SMBPASS -+read -r SMBPASS - - # Find domain controller - echo "Domain name: $DOMAINNAME" -@@ -47,7 +47,7 @@ - addropt="" - fi - echo "Query address options: $addropt" --dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` -+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` - echo "Domain controller IP address: $dcip" - [ -n "$dcip" ] || exit 1 - -diff -uNr squid-2.5.STABLE3.orig/icons/Makefile.in squid-2.5.STABLE3/icons/Makefile.in ---- squid-2.5.STABLE3.orig/icons/Makefile.in 2003-05-21 20:15:40.000000000 -0400 -+++ squid-2.5.STABLE3/icons/Makefile.in 2003-06-03 01:23:51.000000000 -0400 -@@ -144,7 +144,7 @@ - anthony-xpm.gif - - --icondir = $(datadir)/icons -+icondir = $(libexecdir)/icons - icon_DATA = $(ICON1) $(ICON2) - EXTRA_DIST = $(ICON1) $(ICON2) icons.shar - DISTCLEANFILES = -diff -uNr squid-2.5.STABLE3.orig/src/Makefile.in squid-2.5.STABLE3/src/Makefile.in ---- squid-2.5.STABLE3.orig/src/Makefile.in 2003-02-11 21:03:14.000000000 -0500 -+++ squid-2.5.STABLE3/src/Makefile.in 2003-06-03 01:23:51.000000000 -0400 -@@ -374,18 +374,18 @@ - DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf - DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf - DEFAULT_DNSSERVER = $(libexecdir)/dnsserver$(EXEEXT) --DEFAULT_LOG_PREFIX = $(localstatedir)/logs --DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log --DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log --DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log --DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid --DEFAULT_SWAP_DIR = $(localstatedir)/cache -+DEFAULT_LOG_PREFIX = $(localstatedir)/log -+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)/cache/squid - DEFAULT_PINGER = $(libexecdir)/pinger$(EXEEXT) - DEFAULT_UNLINKD = $(libexecdir)/unlinkd$(EXEEXT) - DEFAULT_DISKD = $(libexecdir)/diskd$(EXEEXT) --DEFAULT_ICON_DIR = $(datadir)/icons --DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@ --DEFAULT_MIB_PATH = $(datadir)/mib.txt -+DEFAULT_ICON_DIR = $(libexecdir)/icons -+DEFAULT_ERROR_DIR = $(sysconfdir)/errors -+DEFAULT_MIB_PATH = $(libexecdir)/mib.txt - - DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" - -@@ -836,12 +836,12 @@ - uninstall-info-am: - install-dataDATA: $(data_DATA) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(datadir) -+ $(mkinstalldirs) $(DESTDIR)$(libexecdir) - @list='$(data_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f"; \ -- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f; \ -+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libexecdir)/$$f"; \ -+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libexecdir)/$$f; \ - done - - uninstall-dataDATA: -diff -uNr squid-2.5.STABLE3.orig/src/cf.data.pre squid-2.5.STABLE3/src/cf.data.pre ---- squid-2.5.STABLE3.orig/src/cf.data.pre 2003-05-21 10:34:38.000000000 -0400 -+++ squid-2.5.STABLE3/src/cf.data.pre 2003-06-03 01:28:47.000000000 -0400 -@@ -156,12 +156,12 @@ - NAME: htcp_port - IFDEF: USE_HTCP - TYPE: ushort --DEFAULT: 4827 -+DEFAULT: 0 - LOC: Config.Port.htcp - DOC_START - The port number where Squid sends and receives HTCP queries to -- and from neighbor caches. Default is 4827. To disable use -- "0". -+ and from neighbor caches. To turn it on you want to set it to -+ 4827. By default it is set to "0" (disabled). - DOC_END - - -@@ -2032,6 +2032,8 @@ - acl Safe_ports port 488 # gss-http - acl Safe_ports port 591 # filemaker - acl Safe_ports port 777 # multiling http -+acl Safe_ports port 901 # SWAT -+acl purge method PURGE - acl CONNECT method CONNECT - NOCOMMENT_END - DOC_END -@@ -2065,6 +2067,9 @@ - # Only allow cachemgr access from localhost - http_access allow manager localhost - http_access deny manager -+# Only allow purge requests from localhost -+http_access allow purge localhost -+http_access deny purge - # Deny requests to unknown ports - http_access deny !Safe_ports - # Deny CONNECT to other than SSL ports -@@ -2083,6 +2088,9 @@ - #acl our_networks src 192.168.1.0/24 192.168.2.0/24 - #http_access allow our_networks - -+# Allow the localhost to have access by default -+http_access allow localhost -+ - # And finally deny all other access to this proxy - http_access deny all - NOCOMMENT_END -@@ -2299,7 +2307,7 @@ - - NAME: cache_mgr - TYPE: string --DEFAULT: webmaster -+DEFAULT: root - LOC: Config.adminEmail - DOC_START - Email-address of local cache manager who will receive -@@ -2309,20 +2317,20 @@ - - NAME: cache_effective_user - TYPE: string --DEFAULT: nobody -+DEFAULT: squid - LOC: Config.effectiveUser - DOC_NONE - - NAME: cache_effective_group - TYPE: string --DEFAULT: none -+DEFAULT: squid - LOC: Config.effectiveGroup - DOC_START - - If you start Squid 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. If you define cache_effective_user, -- but not cache_effective_group, Squid sets the GID the -+ UID/GID to the ones specified below. The default is to -+ change to UID squid. If you define cache_effective_user, -+ but not cache_effective_group, Squid sets the GID to the - effective user's default group ID (taken from the password - file). - -@@ -3085,7 +3093,11 @@ - If you wish to create your own versions of the default - (English) error files, either to customize them to suit your - language or company copy the template English files to another -- directory and point this tag at them. -+ directory where the error files are read from. -+ /usr/lib/squid/errors contains sets of error files -+ in different languages. The default error directory -+ is /etc/squid/errors, which is a link to one of these -+ error sets. - DOC_END - - NAME: minimum_retry_timeout -@@ -3127,12 +3139,15 @@ - NAME: snmp_port - TYPE: ushort - LOC: Config.Port.snmp --DEFAULT: 3401 -+DEFAULT: 0 - IFDEF: SQUID_SNMP - DOC_START - Squid can now serve statistics and status information via SNMP. - By default it listens to port 3401 on the machine. If you don't - wish to use SNMP, set this to "0". -+ -+ Note: on Gentoo Linux, the default is zero - you need to -+ set it to 3401 to enable it. - DOC_END - - NAME: snmp_access -diff -uNr squid-2.5.STABLE3.orig/src/debug.c squid-2.5.STABLE3/src/debug.c ---- squid-2.5.STABLE3.orig/src/debug.c 2001-12-17 13:01:54.000000000 -0500 -+++ squid-2.5.STABLE3/src/debug.c 2003-06-03 01:23:51.000000000 -0400 -@@ -200,9 +200,9 @@ - } - debugOpenLog(logfile); - --#if HAVE_SYSLOG && defined(LOG_LOCAL4) -+#if HAVE_SYSLOG - if (opt_syslog_enable) -- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); - #endif /* HAVE_SYSLOG */ - - } -diff -uNr squid-2.5.STABLE3.orig/src/defines.h squid-2.5.STABLE3/src/defines.h ---- squid-2.5.STABLE3.orig/src/defines.h 2002-08-08 16:17:39.000000000 -0400 -+++ squid-2.5.STABLE3/src/defines.h 2003-06-03 01:23:51.000000000 -0400 -@@ -219,7 +219,7 @@ - - /* were to look for errors if config path fails */ - #ifndef DEFAULT_SQUID_ERROR_DIR --#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors" -+#define DEFAULT_SQUID_ERROR_DIR "/usr/lib/squid/errors/English" - #endif - - /* gb_type operations */ -diff -uNr squid-2.5.STABLE3.orig/src/main.c squid-2.5.STABLE3/src/main.c ---- squid-2.5.STABLE3.orig/src/main.c 2003-05-05 20:24:14.000000000 -0400 -+++ squid-2.5.STABLE3/src/main.c 2003-06-03 01:23:51.000000000 -0400 -@@ -326,6 +326,21 @@ - asnFreeMemory(); - } - -+#if USE_UNLINKD -+static int -+needUnlinkd(void) -+{ -+ int i; -+ int r = 0; -+ for (i = 0; i < Config.cacheSwap.n_configured; i++) { -+ if (strcmp(Config.cacheSwap.swapDirs[i].type, "ufs") == 0 || -+ strcmp(Config.cacheSwap.swapDirs[i].type, "diskd") == 0) -+ r++; -+ } -+ return r; -+} -+#endif -+ - static void - mainReconfigure(void) - { -@@ -351,6 +366,7 @@ - redirectShutdown(); - authenticateShutdown(); - externalAclShutdown(); -+ unlinkdClose(); - storeDirCloseSwapLogs(); - storeLogClose(); - accessLogClose(); -@@ -381,6 +397,9 @@ - #if USE_WCCP - wccpInit(); - #endif -+#if USE_UNLINKD -+ if (needUnlinkd()) unlinkdInit(); -+#endif - serverConnectionsOpen(); - if (theOutIcpConnection >= 0) { - if (!Config2.Accel.on || Config.onoff.accel_with_proxy) -@@ -524,7 +543,7 @@ - - if (!configured_once) { - #if USE_UNLINKD -- unlinkdInit(); -+ if (needUnlinkd()) unlinkdInit(); - #endif - urlInitialize(); - cachemgrInit(); -@@ -858,7 +877,7 @@ - int nullfd; - if (*(argv[0]) == '(') - return; -- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); - if ((pid = fork()) < 0) - syslog(LOG_ALERT, "fork failed: %s", xstrerror()); - else if (pid > 0) -@@ -893,14 +912,14 @@ - mainStartScript(argv[0]); - if ((pid = fork()) == 0) { - /* child */ -- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); - prog = xstrdup(argv[0]); - argv[0] = xstrdup("(squid)"); - execvp(prog, argv); - syslog(LOG_ALERT, "execvp failed: %s", xstrerror()); - } - /* parent */ -- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); - syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); - time(&start); - squid_signal(SIGINT, SIG_IGN, SA_RESTART); -diff -uNr squid-2.5.STABLE3.orig/src/url.c squid-2.5.STABLE3/src/url.c ---- squid-2.5.STABLE3.orig/src/url.c 2003-01-18 09:16:49.000000000 -0500 -+++ squid-2.5.STABLE3/src/url.c 2003-06-03 01:23:51.000000000 -0400 -@@ -312,8 +312,8 @@ - return NULL; - } - #endif -- if (Config.appendDomain && !strchr(host, '.')) -- strncat(host, Config.appendDomain, SQUIDHOSTNAMELEN); -+ if (Config.appendDomain && !strchr(host, '.') && strcasecmp(host, "localhost") != 0) -+ strncat(host, Config.appendDomain, SQUIDHOSTNAMELEN); - /* remove trailing dots from hostnames */ - while ((l = strlen(host)) > 0 && host[--l] == '.') - host[l] = '\0'; |