Merge branch 'master' into next

diff --git a/config/rootfiles/core/52/filelists/files b/config/rootfiles/core/52/filelists/files
index 331514d941f53b03c7c09d6e1e34e5789fdd5b9f..a0f0ef571e6007a746bc90640aa3b6b906825d96 100644 (file)
--- a/config/rootfiles/core/52/filelists/files
+++ b/config/rootfiles/core/52/filelists/files
@@ -4,3 +4,4 @@ etc/rc.d/init.d/console
 usr/local/sbin/setup
 usr/local/bin/setddns.pl
 srv/web/ipfire/cgi-bin/ddns.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi

diff --git a/config/rootfiles/core/52/filelists/squid b/config/rootfiles/core/52/filelists/squid
new file mode 120000 (symlink)
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/52/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index a0aa1acd34e3d8f5981a3de84f7b7bf3feec02fa..6d0fe545e3b4798f67c1bc86dea613253160354e 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3147,6 +3147,7 @@ END
 
                if ($proxysettings{'AUTH_METHOD'} eq 'ldap')
                {
+                       print FILE "auth_param basic utf8 on\n";
                        print FILE "auth_param basic program $authdir/squid_ldap_auth -b \"$proxysettings{'LDAP_BASEDN'}\"";
                        if (!($proxysettings{'LDAP_BINDDN_USER'} eq '')) { print FILE " -D \"$proxysettings{'LDAP_BINDDN_USER'}\""; }
                        if (!($proxysettings{'LDAP_BINDDN_PASS'} eq '')) { print FILE " -w $proxysettings{'LDAP_BINDDN_PASS'}"; }

diff --git a/lfs/squid b/lfs/squid
index f85b5e9a8029cf47df49042843b0f5cd5ce341c5..a29109fc49662ed3cd5a070aa658f00f866970e3 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.14
+VER        = 3.1.15
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8f82a451b04c3bf3c29202c548d2f2dd
+$(DL_FILE)_MD5 = 73d47363ddccc400bc0fb2f814c63a92
 
 install : $(TARGET)