Update to Squid-3.1
- IPv6 support - NTLM passthru - Follow X-Forwarded-For - and more
This commit is contained in:
Henrik Nordström
parent
103c830c6a
commit
394cab172a
@ -1 +1,3 @@
|
||||
squid-3.0.STABLE18.tar.bz2
|
||||
squid-3.1.0.13.tar.bz2
|
||||
squid-3.1.0.13.tar.bz2.asc
|
||||
b9694.patch
|
||||
|
||||
@ -1 +0,0 @@
|
||||
squid-3_0_STABLE13-1_fc9:HEAD:squid-3.0.STABLE13-1.fc9.src.rpm:1233879357
|
||||
4
sources
4
sources
@ -1 +1,3 @@
|
||||
ad1e0bbb424c2f69195ae68b9baa99d6 squid-3.0.STABLE18.tar.bz2
|
||||
a7e3f6c35853a8ad200ba448004417da squid-3.1.0.13.tar.bz2
|
||||
56e2fc1fc8bc3c24d77daf4d5bb8c768 squid-3.1.0.13.tar.bz2.asc
|
||||
c764a5ffa0171ffadf61011dc8dd4cad b9694.patch
|
||||
|
||||
@ -1,295 +0,0 @@
|
||||
diff -up squid-3.0.STABLE15/errors/Makefile.am.build squid-3.0.STABLE15/errors/Makefile.am
|
||||
--- squid-3.0.STABLE15/errors/Makefile.am.build 2009-05-06 13:11:29.000000000 +0200
|
||||
+++ squid-3.0.STABLE15/errors/Makefile.am 2009-05-10 10:38:44.000000000 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
# $Id: Makefile.am,v 1.14.2.1 2008/02/27 10:55:13 amosjeffries Exp $
|
||||
#
|
||||
|
||||
-errordir = $(datadir)/errors
|
||||
+errordir = $(pkgdatadir)/errors
|
||||
|
||||
|
||||
##dist-hook eveything
|
||||
diff -up squid-3.0.STABLE15/errors/Makefile.in.build squid-3.0.STABLE15/errors/Makefile.in
|
||||
--- squid-3.0.STABLE15/errors/Makefile.in.build 2009-05-06 13:11:29.000000000 +0200
|
||||
+++ squid-3.0.STABLE15/errors/Makefile.in 2009-05-10 10:45:09.000000000 +0200
|
||||
@@ -218,7 +218,7 @@ target_alias = @target_alias@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
-errordir = $(datadir)/errors
|
||||
+errordir = $(pkgdatadir)/errors
|
||||
DEFAULT_ERROR_DIR = $(errordir)
|
||||
INSTALL_LANGUAGES = templates @ERR_LANGUAGES@
|
||||
LANGUAGES = \
|
||||
diff -up squid-3.0.STABLE15/icons/Makefile.am.build squid-3.0.STABLE15/icons/Makefile.am
|
||||
--- squid-3.0.STABLE15/icons/Makefile.am.build 2009-05-06 13:11:36.000000000 +0200
|
||||
+++ squid-3.0.STABLE15/icons/Makefile.am 2009-05-10 10:38:44.000000000 +0200
|
||||
@@ -29,7 +29,7 @@ ICONS = anthony-binhex.gif \
|
||||
anthony-xbm.gif \
|
||||
anthony-xpm.gif
|
||||
|
||||
-icondir = $(datadir)/icons
|
||||
+icondir = $(pkgdatadir)/icons
|
||||
icon_DATA = $(ICONS)
|
||||
EXTRA_DIST = $(ICONS)
|
||||
DISTCLEANFILES =
|
||||
diff -up squid-3.0.STABLE15/icons/Makefile.in.build squid-3.0.STABLE15/icons/Makefile.in
|
||||
--- squid-3.0.STABLE15/icons/Makefile.in.build 2009-05-06 13:11:36.000000000 +0200
|
||||
+++ squid-3.0.STABLE15/icons/Makefile.in 2009-05-10 10:45:13.000000000 +0200
|
||||
@@ -255,7 +255,7 @@ ICONS = anthony-binhex.gif \
|
||||
anthony-xbm.gif \
|
||||
anthony-xpm.gif
|
||||
|
||||
-icondir = $(datadir)/icons
|
||||
+icondir = $(pkgdatadir)/icons
|
||||
icon_DATA = $(ICONS)
|
||||
EXTRA_DIST = $(ICONS)
|
||||
DISTCLEANFILES =
|
||||
diff -up squid-3.0.STABLE15/src/Makefile.am.build squid-3.0.STABLE15/src/Makefile.am
|
||||
--- squid-3.0.STABLE15/src/Makefile.am.build 2009-05-06 13:11:40.000000000 +0200
|
||||
+++ squid-3.0.STABLE15/src/Makefile.am 2009-05-10 10:38:44.000000000 +0200
|
||||
@@ -928,9 +928,7 @@ BUILT_SOURCES = \
|
||||
|
||||
sysconf_DATA = \
|
||||
squid.conf.default \
|
||||
- mime.conf.default
|
||||
-
|
||||
-data_DATA = \
|
||||
+ mime.conf.default \
|
||||
mib.txt
|
||||
|
||||
LDADD = libsquid.la libauth.la -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@
|
||||
@@ -991,18 +989,18 @@ DEFAULT_PREFIX = $(prefix)
|
||||
DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
|
||||
DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
|
||||
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
|
||||
-DEFAULT_LOG_PREFIX = $(localstatedir)/logs
|
||||
+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
|
||||
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_PID_FILE = $(localstatedir)/run/squid.pid
|
||||
+DEFAULT_SWAP_DIR = $(localstatedir)/spool/squid
|
||||
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
|
||||
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
|
||||
DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
|
||||
-DEFAULT_ICON_DIR = $(datadir)/icons
|
||||
-DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
|
||||
-DEFAULT_MIB_PATH = $(datadir)/mib.txt
|
||||
+DEFAULT_ICON_DIR = $(pkgdatadir)/icons
|
||||
+DEFAULT_ERROR_DIR = $(pkgdatadir)/errors/@ERR_DEFAULT_LANGUAGE@
|
||||
+DEFAULT_MIB_PATH = $(sysconfdir)/mib.txt
|
||||
DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
|
||||
|
||||
DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
|
||||
@@ -1065,7 +1063,7 @@ cf.data: cf.data.pre Makefile
|
||||
repl_modules.cc: repl_modules.sh Makefile
|
||||
$(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc
|
||||
|
||||
-install-data-local: install-sysconfDATA install-dataDATA
|
||||
+install-data-local: install-sysconfDATA
|
||||
@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
|
||||
echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
|
||||
else \
|
||||
@@ -1078,6 +1076,12 @@ install-data-local: install-sysconfDATA
|
||||
echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
|
||||
$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
|
||||
fi
|
||||
+ @if test -f $(DESTDIR)$(DEFAULT_MIB_PATH) ; then \
|
||||
+ echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIB_PATH)" ; \
|
||||
+ else \
|
||||
+ echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_MIB_PATH)"; \
|
||||
+ $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_MIB_PATH); \
|
||||
+ fi
|
||||
$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
|
||||
|
||||
uninstall-local:
|
||||
@@ -1085,6 +1089,10 @@ uninstall-local:
|
||||
echo "rm -f $(DESTDIR)$(DEFAULT_MIME_TABLE)"; \
|
||||
$(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \
|
||||
fi
|
||||
+ @if test -f $(DESTDIR)$(DEFAULT_MIB_PATH) ; then \
|
||||
+ echo "rm -f $(DESTDIR)$(DEFAULT_MIB_PATH)"; \
|
||||
+ $(RM) -f $(DESTDIR)$(DEFAULT_MIB_PATH); \
|
||||
+ fi
|
||||
|
||||
# Don't automatically uninstall config files
|
||||
# @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
|
||||
diff -up squid-3.0.STABLE15/src/Makefile.in.build squid-3.0.STABLE15/src/Makefile.in
|
||||
--- squid-3.0.STABLE15/src/Makefile.in.build 2009-05-06 13:11:40.000000000 +0200
|
||||
+++ squid-3.0.STABLE15/src/Makefile.in 2009-05-10 10:45:15.000000000 +0200
|
||||
@@ -136,8 +136,7 @@ libsquid_la_LIBADD =
|
||||
am_libsquid_la_OBJECTS = comm.lo IPInterception.lo
|
||||
libsquid_la_OBJECTS = $(am_libsquid_la_OBJECTS)
|
||||
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
|
||||
- "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(datadir)" \
|
||||
- "$(DESTDIR)$(sysconfdir)"
|
||||
+ "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sysconfdir)"
|
||||
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
||||
@ENABLE_PINGER_TRUE@am__EXEEXT_1 = pinger$(EXEEXT)
|
||||
@USE_DNSSERVER_TRUE@am__EXEEXT_2 = dnsserver$(EXEEXT)
|
||||
@@ -1576,9 +1575,8 @@ am__vpath_adj = case $$p in \
|
||||
*) f=$$p;; \
|
||||
esac;
|
||||
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
||||
-dataDATA_INSTALL = $(INSTALL_DATA)
|
||||
sysconfDATA_INSTALL = $(INSTALL_DATA)
|
||||
-DATA = $(data_DATA) $(sysconf_DATA)
|
||||
+DATA = $(sysconf_DATA)
|
||||
HEADERS = $(noinst_HEADERS)
|
||||
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
|
||||
distclean-recursive maintainer-clean-recursive
|
||||
@@ -2572,9 +2570,7 @@ BUILT_SOURCES = \
|
||||
|
||||
sysconf_DATA = \
|
||||
squid.conf.default \
|
||||
- mime.conf.default
|
||||
-
|
||||
-data_DATA = \
|
||||
+ mime.conf.default \
|
||||
mib.txt
|
||||
|
||||
LDADD = libsquid.la libauth.la -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@
|
||||
@@ -2632,18 +2628,18 @@ DEFAULT_PREFIX = $(prefix)
|
||||
DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
|
||||
DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
|
||||
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
|
||||
-DEFAULT_LOG_PREFIX = $(localstatedir)/logs
|
||||
+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
|
||||
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_PID_FILE = $(localstatedir)/run/squid.pid
|
||||
+DEFAULT_SWAP_DIR = $(localstatedir)/spool/squid
|
||||
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
|
||||
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
|
||||
DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
|
||||
-DEFAULT_ICON_DIR = $(datadir)/icons
|
||||
-DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
|
||||
-DEFAULT_MIB_PATH = $(datadir)/mib.txt
|
||||
+DEFAULT_ICON_DIR = $(pkgdatadir)/icons
|
||||
+DEFAULT_ERROR_DIR = $(pkgdatadir)/errors/@ERR_DEFAULT_LANGUAGE@
|
||||
+DEFAULT_MIB_PATH = $(sysconfdir)/mib.txt
|
||||
DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
|
||||
|
||||
# Don't automatically uninstall config files
|
||||
@@ -5020,23 +5016,6 @@ clean-libtool:
|
||||
-rm -rf .libs _libs
|
||||
-rm -rf DiskIO/DiskDaemon/.libs DiskIO/DiskDaemon/_libs
|
||||
-rm -rf tests/.libs tests/_libs
|
||||
-install-dataDATA: $(data_DATA)
|
||||
- @$(NORMAL_INSTALL)
|
||||
- test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)"
|
||||
- @list='$(data_DATA)'; for p in $$list; do \
|
||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
|
||||
- $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
|
||||
- done
|
||||
-
|
||||
-uninstall-dataDATA:
|
||||
- @$(NORMAL_UNINSTALL)
|
||||
- @list='$(data_DATA)'; for p in $$list; do \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
|
||||
- rm -f "$(DESTDIR)$(datadir)/$$f"; \
|
||||
- done
|
||||
install-sysconfDATA: $(sysconf_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
|
||||
@@ -5310,7 +5289,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRAR
|
||||
$(HEADERS)
|
||||
installdirs: installdirs-recursive
|
||||
installdirs-am:
|
||||
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(sysconfdir)"; do \
|
||||
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sysconfdir)"; do \
|
||||
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||
done
|
||||
install: $(BUILT_SOURCES)
|
||||
@@ -5397,7 +5376,7 @@ info: info-recursive
|
||||
|
||||
info-am:
|
||||
|
||||
-install-data-am: install-data-local install-dataDATA
|
||||
+install-data-am: install-data-local
|
||||
|
||||
install-dvi: install-dvi-recursive
|
||||
|
||||
@@ -5434,9 +5413,8 @@ ps: ps-recursive
|
||||
|
||||
ps-am:
|
||||
|
||||
-uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA \
|
||||
- uninstall-libexecPROGRAMS uninstall-local \
|
||||
- uninstall-sbinPROGRAMS uninstall-sysconfDATA
|
||||
+uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS \
|
||||
+ uninstall-local uninstall-sbinPROGRAMS uninstall-sysconfDATA
|
||||
|
||||
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
|
||||
install-strip
|
||||
@@ -5449,17 +5427,16 @@ uninstall-am: uninstall-binPROGRAMS unin
|
||||
distclean distclean-compile distclean-generic \
|
||||
distclean-libtool distclean-tags distdir dvi dvi-am html \
|
||||
html-am info info-am install install-am install-binPROGRAMS \
|
||||
- install-data install-data-am install-data-local \
|
||||
- install-dataDATA install-dvi install-dvi-am install-exec \
|
||||
- install-exec-am install-html install-html-am install-info \
|
||||
- install-info-am install-libexecPROGRAMS install-man \
|
||||
- install-pdf install-pdf-am install-ps install-ps-am \
|
||||
- install-sbinPROGRAMS install-strip install-sysconfDATA \
|
||||
- installcheck installcheck-am installdirs installdirs-am \
|
||||
- maintainer-clean maintainer-clean-generic mostlyclean \
|
||||
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
|
||||
- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
|
||||
- uninstall-binPROGRAMS uninstall-dataDATA \
|
||||
+ install-data install-data-am install-data-local install-dvi \
|
||||
+ install-dvi-am install-exec install-exec-am install-html \
|
||||
+ install-html-am install-info install-info-am \
|
||||
+ install-libexecPROGRAMS install-man install-pdf install-pdf-am \
|
||||
+ install-ps install-ps-am install-sbinPROGRAMS install-strip \
|
||||
+ install-sysconfDATA installcheck installcheck-am installdirs \
|
||||
+ installdirs-am maintainer-clean maintainer-clean-generic \
|
||||
+ mostlyclean mostlyclean-compile mostlyclean-generic \
|
||||
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
|
||||
+ uninstall uninstall-am uninstall-binPROGRAMS \
|
||||
uninstall-libexecPROGRAMS uninstall-local \
|
||||
uninstall-sbinPROGRAMS uninstall-sysconfDATA
|
||||
|
||||
@@ -5519,7 +5496,7 @@ cf.data: cf.data.pre Makefile
|
||||
repl_modules.cc: repl_modules.sh Makefile
|
||||
$(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc
|
||||
|
||||
-install-data-local: install-sysconfDATA install-dataDATA
|
||||
+install-data-local: install-sysconfDATA
|
||||
@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
|
||||
echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
|
||||
else \
|
||||
@@ -5532,6 +5509,12 @@ install-data-local: install-sysconfDATA
|
||||
echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
|
||||
$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
|
||||
fi
|
||||
+ @if test -f $(DESTDIR)$(DEFAULT_MIB_PATH) ; then \
|
||||
+ echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIB_PATH)" ; \
|
||||
+ else \
|
||||
+ echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_MIB_PATH)"; \
|
||||
+ $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_MIB_PATH); \
|
||||
+ fi
|
||||
$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
|
||||
|
||||
uninstall-local:
|
||||
@@ -5539,6 +5522,10 @@ uninstall-local:
|
||||
echo "rm -f $(DESTDIR)$(DEFAULT_MIME_TABLE)"; \
|
||||
$(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \
|
||||
fi
|
||||
+ @if test -f $(DESTDIR)$(DEFAULT_MIB_PATH) ; then \
|
||||
+ echo "rm -f $(DESTDIR)$(DEFAULT_MIB_PATH)"; \
|
||||
+ $(RM) -f $(DESTDIR)$(DEFAULT_MIB_PATH); \
|
||||
+ fi
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
@ -1,62 +0,0 @@
|
||||
diff -up squid-3.0.STABLE9/src/cf.data.pre.config squid-3.0.STABLE9/src/cf.data.pre
|
||||
--- squid-3.0.STABLE9/src/cf.data.pre.config 2008-09-09 18:06:44.000000000 +0200
|
||||
+++ squid-3.0.STABLE9/src/cf.data.pre 2008-10-19 23:34:17.000000000 +0200
|
||||
@@ -703,6 +703,7 @@ http_access deny CONNECT !SSL_ports
|
||||
http_access allow localnet
|
||||
|
||||
# And finally deny all other access to this proxy
|
||||
+http_access allow localhost
|
||||
http_access deny all
|
||||
NOCOMMENT_END
|
||||
DOC_END
|
||||
@@ -2135,7 +2136,7 @@ DOC_END
|
||||
|
||||
NAME: logfile_rotate
|
||||
TYPE: int
|
||||
-DEFAULT: 10
|
||||
+DEFAULT: 0
|
||||
LOC: Config.Log.rotateNumber
|
||||
DOC_START
|
||||
Specifies the number of logfile rotations to make when you
|
||||
@@ -2151,6 +2152,7 @@ DOC_START
|
||||
purposes, so -k rotate uses another signal. It is best to get
|
||||
in the habit of using 'squid -k rotate' instead of 'kill -USR1
|
||||
<pid>'.
|
||||
+logfile_rotate 0
|
||||
DOC_END
|
||||
|
||||
NAME: emulate_httpd_log
|
||||
@@ -3254,11 +3256,11 @@ COMMENT_END
|
||||
|
||||
NAME: cache_mgr
|
||||
TYPE: string
|
||||
-DEFAULT: webmaster
|
||||
+DEFAULT: root
|
||||
LOC: Config.adminEmail
|
||||
DOC_START
|
||||
Email-address of local cache manager who will receive
|
||||
- mail if the cache dies. The default is "webmaster."
|
||||
+ mail if the cache dies. The default is "root."
|
||||
DOC_END
|
||||
|
||||
NAME: mail_from
|
||||
@@ -4422,9 +4424,16 @@ TYPE: string
|
||||
LOC: Config.errorDirectory
|
||||
DEFAULT: @DEFAULT_ERROR_DIR@
|
||||
DOC_START
|
||||
- If you wish to create your own versions of the default files, to
|
||||
- customize them to suit your company copy the template 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.
|
||||
+
|
||||
+ If you wish to create your own versions of the 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.
|
||||
|
||||
Current Language updates can be downloaded from:
|
||||
http://www.squid-cache.org/Versions/langpack/
|
||||
@ -1,39 +0,0 @@
|
||||
diff -up squid-3.0.STABLE2/QUICKSTART.location squid-3.0.STABLE2/QUICKSTART
|
||||
--- squid-3.0.STABLE2/QUICKSTART.location 2008-02-10 12:04:32.000000000 +0100
|
||||
+++ squid-3.0.STABLE2/QUICKSTART 2008-03-11 15:53:36.000000000 +0100
|
||||
@@ -12,10 +12,9 @@ After you retrieved, compiled and instal
|
||||
INSTALL in the same directory), you have to configure the squid.conf
|
||||
file. This is the list of the values you *need* to change, because no
|
||||
sensible defaults could be defined. Do not touch the other variables
|
||||
-for now. We assume you have installed Squid in the default location:
|
||||
-/usr/local/squid
|
||||
+for now.
|
||||
|
||||
-Uncomment and edit the following lines in /usr/local/squid/etc/squid.conf:
|
||||
+Uncomment and edit the following lines in /etc/squid/squid.conf:
|
||||
|
||||
==============================================================================
|
||||
|
||||
@@ -26,7 +25,7 @@ cache_peer, never_direct/always_direct
|
||||
always ask permission before adding a parent cache. See also the
|
||||
never_direct/always_direct directives.
|
||||
|
||||
-cache_dir ufs /usr/local/squid/var/cache 100 16 256
|
||||
+cache_dir ufs /var/spool/squid 100 16 256
|
||||
|
||||
Add here (first number, here 100) the amount of hard disk space
|
||||
(in megabytes) to devote to caching.
|
||||
@@ -69,10 +68,10 @@ visible_hostname
|
||||
After editing squid.conf to your liking, run Squid from the command
|
||||
line TWICE:
|
||||
|
||||
- % /usr/local/squid/sbin/squid -z
|
||||
- % /usr/local/squid/sbin/squid
|
||||
+ % /usr/sbin/squid -z
|
||||
+ % /usr/sbin/squid
|
||||
|
||||
-Check in the cache.log (/usr/local/squid/var/logs/cache.log) that
|
||||
+Check in the cache.log (/var/log/squid/cache.log) that
|
||||
everything is all right.
|
||||
|
||||
Once Squid created all its files (it can take several minutes on some
|
||||
@ -1,41 +0,0 @@
|
||||
diff -up squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.am
|
||||
--- squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.am.smb-path 2009-05-06 13:11:32.000000000 +0200
|
||||
+++ squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.am 2009-05-23 13:23:34.000000000 +0200
|
||||
@@ -7,14 +7,14 @@
|
||||
#
|
||||
|
||||
# SAMBAPREFIX must point to the directory where Samba has been installed.
|
||||
-# By default, Samba is installed in /usr/local/samba. If you changed this
|
||||
+# By default, Samba is installed in /usr. If you changed this
|
||||
# by using the --prefix option when configuring Samba, you need to change
|
||||
# SAMBAPREFIX accordingly.
|
||||
|
||||
## FIXME: autoconf should test for the samba path.
|
||||
|
||||
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 -up squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.in.smb-path squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.in
|
||||
--- squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.in.smb-path 2009-05-06 13:11:32.000000000 +0200
|
||||
+++ squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.in 2009-05-23 13:24:39.000000000 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
#
|
||||
|
||||
# SAMBAPREFIX must point to the directory where Samba has been installed.
|
||||
-# By default, Samba is installed in /usr/local/samba. If you changed this
|
||||
+# By default, Samba is installed in /usr. If you changed this
|
||||
# by using the --prefix option when configuring Samba, you need to change
|
||||
# SAMBAPREFIX accordingly.
|
||||
|
||||
@@ -259,7 +259,7 @@ top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
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)
|
||||
smb_auth_CFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\"
|
||||
@ -29,7 +29,7 @@ fi
|
||||
|
||||
# don't raise an error if the config file is incomplete
|
||||
# set defaults instead:
|
||||
SQUID_OPTS=${SQUID_OPTS:-"-D"}
|
||||
SQUID_OPTS=${SQUID_OPTS:-""}
|
||||
SQUID_PIDFILE_TIMEOUT=${SQUID_PIDFILE_TIMEOUT:-20}
|
||||
SQUID_SHUTDOWN_TIMEOUT=${SQUID_SHUTDOWN_TIMEOUT:-100}
|
||||
SQUID_CONF=${SQUID_CONF:-"/etc/squid/squid.conf"}
|
||||
@ -42,7 +42,6 @@ prog="$SQUID"
|
||||
# determine which one is the cache_swap directory
|
||||
CACHE_SWAP=`sed -e 's/#.*//g' $SQUID_CONF | \
|
||||
grep cache_dir | awk '{ print $3 }'`
|
||||
[ -z "$CACHE_SWAP" ] && CACHE_SWAP=/var/spool/squid
|
||||
|
||||
RETVAL=0
|
||||
|
||||
@ -71,7 +70,7 @@ start() {
|
||||
for adir in $CACHE_SWAP; do
|
||||
if [ ! -d $adir/00 ]; then
|
||||
echo -n "init_cache_dir $adir... "
|
||||
$SQUID -z -F -D >> /var/log/squid/squid.out 2>&1
|
||||
$SQUID -z -F >> /var/log/squid/squid.out 2>&1
|
||||
fi
|
||||
done
|
||||
echo -n $"Starting $prog: "
|
||||
|
||||
180
squid.spec
180
squid.spec
@ -3,15 +3,15 @@
|
||||
## % define __find_requires %{SOURCE99}
|
||||
|
||||
Name: squid
|
||||
Version: 3.0.STABLE18
|
||||
Release: 3%{?dist}
|
||||
Version: 3.1.0.13
|
||||
Release: 1%{?dist}
|
||||
Summary: The Squid proxy caching server
|
||||
Epoch: 7
|
||||
License: GPLv2+
|
||||
Group: System Environment/Daemons
|
||||
URL: http://www.squid-cache.org
|
||||
Source: http://www.squid-cache.org/Squid/Versions/v3/3.0/squid-%{version}.tar.bz2
|
||||
Source1: FAQ.sgml
|
||||
Source: http://www.squid-cache.org/Squid/Versions/v3/3.1/squid-%{version}.tar.bz2
|
||||
Source1: http://www.squid-cache.org/Squid/Versions/v3/3.1/squid-%{version}.tar.bz2.asc
|
||||
Source2: squid.init
|
||||
Source3: squid.logrotate
|
||||
Source4: squid.sysconfig
|
||||
@ -21,19 +21,24 @@ Source98: perl-requires-squid.sh
|
||||
## Source99: filter-requires-squid.sh
|
||||
|
||||
# Upstream patches
|
||||
#Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
|
||||
|
||||
#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/bXXXX.patch
|
||||
Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9694.patch
|
||||
# Upstream fix, but have not reached 3.1 yet
|
||||
Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9696.patch
|
||||
Patch003: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9704.patch
|
||||
Patch004: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9707.patch
|
||||
Patch005: squid-3.1.0.13-alias-link.patch
|
||||
|
||||
# External patches
|
||||
|
||||
# Local patches
|
||||
# Applying upstream patches first makes it less likely that local patches
|
||||
# will break upstream ones.
|
||||
Patch201: squid-3.0.STABLE1-config.patch
|
||||
Patch202: squid-3.0.STABLE1-location.patch
|
||||
Patch203: squid-3.0.STABLE1-build.patch
|
||||
Patch201: squid-3.1.0.9-config.patch
|
||||
Patch202: squid-3.1.0.9-location.patch
|
||||
Patch203: squid-3.1.0.13-build.patch
|
||||
Patch204: squid-3.0.STABLE1-perlpath.patch
|
||||
Patch205: squid-3.0.STABLE15-smb-path.patch
|
||||
Patch205: squid-3.1.0.13-smb-path.patch
|
||||
Patch208: squid-3.0.STABLE7-from_manpg.patch
|
||||
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -42,7 +47,7 @@ Requires(pre): shadow-utils
|
||||
Requires(post): /sbin/chkconfig
|
||||
Requires(preun): /sbin/service /sbin/chkconfig
|
||||
Requires(postun): /sbin/service
|
||||
BuildRequires: openjade linuxdoc-tools openldap-devel pam-devel openssl-devel
|
||||
BuildRequires: openldap-devel pam-devel openssl-devel krb5-devel
|
||||
Obsoletes: squid-novm
|
||||
|
||||
%description
|
||||
@ -60,6 +65,11 @@ lookup program (dnsserver), a program for retrieving FTP data
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch001 -p0 -b .b9694
|
||||
%patch002 -p0 -b .b9696
|
||||
%patch003 -p0 -b .b9704
|
||||
%patch004 -p0 -b .b9707
|
||||
%patch005 -p0 -b .alias-link
|
||||
%patch201 -p1 -b .config
|
||||
%patch202 -p1 -b .location
|
||||
%patch203 -p1 -b .build
|
||||
@ -71,34 +81,35 @@ lookup program (dnsserver), a program for retrieving FTP data
|
||||
export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
|
||||
%configure \
|
||||
--exec_prefix=/usr \
|
||||
--bindir=%{_sbindir} \
|
||||
--libexecdir=%{_libdir}/squid \
|
||||
--localstatedir=/var \
|
||||
--datadir=%{_datadir} \
|
||||
--sysconfdir=/etc/squid \
|
||||
--with-logdir='$(localstatedir)/log/squid' \
|
||||
--with-pidfile='$(localstatedir)/run/squid.pid' \
|
||||
--disable-dependency-tracking \
|
||||
--enable-arp-acl \
|
||||
--enable-follow-x-forwarded-for \
|
||||
--enable-auth="basic,digest,ntlm,negotiate" \
|
||||
--enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL" \
|
||||
--enable-negotiate-auth-helpers="squid_kerb_auth" \
|
||||
--enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,DB,POP3,squid_radius_auth" \
|
||||
--enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
|
||||
--enable-digest-auth-helpers="password,ldap,eDirectory" \
|
||||
--enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
|
||||
--enable-cache-digests \
|
||||
--enable-cachemgr-hostname=localhost \
|
||||
--enable-delay-pools \
|
||||
--enable-digest-auth-helpers="password" \
|
||||
--enable-epoll \
|
||||
--enable-external-acl-helpers="ip_user,ldap_group,unix_group,wbinfo_group" \
|
||||
--enable-icap-client \
|
||||
--enable-ident-lookups \
|
||||
%ifnarch ppc64 ia64 x86_64 s390x
|
||||
--with-large-files \
|
||||
%endif
|
||||
--enable-linux-netfilter \
|
||||
--enable-ntlm-auth-helpers="SMB,fakeauth" \
|
||||
--enable-referer-log \
|
||||
--enable-removal-policies="heap,lru" \
|
||||
--enable-snmp \
|
||||
--enable-ssl \
|
||||
--enable-storeio="aufs,diskd,null,ufs" \
|
||||
--enable-storeio="aufs,diskd,ufs" \
|
||||
--enable-useragent-log \
|
||||
--enable-wccpv2 \
|
||||
--with-aio \
|
||||
@ -108,27 +119,17 @@ export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned
|
||||
--with-openssl=/usr/kerberos \
|
||||
--with-pthreads
|
||||
|
||||
# following options are no longer supported
|
||||
# --with-winbind-auth-challenge \
|
||||
# --enable-follow-x-forwarded-for \
|
||||
# --enable-fd-config \
|
||||
# --with-maxfd=16384 \
|
||||
# --enable-underscores \
|
||||
# following options should be enabled but fails building
|
||||
# --enable-negotiate-auth-helpers="squid_kerb_auth"
|
||||
|
||||
export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS="-pie" ;
|
||||
make %{?_smp_mflags}
|
||||
|
||||
mkdir faq
|
||||
cp %{SOURCE1} faq
|
||||
cd faq
|
||||
sgml2html FAQ.sgml
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%makeinstall \
|
||||
sysconfdir=$RPM_BUILD_ROOT/etc/squid \
|
||||
localstatedir=$RPM_BUILD_ROOT/var \
|
||||
bindir=$RPM_BUILD_ROOT/%{_sbindir} \
|
||||
libexecdir=$RPM_BUILD_ROOT/%{_libdir}/squid
|
||||
echo "
|
||||
#
|
||||
@ -146,9 +147,6 @@ ScriptAlias /Squid/cgi-bin/cachemgr.cgi %{_libdir}/squid/cachemgr.cgi
|
||||
</Location>" > $RPM_BUILD_ROOT/squid.httpd.tmp
|
||||
|
||||
|
||||
ln -s ../../%{_datadir}/squid/errors/English $RPM_BUILD_ROOT/etc/squid/errors
|
||||
ln -s ../../%{_datadir}/squid/icons $RPM_BUILD_ROOT/etc/squid/icons
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
|
||||
@ -167,8 +165,11 @@ chmod 644 contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
|
||||
iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog.tmp
|
||||
mv -f ChangeLog.tmp ChangeLog
|
||||
|
||||
# squid.conf.documented is documentation. We ship that in doc/
|
||||
rm -f $RPM_BUILD_ROOT/etc/squid/squid.conf.documented
|
||||
|
||||
# remove unpackaged files from the buildroot
|
||||
rm -f $RPM_BUILD_ROOT%{_sbindir}/{RunAccel,RunCache}
|
||||
rm -f $RPM_BUILD_ROOT%{_bindir}/{RunAccel,RunCache}
|
||||
rm -f $RPM_BUILD_ROOT/squid.httpd.tmp
|
||||
|
||||
%clean
|
||||
@ -176,41 +177,40 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc faq/*\.html README ChangeLog QUICKSTART
|
||||
%doc README ChangeLog QUICKSTART src/squid.conf.documented
|
||||
%doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
|
||||
|
||||
%attr(755,root,root) %dir /etc/squid
|
||||
%attr(755,root,root) %dir %{_libdir}/squid
|
||||
%attr(750,squid,squid) %dir /var/log/squid
|
||||
%attr(750,squid,squid) %dir /var/spool/squid
|
||||
%attr(4750,root,squid) %{_libdir}/squid/ncsa_auth
|
||||
%attr(4750,root,squid) %{_libdir}/squid/pam_auth
|
||||
|
||||
%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/squid.conf
|
||||
%config(noreplace) %attr(640,root,squid) /etc/squid/squid.conf
|
||||
%config(noreplace) %attr(644,root,squid) /etc/squid/cachemgr.conf
|
||||
%config(noreplace) /etc/squid/mime.conf
|
||||
%config(noreplace) /etc/squid/errorpage.css
|
||||
%config(noreplace) /etc/sysconfig/squid
|
||||
%config(noreplace) /etc/squid/msntauth.conf
|
||||
%config(noreplace) /etc/squid/mib.txt
|
||||
# These are not noreplace because they are just sample config files
|
||||
%config /etc/squid/msntauth.conf.default
|
||||
%config /etc/squid/squid.conf.default
|
||||
%config /etc/squid/mime.conf.default
|
||||
%config /etc/squid/errorpage.css.default
|
||||
%config /etc/squid/cachemgr.conf.default
|
||||
%config(noreplace) /etc/pam.d/squid
|
||||
%config(noreplace) /etc/logrotate.d/squid
|
||||
|
||||
%config(noreplace) /etc/squid/errors
|
||||
%dir %{_datadir}/squid
|
||||
%attr(-,root,root) %{_datadir}/squid/errors
|
||||
%attr(-,root,root) /etc/squid/icons
|
||||
%attr(755,root,root) /etc/rc.d/init.d/squid
|
||||
%attr(755,root,root) /etc/NetworkManager/dispatcher.d/20-squid
|
||||
%{_datadir}/squid/icons
|
||||
%{_datadir}/squid/mib.txt
|
||||
%{_sbindir}/squid
|
||||
%{_sbindir}/squidclient
|
||||
%{_bindir}/squidclient
|
||||
%{_mandir}/man8/*
|
||||
%{_mandir}/man1/*
|
||||
%{_libdir}/squid/*
|
||||
|
||||
%pre
|
||||
@ -234,95 +234,6 @@ exit 0
|
||||
|
||||
%post
|
||||
/sbin/chkconfig --add squid
|
||||
if [ $1 = 0 ]; then
|
||||
case "$LANG" in
|
||||
bg*)
|
||||
DIR=Bulgarian
|
||||
;;
|
||||
ca*)
|
||||
DIR=Catalan
|
||||
;;
|
||||
cs*)
|
||||
DIR=Czech
|
||||
;;
|
||||
da*)
|
||||
DIR=Danish
|
||||
;;
|
||||
nl*)
|
||||
DIR=Dutch
|
||||
;;
|
||||
en*)
|
||||
DIR=English
|
||||
;;
|
||||
ea*)
|
||||
DIR=Estonian
|
||||
;;
|
||||
fi*)
|
||||
DIR=Finnish
|
||||
;;
|
||||
fr*)
|
||||
DIR=French
|
||||
;;
|
||||
de*)
|
||||
DIR=German
|
||||
;;
|
||||
he*)
|
||||
DIR=Hebrew
|
||||
;;
|
||||
hu*)
|
||||
DIR=Hungarian
|
||||
;;
|
||||
it*)
|
||||
DIR=Italian
|
||||
;;
|
||||
ja*)
|
||||
DIR=Japanese
|
||||
;;
|
||||
kr*)
|
||||
DIR=Korean
|
||||
;;
|
||||
pl*)
|
||||
DIR=Polish
|
||||
;;
|
||||
pt*)
|
||||
DIR=Portuguese
|
||||
;;
|
||||
ro*)
|
||||
DIR=Romanian
|
||||
;;
|
||||
ru*)
|
||||
DIR=Russian-koi8-r
|
||||
;;
|
||||
sr*)
|
||||
DIR=Serbian
|
||||
;;
|
||||
sk*)
|
||||
DIR=Slovak
|
||||
;;
|
||||
es*)
|
||||
DIR=Spanish
|
||||
;;
|
||||
sv*)
|
||||
DIR=Swedish
|
||||
;;
|
||||
zh_TW*)
|
||||
DIR=Traditional_Chinese
|
||||
;;
|
||||
zh_CN*)
|
||||
DIR=Simplify_Chinese
|
||||
;;
|
||||
tr*)
|
||||
DIR=Turkish
|
||||
;;
|
||||
greek)
|
||||
DIR=Greek
|
||||
;;
|
||||
*)
|
||||
DIR=English
|
||||
;;
|
||||
esac
|
||||
ln -snf %{_datadir}/squid/errors/$DIR /etc/squid/errors
|
||||
fi
|
||||
|
||||
%preun
|
||||
if [ $1 = 0 ] ; then
|
||||
@ -341,6 +252,15 @@ fi
|
||||
chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
|
||||
|
||||
%changelog
|
||||
* Fri Sep 04 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.13-1
|
||||
- Upgrade to next upstream release 3.1.0.13 with many new features
|
||||
* IPv6 support
|
||||
* NTLM-passthru
|
||||
* Kerberos/Negotiate authentication scheme support
|
||||
* Localized error pages based on browser language preferences
|
||||
* Follow X-Forwarded-For capability
|
||||
* and more..
|
||||
|
||||
* Mon Aug 31 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 3.0.STABLE18-3
|
||||
- Bug #520445 silence logrotate when Squid is not running
|
||||
|
||||
|
||||
1002
squid.spec-3.1
1002
squid.spec-3.1
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,5 @@
|
||||
# default squid options
|
||||
# -D disables initial dns checks. If you most likely will not to have an
|
||||
# internet connection when you start squid, uncomment this
|
||||
SQUID_OPTS="-D"
|
||||
SQUID_OPTS=""
|
||||
|
||||
# Time to wait for Squid to shut down when asked. Should not be necessary
|
||||
# most of the time.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user