mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-24 09:52:58 +02:00
Updated squid (3.1.8).
This commit is contained in:
Arne Fitzenreiter
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1
config/proxy/errors.ipfire/de/ERR_DIR_LISTING
Normal file
1
config/proxy/errors.ipfire/de/ERR_DIR_LISTING
Normal file
@@ -0,0 +1 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Verzeichnis: %U</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h2>Verzeichnis: <a href="%U">%U</a>/</h2> </div> <hr> <div id="content"> <h4>Verzeichnisinhalt:</h4> <blockquote id="data"> <pre id="dirmsg">%z</pre> </blockquote> <table id="dirlisting" summary="Verzeichnis Auflistung"> <tr> <th><a href="../"><img border="0" src="/squid-internal-static/icons/anthony-dirup.gif" alt="Übergeordnetes Verzeichnis"></a></th> <th nowrap="nowrap"><a href="../">Übergeordnetes Verzeichnis</a> (<a href="/">Stammverzeichnis</a>)</th> </tr> %g </table> </div> <hr> <div id="footer"> <p>Erzeugt am %T von %h (%s)</p> <!-- %c --> </div> </body></html>
|
||||
1
config/proxy/errors.ipfire/de/ERR_ESI
Normal file
1
config/proxy/errors.ipfire/de/ERR_ESI
Normal file
@@ -0,0 +1 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>FEHLER: Die angeforderte URL konnte nicht gefunden werden</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>The requested URL could not be retrieved</h2> </div> <hr> <div id="content"> <p>Der folgende Fehler wurde beim Versuch die URL <a href="%U">%U</a> zu holen festgestellt:</p> <blockquote id="error"> <p><b>ESI-Verarbeitung fehlgeschlagen.</b></p> </blockquote> <p>Der ESI-Prozessor meldete:</p> <blockquote id="data"> <pre>%Z</pre> </blockquote> <p>Das heißt, dass der Ersatz nicht in der Lage war das ESI Template zu verarbeiten. Bitte melden sie diesen Fehler dem Webmaster.</p> <p>Ihr Webmaster ist <a href="mailto:%w">%w</a>.</p> <br> </div> <hr> <div id="footer"> <p>Erzeugt am %T von %h (%s)</p> <!-- %c --> </div> </body></html>
|
||||
1
config/proxy/errors.ipfire/de/ERR_ICAP_FAILURE
Normal file
1
config/proxy/errors.ipfire/de/ERR_ICAP_FAILURE
Normal file
@@ -0,0 +1 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>FEHLER: Die angeforderte URL konnte nicht gefunden werden</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>The requested URL could not be retrieved</h2> </div> <hr> <div id="content"> <p>Der folgende Fehler wurde beim Versuch die URL <a href="%U">%U</a> zu holen festgestellt:</p> <blockquote id="error"> <p><b>ICAP Protokoll Fehler.</b></p> </blockquote> <p id="sysmsg">Das System antwortete: <i>%E</i></p> <p>Das heißt, dass etwas mit der ICAP Kommunikation nicht stimmt.</p> <p>Mögliche Probleme sind:</p> <ul> <li><p>Der ICAP Server ist nicht erreichbar.</p></li> <li><p>Die Antwort des ICAP Servers war ungültig.</p></li> </ul> <br> </div> <hr> <div id="footer"> <p>Erzeugt am %T von %h (%s)</p> <!-- %c --> </div> </body></html>
|
||||
1
config/proxy/errors.ipfire/de/ERR_SECURE_CONNECT_FAIL
Normal file
1
config/proxy/errors.ipfire/de/ERR_SECURE_CONNECT_FAIL
Normal file
@@ -0,0 +1 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>FEHLER: Die angeforderte URL konnte nicht gefunden werden</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>The requested URL could not be retrieved</h2> </div> <hr> <div id="content"> <p>Der folgende Fehler wurde beim Versuch die URL <a href="%U">%U</a> zu holen festgestellt:</p> <blockquote id="error"> <p><b>Konnte keine sichere Verbindung zu %I herstellen</b></p> </blockquote> <p id="sysmsg">Das System antwortete: <i>%E</i></p> <p>Dieser Proxy und der Zielhost waren nicht in der Lage Sicherheitseinstellungen auszuhandeln die beidseitig akzeptiert werden. Es ist möglich dass der Zielhost keine sicheren Verbindungen unterstützte oder der Proxy nicht mit dem Sicherheitszertifikat des Hosts einverstanden ist.</p> <p>Ihr Cache Administrator ist <a href="mailto:%w%W">%w</a>.</p> <br> </div> <hr> <div id="footer"> <p>Erzeugt am %T von %h (%s)</p> <!-- %c --> </div> </body></html>
|
||||
1
config/proxy/errors.ipfire/de/ERR_UNSUP_HTTPVERSION
Normal file
1
config/proxy/errors.ipfire/de/ERR_UNSUP_HTTPVERSION
Normal file
@@ -0,0 +1 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>FEHLER: Die angeforderte URL konnte nicht gefunden werden</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>Nicht unterstützte HTTP Version</h2> </div> <hr> <div id="content"> <p>Der folgende Fehler wurde beim Versuch die URL <a href="%U">%U</a> zu holen festgestellt:</p> <blockquote id="error"> <p><b>Unsupported HTTP version</b></p> </blockquote> <p>Dieser Squid akzeptiert die angeforderte HTTP Version nicht.</p> <p>Ihr Cache Administrator ist <a href="mailto:%w%W">%w</a>.</p> <br> </div> <hr> <div id="footer"> <p>Erzeugt am %T von %h (%s)</p> <!-- %c --> </div> </body></html>
|
||||
1
config/proxy/errors.ipfire/en/ERR_DIR_LISTING
Normal file
1
config/proxy/errors.ipfire/en/ERR_DIR_LISTING
Normal file
@@ -0,0 +1 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Directory: %U</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h2>Directory: <a href="%U">%U</a>/</h2> </div> <hr> <div id="content"> <h4>Directory Content:</h4> <blockquote id="data"> <pre id="dirmsg">%z</pre> </blockquote> <table id="dirlisting" summary="Directory Listing"> <tr> <th><a href="../"><img border="0" src="/squid-internal-static/icons/anthony-dirup.gif" alt="Parent Directory"></a></th> <th nowrap="nowrap"><a href="../">Parent Directory</a> (<a href="/">Root Directory</a>)</th> </tr> %g </table> </div> <hr> <div id="footer"> <p>Generated %T by %h (%s)</p> <!-- %c --> </div> </body></html>
|
||||
1
config/proxy/errors.ipfire/en/ERR_ESI
Normal file
1
config/proxy/errors.ipfire/en/ERR_ESI
Normal file
@@ -0,0 +1 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>ERROR: The requested URL could not be retrieved</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>The requested URL could not be retrieved</h2> </div> <hr> <div id="content"> <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p> <blockquote id="error"> <p><b>ESI Processing failed.</b></p> </blockquote> <p>The ESI processor returned:</p> <blockquote id="data"> <pre>%Z</pre> </blockquote> <p>This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.</p> <p>Your webmaster is <a href="mailto:%w">%w</a>.</p> <br> </div> <hr> <div id="footer"> <p>Generated %T by %h (%s)</p> <!-- %c --> </div> </body></html>
|
||||
1
config/proxy/errors.ipfire/en/ERR_ICAP_FAILURE
Normal file
1
config/proxy/errors.ipfire/en/ERR_ICAP_FAILURE
Normal file
@@ -0,0 +1 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>ERROR: The requested URL could not be retrieved</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>The requested URL could not be retrieved</h2> </div> <hr> <div id="content"> <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p> <blockquote id="error"> <p><b>ICAP protocol error.</b></p> </blockquote> <p id="sysmsg">The system returned: <i>%E</i></p> <p>This means that some aspect of the ICAP communication failed.</p> <p>Some possible problems are:</p> <ul> <li><p>The ICAP server is not reachable.</p></li> <li><p>An Illegal response was received from the ICAP server.</p></li> </ul> <br> </div> <hr> <div id="footer"> <p>Generated %T by %h (%s)</p> <!-- %c --> </div> </body></html>
|
||||
1
config/proxy/errors.ipfire/en/ERR_SECURE_CONNECT_FAIL
Normal file
1
config/proxy/errors.ipfire/en/ERR_SECURE_CONNECT_FAIL
Normal file
@@ -0,0 +1 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>ERROR: The requested URL could not be retrieved</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>The requested URL could not be retrieved</h2> </div> <hr> <div id="content"> <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p> <blockquote id="error"> <p><b>Failed to establish a secure connection to %I</b></p> </blockquote> <p id="sysmsg">The system returned: <i>%E</i></p> <p>This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.</p> <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p> <br> </div> <hr> <div id="footer"> <p>Generated %T by %h (%s)</p> <!-- %c --> </div> </body></html>
|
||||
1
config/proxy/errors.ipfire/en/ERR_UNSUP_HTTPVERSION
Normal file
1
config/proxy/errors.ipfire/en/ERR_UNSUP_HTTPVERSION
Normal file
@@ -0,0 +1 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>ERROR: The requested URL could not be retrieved</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>Unsupported HTTP version</h2> </div> <hr> <div id="content"> <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p> <blockquote id="error"> <p><b>Unsupported HTTP version</b></p> </blockquote> <p>This Squid does not accept the HTTP version you are attempting to use.</p> <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p> <br> </div> <hr> <div id="footer"> <p>Generated %T by %h (%s)</p> <!-- %c --> </div> </body></html>
|
||||
File diff suppressed because it is too large
Load Diff
1
config/rootfiles/core/test/filelists/attr
Symbolic link
1
config/rootfiles/core/test/filelists/attr
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/attr
|
||||
@@ -1,4 +1,6 @@
|
||||
etc/system-release
|
||||
etc/rc.d/init.d/checkfstab
|
||||
usr/local/bin/rebuild-initrd
|
||||
etc/rc.d/init.d/squid
|
||||
srv/web/ipfire/cgi-bin/proxy.cgi
|
||||
srv/web/ipfire/cgi-bin/speed.cgi
|
||||
usr/local/bin/rebuild-initrd
|
||||
|
||||
1
config/rootfiles/core/test/filelists/libcap
Symbolic link
1
config/rootfiles/core/test/filelists/libcap
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/libcap
|
||||
1
config/rootfiles/core/test/filelists/squid
Symbolic link
1
config/rootfiles/core/test/filelists/squid
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/squid
|
||||
13
lfs/squid
13
lfs/squid
@@ -24,10 +24,10 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2.7.STABLE9
|
||||
VER = 3.1.8
|
||||
|
||||
THISAPP = squid-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 7d3b8b0bdda3ae56e438d4a95a97d3b3
|
||||
$(DL_FILE)_MD5 = a8160dfba55ab7c400c622b72d39fc13
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
|
||||
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
|
||||
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \
|
||||
--datadir=/usr/lib/squid \
|
||||
@@ -77,13 +77,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
--localstatedir=/var --sysconfdir=/etc/squid \
|
||||
--disable-poll --disable-icmp --disable-wccp \
|
||||
--enable-ident-lookups \
|
||||
--enable-storeio="aufs,coss,diskd,ufs,null" --enable-ssl \
|
||||
--enable-storeio="aufs,diskd,ufs" --enable-ssl \
|
||||
--enable-underscores --enable-ntlm-fail-open --enable-arp-acl \
|
||||
--enable-http-violations --enable-auth=basic,ntlm \
|
||||
--enable-removal-policies="heap,lru" \
|
||||
--enable-delay-pools --enable-linux-netfilter \
|
||||
--enable-basic-auth-helpers="NCSA,SMB,MSNT,LDAP,multi-domain-NTLM" \
|
||||
--enable-ntlm-auth-helpers="SMB" \
|
||||
--enable-useragent-log \
|
||||
--enable-referer-log \
|
||||
--enable-snmp \
|
||||
@@ -98,7 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
rm -f /etc/squid/cachemgr.conf
|
||||
ln -sf /var/ipfire/proxy/cachemgr.conf /etc/squid/cachemgr.conf
|
||||
rm -f /etc/squid/errors
|
||||
ln -sf /usr/lib/squid/errors/English /etc/squid/errors
|
||||
ln -sf /usr/lib/squid/errors/en /etc/squid/errors
|
||||
|
||||
-mkdir -p /var/log/cache /var/log/squid /var/log/updatexlrator
|
||||
touch /var/log/squid/access.log
|
||||
|
||||
@@ -57,8 +57,8 @@ case "$1" in
|
||||
fi
|
||||
if [ -e /var/ipfire/proxy/enable -o -e /var/ipfire/proxy/enable_blue ]; then
|
||||
boot_mesg "Starting Squid Proxy Server..."
|
||||
loadproc /usr/sbin/squid -D -z >/dev/null 2>&1
|
||||
loadproc /usr/sbin/squid -D
|
||||
loadproc /usr/sbin/squid -z >/dev/null 2>&1
|
||||
loadproc /usr/sbin/squid
|
||||
fi
|
||||
|
||||
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
|
||||
|
||||
Reference in New Issue
Block a user